Merge pull request #180 from GrahamCampbell/patch-2

PHP 7.4 and 8.0 support

Author: dbu

.travis.yml

@@ -1,16 +1,9 @@
 language: php
 
-sudo: false
-
 cache:
     directories:
         - $HOME/.composer/cache/files
 
-php:
-    - 7.1
-    - 7.2
-    - 7.3
-
 env:
     global:
         - TEST_COMMAND="composer test"
@@ -23,12 +16,23 @@ branches:
 matrix:
     fast_finish: true
     include:
-        - name: PHPSpec
+        - name: PHPSpec 7.1
+          php: 7.1
+        - name: PHPSpec 7.2
+          php: 7.2
+        - name: PHPSpec 7.3
+          php: 7.3
+        - name: PHPSpec 7.4
+          php: 7.4
+        - name: PHPSpec 8.0
+          php: nightly
+          env: COMPOSER_FLAGS="--prefer-stable --ignore-platform-reqs" DEPENDENCIES="phpdocumentor/reflection-docblock:^5.2@dev"
+        - name: PHPSpec lowest
           php: 7.1
-          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" TEST_COMMAND="composer test" PULI_VERSION=1.0.0-beta9
+          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" PULI_VERSION=1.0.0-beta9
         - name: PHPSpec code coverage
           php: 7.2
-          env: COVERAGE=true TEST_COMMAND="composer test-ci" PULI_VERSION=1.0.0-beta10 DEPENDENCIES="friends-of-phpspec/phpspec-code-coverage:^4.3"
+          env: COVERAGE=true TEST_COMMAND="composer test-ci" DEPENDENCIES="friends-of-phpspec/phpspec-code-coverage:^4.3 phpspec/phpspec:^5.1"
         - name: PHPUnit tests
           php: 7.3
           env: TEST_COMMAND="./vendor/bin/phpunit" DEPENDENCIES="phpunit/phpunit:^7.5 nyholm/psr7:^1.0 kriswallsmith/buzz:^1.0 php-http/curl-client:^1.0 php-http/message"

composer.json

@@ -11,14 +11,14 @@
         }
     ],
     "require": {
-        "php": "^7.1"
+        "php": "^7.1 || ^8.0"
     },
     "require-dev": {
+        "graham-campbell/phpspec-skip-example-extension": "^5.0",
         "php-http/httplug": "^1.0 || ^2.0",
         "php-http/message-factory": "^1.0",
-        "puli/composer-plugin": "1.0.0-beta10",
-        "phpspec/phpspec": "^5.1",
-        "akeneo/phpspec-skip-example-extension": "^4.0"
+        "phpspec/phpspec": "^5.1 || ^6.1",
+        "puli/composer-plugin": "1.0.0-beta10"
     },
     "suggest": {
         "puli/composer-plugin": "Sets up Puli which is recommended for Discovery to work. Check http://docs.php-http.org/en/latest/discovery.html for more details.",

spec/Strategy/PuliSpec.php

@@ -12,7 +12,7 @@
 use PhpSpec\ObjectBehavior;
 
 /**
- * @require \NotPHP73
+ * @require \PuliIsSupported
  */
 class PuliSpec extends ObjectBehavior
 {

spec/autoload.php

@@ -8,8 +8,6 @@
     ]);
 }
 
-if (PHP_VERSION_ID >= 70300 && PHP_VERSION_ID < 70400) {
-    class PHP73 {}
-} else {
-    class NotPHP73 {}
+if (PHP_VERSION_ID < 70300) {
+    class PuliIsSupported {}
 }