Merge pull request #31 from atoum/update-atoum-3

Bump dependencies to support atoum 3.x
atoum · Feb 24, 2017 · 88f2a7f · 88f2a7f
2 parents 988a27e + 44e7daa
commit 88f2a7f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - nightly
 
 cache:
@@ -25,6 +26,10 @@ matrix:
   exclude:
     - php: 7.0
       env: COMPOSER_PREFER="--prefer-lowest"
+    - php: 7.1
+      env: COMPOSER_PREFER="--prefer-lowest"
+    - php: nightly
+      env: COMPOSER_PREFER="--prefer-lowest"
 
 script:
   - composer update $COMPOSER_PREFER

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.3.0 - 2017-02-24
+
+* [#31](https://github.com/atoum/visibility-extension/pull/31) Support atoum 3.x ([@hywan], [@jubianchi])
+
 # 1.2.0 - 2017-02-16
 
 * [#13](https://github.com/atoum/visibility-extension/pull/13) Support return type hint ([@jubianchi])
@@ -14,3 +18,4 @@
 # 1.0.0 - 2014-12-01
 
 [@jubianchi]: https://github.com/jubianchi
+[@hywan]: https://github.com/hywan
diff --git a/autoloader.php b/autoloader.php
diff --git a/composer.json b/composer.json
@@ -13,15 +13,12 @@
     ],
     "minimum-stability": "beta",
     "require": {
-        "atoum/atoum": "^2.9"
+        "atoum/atoum": "^2.9 | ^3.0"
     },
     "autoload": {
         "psr-4": {
             "mageekguy\\atoum\\visibility\\": "classes"
         },
-        "files": [
-            "autoloader.php",
-            "configuration.php"
-        ]
+        "files": ["configuration.php"]
     }
 }