Backport/2.x generator property fix (#30)

* #24 For PHP version >= 7.4.0 look for the properties explicit type declaration first (#25) * #24 For PHP version >= 7.4.0 look for the properties explicit type declaration first * Apply suggestions from code review Co-authored-by: Pavel Alexeev <[email protected]> Co-authored-by: Nick <[email protected]> * fix stan (#27) * fix import Co-authored-by: Pavel Alexeev aka Pahan-Hubbitus <[email protected]> Co-authored-by: Pavel Alexeev <[email protected]>
php-kafka · Dec 8, 2021 · 1111c9a · 1111c9a
1 parent 0d6e73b
commit 1111c9a
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/src/Parser/TokenParser.php b/src/Parser/TokenParser.php
@@ -199,11 +199,23 @@ public function getProperties(string $classPath): array
      */
     public function getPropertyClass(ReflectionProperty $property, bool $ignorePrimitive = true)
     {
-        // Get the content of the @var annotation
-        if (preg_match('/@var\s+([^\s]+)/', (string) $property->getDocComment(), $matches)) {
-            list(, $type) = $matches;
-        } else {
-            return null;
+        $type = null;
+        $phpVersion = false === phpversion() ? '7.0.0' : phpversion();
+        // Get is explicit type decralation if possible
+        if (version_compare($phpVersion, '7.4.0', '>=') && null !== $property->getType()) {
+            $reflectionType = $property->getType();
+
+            if ($reflectionType instanceof \ReflectionNamedType) {
+                $type = $reflectionType->getName();
+            }
+        }
+
+        if (is_null($type)) { // Try get the content of the @var annotation
+            if (preg_match('/@var\s+([^\s]+)/', (string) $property->getDocComment(), $matches)) {
+                list(, $type) = $matches;
+            } else {
+                return null;
+            }
         }
 
         $types = explode('|', $this->replaceTypeStrings($type));