Merge pull request #455 from paxal/php-7.3-tests

Php 7.3 tests
Roave · Dec 7, 2018 · f54261a · f54261a
2 parents 1efdfe5 + 6c16905
commit f54261a
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,6 +26,16 @@ jobs:
       env: DEPENDENCIES="--prefer-lowest --prefer-stable"
       script: vendor/bin/phpunit
 
+    - stage: Test
+      php: 7.3
+      env: DEPENDENCIES=""
+      script: vendor/bin/phpunit
+
+    - stage: Test
+      php: 7.3
+      env: DEPENDENCIES="--prefer-lowest --prefer-stable"
+      script: vendor/bin/phpunit
+
     - stage: Test Compatibility
       php: 7.1
       env: DEPENDENCIES=""
@@ -46,6 +56,16 @@ jobs:
       env: DEPENDENCIES="--prefer-lowest --prefer-stable"
       script: vendor/bin/phpunit test/compat
 
+    - stage: Test Compatibility
+      php: 7.3
+      env: DEPENDENCIES=""
+      script: vendor/bin/phpunit test/compat
+
+    - stage: Test Compatibility
+      php: 7.3
+      env: DEPENDENCIES="--prefer-lowest --prefer-stable"
+      script: vendor/bin/phpunit test/compat
+
     - stage: Check Demo Scripts
       php: 7.1
       env: DEPENDENCIES=""
@@ -66,8 +86,18 @@ jobs:
       env: DEPENDENCIES="--prefer-lowest --prefer-stable"
       script: test/demo/check-demo.sh
 
+    - stage: Check Demo Scripts
+      php: 7.3
+      env: DEPENDENCIES=""
+      script: test/demo/check-demo.sh
+
+    - stage: Check Demo Scripts
+      php: 7.3
+      env: DEPENDENCIES="--prefer-lowest --prefer-stable"
+      script: test/demo/check-demo.sh
+
     - stage: Check Coding Standard
-      php: 7.2
+      php: 7.3
       env: DEPENDENCIES=""
       before_script:
         - travis_retry composer install

diff --git a/composer.json b/composer.json
@@ -3,8 +3,8 @@
     "description": "Better Reflection - an improved code reflection API",
     "license": "MIT",
     "require": {
-        "php": ">=7.1.0,<7.3.0",
-        "nikic/php-parser": "^4.0.0",
+        "php": ">=7.1.0,<7.4.0",
+        "nikic/php-parser": "^4.0.4",
         "phpdocumentor/reflection-docblock": "^4.1.1",
         "phpdocumentor/type-resolver": "^0.4.0",
         "roave/signature": "^1.0"

diff --git a/composer.lock b/composer.lock
diff --git a/src/SourceLocator/Reflection/SourceStubber.php b/src/SourceLocator/Reflection/SourceStubber.php
@@ -371,7 +371,7 @@ private function addParameterModifiers(ReflectionParameter $parameterReflection,
         $parameterType = $parameterReflection->getType();
 
         if ($parameterReflection->getType() !== null) {
-            $parameterNode->setTypeHint($this->formatType($parameterType));
+            $parameterNode->setType($this->formatType($parameterType));
         }
 
         return $parameterNode;

diff --git a/stub/SoapServer.stub b/stub/SoapServer.stub
@@ -9,7 +9,7 @@ class SoapServer
     {
     }
 
-    public function setClass($class_name, $args = null)
+    public function setClass($class_name, ...$args)
     {
     }
 

diff --git a/test/unit/SourceLocator/Type/PhpInternalSourceLocatorTest.php b/test/unit/SourceLocator/Type/PhpInternalSourceLocatorTest.php
@@ -400,6 +400,16 @@ private function assertSameParameterAttributes(
             self::markTestSkipped('New type hints were introduced in PHP 7.2 for ' . $parameterName);
         }
 
+        if (PHP_VERSION_ID < 70300
+            && in_array(
+                $parameterName,
+                ['SoapServer#setClass.args'],
+                true
+            )
+        ) {
+            self::markTestSkipped('New type hints were introduced in PHP 7.3 for ' . $parameterName);
+        }
+
         if (in_array(
             $parameterName,
             [