Build fixes because of arginfo changes in PHP 7.1.17 and PHP 7.2.5

Roave · May 8, 2018 · 95131c8 · 95131c8
1 parent 68ebc69
commit 95131c8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/stub/DateTime.stub b/stub/DateTime.stub
@@ -27,7 +27,7 @@ class DateTime implements DateTimeInterface
 
     const W3C = 'Y-m-d\\TH:i:sP';
 
-    public function __construct($time = 'now', $object = null)
+    public function __construct($time = 'now', $timezone = null)
     {
     }
 

diff --git a/stub/DateTimeImmutable.stub b/stub/DateTimeImmutable.stub
@@ -1,7 +1,7 @@
 class DateTimeImmutable implements DateTimeInterface
 {
 
-    public function __construct($time = 'now', $object = null)
+    public function __construct($time = 'now', $timezone = null)
     {
     }
 

diff --git a/test/unit/SourceLocator/Type/PhpInternalSourceLocatorTest.php b/test/unit/SourceLocator/Type/PhpInternalSourceLocatorTest.php
@@ -5,6 +5,8 @@
 namespace Roave\BetterReflectionTest\SourceLocator\Type;
 
 use Closure;
+use DateTime;
+use DateTimeImmutable;
 use DOMNamedNodeMap;
 use IntlChar;
 use IntlGregorianCalendar;
@@ -387,6 +389,20 @@ private function assertSameParameterAttributes(
             self::markTestSkipped('New type hints were introduced in PHP 7.2 for ' . $parameterName);
         }
 
+        if (
+            (PHP_VERSION_ID < 70117 || (PHP_VERSION_ID >= 70200 && PHP_VERSION_ID < 70205))
+            && in_array(
+                $parameterName,
+                [
+                    'DateTime#__construct.timezone',
+                    'DateTimeImmutable#__construct.timezone',
+                ],
+                true
+            )
+        ) {
+            self::markTestSkipped('Argument name was changed in PHP 7.1.17 and 7.2.5 for ' . $parameterName);
+        }
+
         self::assertSame($original->getName(), $stubbed->getName(), $parameterName);
         self::assertSame($original->isArray(), $stubbed->isArray(), $parameterName);
         if (! ($original->getDeclaringClass()->getName() === Closure::class && $originalMethod->getName() === 'fromCallable')) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ class DateTime implements DateTimeInterface @@
         const W3C = 'Y-m-d\\TH:i:sP';
-        public function __construct($time = 'now', $object = null)
+        public function __construct($time = 'now', $timezone = null)
         {
         }
@@ Expand Down @@