PHP 7.4 ReflectionType deprecation fixes (#65)

janlam7 · web-flow · commit 918ae555bbcc · 2020-10-22T12:27:49.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ matrix:
         - php: 7.2
           env: deps=lowest
         - php: 7.3
+        - php: 7.4
 
 install:
     - if [ -z "$deps" ]; then composer install; fi;
diff --git a/src/ReflectionMethod.php b/src/ReflectionMethod.php
@@ -75,7 +75,7 @@ public function getReturnType()
 
         if ($type = $this->method->getReturnType()) {
             // Self is not valid when used in different places.
-            if ('self' === $type->__toString()) {
+            if ('self' === $type->getName()) {
                 return null;
             }
 
diff --git a/src/ReflectionType.php b/src/ReflectionType.php
@@ -15,7 +15,7 @@ public function __construct(\ReflectionType $type)
 
     public function getName()
     {
-        $name = (string) $this->type;
+        $name = $this->type->getName();
 
         // Some types can not be qualified
         if (in_array($name, self::NON_QUALIFIED_TYPES, true)) {

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function getReturnType()`
`75`	`75`
`76`	`76`	`if ($type = $this->method->getReturnType()) {`
`77`	`77`	`// Self is not valid when used in different places.`
`78`		`- if ('self' === $type->__toString()) {`
	`78`	`+ if ('self' === $type->getName()) {`
`79`	`79`	`return null;`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public function __construct(\ReflectionType $type)`
`15`	`15`
`16`	`16`	`public function getName()`
`17`	`17`	`{`
`18`		`- $name = (string) $this->type;`
	`18`	`+ $name = $this->type->getName();`
`19`	`19`
`20`	`20`	`// Some types can not be qualified`
`21`	`21`	`if (in_array($name, self::NON_QUALIFIED_TYPES, true)) {`