Scrutinizer fixes

src/NodeVisitor/RootNamespaceNormalizer.php

@@ -23,7 +23,15 @@
 class RootNamespaceNormalizer extends NodeVisitorAbstract
 {
     /**
-     * {@inheritdoc}
+     * Called once before traversal.
+     *
+     * Return value semantics:
+     *  * null:      $nodes stays as-is
+     *  * otherwise: $nodes is set to the return value
+     *
+     * @param Node[] $nodes Array of nodes
+     *
+     * @return null|Node[] Array of nodes
      */
     public function beforeTraverse(array $nodes)
     {

src/ReflectionFile.php

@@ -50,6 +50,9 @@ class ReflectionFile
      */
     public function __construct($fileName, $topLevelNodes = null)
     {
+        if (!is_string($fileName)) {
+            throw new \InvalidArgumentException(sprintf('$fileName must be a string, but a %s was passed', gettype($fileName)));
+        }
         $fileName            = PathResolver::realpath($fileName);
         $this->fileName      = $fileName;
         $this->topLevelNodes = $topLevelNodes ?: ReflectionEngine::parseFile($fileName);

src/ReflectionFileNamespace.php

@@ -83,6 +83,9 @@ class ReflectionFileNamespace
      */
     public function __construct($fileName, $namespaceName, Namespace_ $namespaceNode = null)
     {
+        if (!is_string($fileName)) {
+            throw new \InvalidArgumentException(sprintf('$fileName must be a string, but a %s was passed', gettype($fileName)));
+        }
         $fileName = PathResolver::realpath($fileName);
         if (!$namespaceNode) {
             $namespaceNode = ReflectionEngine::parseFileNamespace($fileName, $namespaceName);

src/ReflectionMethod.php

@@ -81,6 +81,7 @@ public function ___debugInfo()
     public function __toString()
     {
         $hasReturnType    = $this->hasReturnType();
+        $returnType       = $hasReturnType ? $this->getReturnType() : null;
         $paramsNeeded     = $hasReturnType || $this->getNumberOfParameters() > 0;
         $paramFormat      = $paramsNeeded ? "\n\n  - Parameters [%d] {%s\n  }" : '';
         $returnFormat     = $hasReturnType ? "\n  - Return [ %s ]" : '';
@@ -114,7 +115,7 @@ public function __toString()
             $this->getEndLine(),
             count($methodParameters),
             $paramString,
-            $hasReturnType ? ReflectionType::convertToDisplayType($this->getReturnType()) : ''
+            $returnType ? ReflectionType::convertToDisplayType($returnType) : ''
         );
     }
 

src/ReflectionType.php

@@ -85,14 +85,14 @@ public static function convertToDisplayType(\ReflectionType $type)
             'int'  => 'integer',
             'bool' => 'boolean'
         ];
-        $displayType = $type->type;
+        $displayType = (string)$type;
         if (isset($typeMap[$displayType])) {
             $displayType = $typeMap[$displayType];
         }
 
         $displayType = ltrim($displayType, '\\');
 
-        if ($type->allowsNull()) {
+        if (method_exists($type, 'allowsNull') && $type->allowsNull()) {
             $displayType .= ' or NULL';
         }
 

src/Traits/ReflectionClassLikeTrait.php

@@ -11,6 +11,7 @@
 namespace Go\ParserReflection\Traits;
 
 use Go\ParserReflection\ReflectionClass;
+use ReflectionClass as BaseReflectionClass;
 use Go\ParserReflection\ReflectionException;
 use Go\ParserReflection\ReflectionMethod;
 use Go\ParserReflection\ReflectionProperty;
@@ -442,7 +443,7 @@ public function getParentClass()
             $extendsNode = $hasExtends ? $this->classLikeNode->$extendsField : null;
             if ($extendsNode instanceof FullyQualified) {
                 $extendsName = $extendsNode->toString();
-                $parentClass = class_exists($extendsName, false) ? new parent($extendsName) : new static($extendsName);
+                $parentClass = class_exists($extendsName, false) ? new BaseReflectionClass($extendsName) : new ReflectionClass($extendsName);
             }
             $this->parentClass = $parentClass;
         }
@@ -698,8 +699,16 @@ public function isInstance($object)
         }
 
         $className = $this->getName();
-
-        return $className === get_class($object) || is_subclass_of($object, $className);
+        $objClass = get_class($object);
+        if ($className === $objClass) {
+            return true;
+        }
+        $objClassRef = new BaseReflectionClass($objClass);
+        if ($objClassRef->isSubclassOf($className)) {
+            return true;
+        }
+        $thisIsInterface = $this->isInterface();
+        return $thisIsInterface && $objClassRef->implementsInterface($className);
     }
 
     /**

src/Traits/ReflectionFunctionLikeTrait.php

@@ -220,6 +220,15 @@ public function getStartLine()
      */
     public function getStaticVariables()
     {
+        // In nikic/PHP-Parser < 2.0.0 the default behavior is cloning
+        //     nodes when traversing them. Passing FALSE to the constructor
+        //     prevents this.
+        // In nikic/PHP-Parser >= 2.0.0 and < 3.0.0 the default behavior was
+        //     changed to not clone nodes, but the parameter was retained as
+        //     an option.
+        // In nikic/PHP-Parser >= 3.0.0 the option to clone nodes was removed
+        //     as a constructor parameter, so Scrutinizer will pick this up as
+        //     an issue. It is retained for legacy compatibility.
         $nodeTraverser      = new NodeTraverser(false);
         $variablesCollector = new StaticVariablesCollector($this);
         $nodeTraverser->addVisitor($variablesCollector);
@@ -274,6 +283,15 @@ public function isDeprecated()
      */
     public function isGenerator()
     {
+        // In nikic/PHP-Parser < 2.0.0 the default behavior is cloning
+        //     nodes when traversing them. Passing FALSE to the constructor
+        //     prevents this.
+        // In nikic/PHP-Parser >= 2.0.0 and < 3.0.0 the default behavior was
+        //     changed to not clone nodes, but the parameter was retained as
+        //     an option.
+        // In nikic/PHP-Parser >= 3.0.0 the option to clone nodes was removed
+        //     as a constructor parameter, so Scrutinizer will pick this up as
+        //     an issue. It is retained for legacy compatibility.
         $nodeTraverser = new NodeTraverser(false);
         $nodeDetector  = new GeneratorDetector();
         $nodeTraverser->addVisitor($nodeDetector);

src/ValueResolver/NodeExpressionResolver.php

@@ -142,7 +142,7 @@ protected function resolveScalarString(Scalar\String_ $node)
     protected function resolveScalarMagicConstMethod()
     {
         if ($this->context instanceof \ReflectionMethod) {
-            $fullName = $this->context->getDeclaringClass()->getName() . '::' . $this->context->getShortName();
+            $fullName = $this->context->class . '::' . $this->context->getShortName();
 
             return $fullName;
         }
@@ -175,12 +175,12 @@ protected function resolveScalarMagicConstNamespace()
     protected function resolveScalarMagicConstClass()
     {
         if ($this->context instanceof \ReflectionClass) {
-            return $this->context->getName();
+            return $this->context->name;
         }
         if (method_exists($this->context, 'getDeclaringClass')) {
             $declaringClass = $this->context->getDeclaringClass();
             if ($declaringClass instanceof \ReflectionClass) {
-                return $declaringClass->getName();
+                return $declaringClass->name;
             }
         }
 
@@ -213,7 +213,7 @@ protected function resolveScalarMagicConstLine(MagicConst\Line $node)
     protected function resolveScalarMagicConstTrait()
     {
         if ($this->context instanceof \ReflectionClass && $this->context->isTrait()) {
-            return $this->context->getName();
+            return $this->context->name;
         }
 
         return '';
@@ -224,15 +224,14 @@ protected function resolveExprConstFetch(Expr\ConstFetch $node)
         $constantValue = null;
         $isResolved    = false;
 
-        /** @var ReflectionFileNamespace|null $fileNamespace */
-        $fileNamespace = null;
         $isFQNConstant = $node->name instanceof Node\Name\FullyQualified;
         $constantName  = $node->name->toString();
 
         if (!$isFQNConstant) {
             if (method_exists($this->context, 'getFileName')) {
                 $fileName      = $this->context->getFileName();
                 $namespaceName = $this->resolveScalarMagicConstNamespace();
+                /** @var ReflectionFileNamespace $fileNamespace */
                 $fileNamespace = new ReflectionFileNamespace($fileName, $namespaceName);
                 if ($fileNamespace->hasConstant($constantName)) {
                     $constantValue = $fileNamespace->getConstant($constantName);
@@ -256,7 +255,12 @@ protected function resolveExprConstFetch(Expr\ConstFetch $node)
 
     protected function resolveExprClassConstFetch(Expr\ClassConstFetch $node)
     {
-        $refClass     = $this->fetchReflectionClass($node->class);
+        $classToReflect = $node->class;
+        if ($classToReflect instanceof Expr) {
+            $refClass = $this->resolve($classToReflect);
+        } else {
+            $refClass = $this->fetchReflectionClass($node->class);
+        }
         $constantName = $node->name;
 
         // special handling of ::class constants

src/bootstrap.php

@@ -12,10 +12,9 @@
 use Go\ParserReflection\ReflectionEngine;
 
 /**
- * This file is used for automatic configuration of Go\ParserReflection\ReflectionEngine class
+ * This file is used for automatic configuration of
+ * Go\ParserReflection\ReflectionEngine class
  */
 ReflectionEngine::init(new ComposerLocator());
-// Polifyll for PHP<7.0
-if (!class_exists(ReflectionType::class, false)) {
-    class ReflectionType {}
-}
+
+require(__DIR__ . '/polyfill.php');

src/polyfill.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Parser Reflection API
+ *
+ * @copyright Copyright 2015, Lisachenko Alexander <[email protected]>
+ *
+ * This source file is subject to the license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+/**
+ * This file is for ployfilling classes not defined in all supported
+ * versions of PHP, (i.e. PHP < 7).
+ */
+if (!class_exists(ReflectionType::class, false)) {
+    class ReflectionType
+    {
+        public function allowsNull()
+        {
+            return true;
+        }
+    }
+}