Fix PHP7.4 deprecation errors, related to #102

goaop · Aug 13, 2020 · d4257ee · d4257ee
1 parent 98700fb
commit d4257ee
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/tests/AbstractTestCase.php b/tests/AbstractTestCase.php
@@ -56,7 +56,7 @@ public function testCoverAllMethods()
         }
 
         if ($allMissedMethods) {
-            $this->markTestIncomplete('Methods ' . join($allMissedMethods, ', ') . ' are not implemented');
+            $this->markTestIncomplete('Methods ' . join(', ', $allMissedMethods) . ' are not implemented');
         }
     }
 

diff --git a/tests/ReflectionFunctionTest.php b/tests/ReflectionFunctionTest.php
@@ -125,7 +125,12 @@ public function testGetReturnTypeMethod()
                     $originalReturnType = $originalRefFunction->getReturnType();
                     $this->assertSame($originalReturnType->allowsNull(), $parsedReturnType->allowsNull());
                     $this->assertSame($originalReturnType->isBuiltin(), $parsedReturnType->isBuiltin());
-                    $this->assertSame($originalReturnType->__toString(), $parsedReturnType->__toString());
+                    // TODO: To prevent deprecation error in tests
+                    if (PHP_VERSION_ID < 70400) {
+                        $this->assertSame($originalReturnType->__toString(), $parsedReturnType->__toString());
+                    } else {
+                        $this->assertSame($originalReturnType->getName(), $parsedReturnType->__toString());
+                    }
                 } else {
                     $this->assertSame(
                         $originalRefFunction->getReturnType(),

diff --git a/tests/ReflectionParameterTest.php b/tests/ReflectionParameterTest.php
@@ -279,7 +279,12 @@ public function testGetTypeMethod()
                         $originalReturnType = $originalRefParameter->getType();
                         $this->assertSame($originalReturnType->allowsNull(), $parsedReturnType->allowsNull(), $message);
                         $this->assertSame($originalReturnType->isBuiltin(), $parsedReturnType->isBuiltin(), $message);
-                        $this->assertSame($originalReturnType->__toString(), $parsedReturnType->__toString(), $message);
+                        // TODO: To prevent deprecation error in tests
+                        if (PHP_VERSION_ID < 70400) {
+                            $this->assertSame($originalReturnType->__toString(), $parsedReturnType->__toString(), $message);
+                        } else {
+                            $this->assertSame($originalReturnType->getName(), $parsedReturnType->__toString(), $message);
+                        }
                     } else {
                         $this->assertSame(
                             $originalRefParameter->getType(),

diff --git a/tests/ReflectionTypeTest.php b/tests/ReflectionTypeTest.php
@@ -28,7 +28,12 @@ public function testTypeConvertToDisplayTypeWithNativeType()
         $this->assertCount(2, $nativeParamRefArr);
         $this->assertEquals(\ReflectionParameter::class, get_class($nativeParamRefArr[0]));
         $nativeTypeRef = $nativeParamRefArr[0]->getType();
-        $this->assertEquals('string', (string)$nativeTypeRef);
+        // TODO: To prevent deprecation error in tests
+        if (PHP_VERSION_ID < 70400) {
+            $this->assertEquals('string', (string)$nativeTypeRef);
+        } else {
+            $this->assertEquals('string', $nativeTypeRef->getName());
+        }
         $this->assertNotContains('\\', get_class($nativeTypeRef));
         $this->assertInstanceOf(\ReflectionType::class, $nativeTypeRef);
         $this->assertEquals('string', \Go\ParserReflection\ReflectionType::convertToDisplayType($nativeTypeRef));
@@ -49,7 +54,12 @@ public function testTypeConvertToDisplayTypeWithNullableNativeType()
         $this->assertCount(2, $nativeParamRefArr);
         $this->assertEquals(\ReflectionParameter::class, get_class($nativeParamRefArr[0]));
         $nativeTypeRef = $nativeParamRefArr[0]->getType();
-        $this->assertEquals('string', (string)$nativeTypeRef);
+        // TODO: To prevent deprecation error in tests
+        if (PHP_VERSION_ID < 70400) {
+            $this->assertEquals('string', (string)$nativeTypeRef);
+        } else {
+            $this->assertEquals('string', $nativeTypeRef->getName());
+        }
         $this->assertNotContains('\\', get_class($nativeTypeRef));
         $this->assertInstanceOf(\ReflectionType::class, $nativeTypeRef);
         $this->assertEquals('string or NULL', \Go\ParserReflection\ReflectionType::convertToDisplayType($nativeTypeRef));
@@ -71,7 +81,12 @@ public function testTypeConvertToDisplayTypeImplicitlyNullable()
         $this->assertEquals(\ReflectionParameter::class, get_class($nativeParamRefArr[0]));
         $nativeTypeRef = $nativeParamRefArr[0]->getType();
         $this->assertTrue($nativeTypeRef->allowsNull());
-        $this->assertEquals('string', (string)$nativeTypeRef);
+        // TODO: To prevent deprecation error in tests
+        if (PHP_VERSION_ID < 70400) {
+            $this->assertEquals('string', (string)$nativeTypeRef);
+        } else {
+            $this->assertEquals('string', $nativeTypeRef->getName());
+        }
         $this->assertNotContains('\\', get_class($nativeTypeRef));
         $this->assertInstanceOf(\ReflectionType::class, $nativeTypeRef);
         $this->assertEquals('string or NULL', \Go\ParserReflection\ReflectionType::convertToDisplayType($nativeTypeRef));
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,7 @@ public function testCoverAllMethods() @@
             }
             if ($allMissedMethods) {
-                $this->markTestIncomplete('Methods ' . join($allMissedMethods, ', ') . ' are not implemented');
+                $this->markTestIncomplete('Methods ' . join(', ', $allMissedMethods) . ' are not implemented');
             }
         }
@@ Expand Down @@