Make phpstan happier (a bit) (#1013)

zircote · Dec 6, 2021 · f2984cb · f2984cb
1 parent f754f85
commit f2984cb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Analysers/AttributeAnnotationFactory.php b/src/Analysers/AttributeAnnotationFactory.php
@@ -25,7 +25,7 @@ public function setGenerator(Generator $generator): void
 
     public function build(\Reflector $reflector, Context $context): array
     {
-        if (\PHP_VERSION_ID < 80100) {
+        if (\PHP_VERSION_ID < 80100 || !method_exists($reflector, 'getAttributes')) {
             return [];
         }
 
@@ -45,7 +45,7 @@ public function build(\Reflector $reflector, Context $context): array
                     foreach ($rp->getAttributes(PathParameter::class) as $attribute) {
                         $instance = $attribute->newInstance();
                         $instance->name = $rp->getName();
-                        if ($rnt = $rp->getType()) {
+                        if (($rnt = $rp->getType()) && $rnt instanceof \ReflectionNamedType) {
                             $instance->schema = new Schema(['type' => $rnt->getName(), '_context' => new Context(['nested' => $this], $context)]);
                         }
                         $annotations[] = $instance;

diff --git a/src/Analysers/DocBlockAnnotationFactory.php b/src/Analysers/DocBlockAnnotationFactory.php
@@ -32,7 +32,7 @@ public function setGenerator(Generator $generator): void
     public function build(\Reflector $reflector, Context $context): array
     {
         $aliases = $this->generator ? $this->generator->getAliases() : [];
-        if (method_exists($reflector, 'getShortName')) {
+        if (method_exists($reflector, 'getShortName') && method_exists($reflector, 'getName')) {
             $aliases[strtolower($reflector->getShortName())] = $reflector->getName();
         }
 
@@ -44,7 +44,7 @@ public function build(\Reflector $reflector, Context $context): array
         }
         $this->docBlockParser->setAliases($aliases);
 
-        if ($comment = $reflector->getDocComment()) {
+        if (method_exists($reflector, 'getDocComment') && ($comment = $reflector->getDocComment())) {
             return $this->docBlockParser->fromComment($comment, $context);
         }
 

diff --git a/src/Serializer.php b/src/Serializer.php
@@ -58,7 +58,7 @@ class Serializer
 
     public static function isValidAnnotationClass($className)
     {
-        return in_array($className, static::$VALID_ANNOTATIONS);
+        return in_array($className, self::$VALID_ANNOTATIONS);
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,7 +58,7 @@ class Serializer @@
         public static function isValidAnnotationClass($className)
         {
-            return in_array($className, static::$VALID_ANNOTATIONS);
+            return in_array($className, self::$VALID_ANNOTATIONS);
         }
         /**
@@ Expand Down @@