Merge pull request #38 from bigcommerce/microopt

Micro-optimisations to ClassInspector and ParameterInspector

Author: TomA-R

.phpstan/baseline.neon

@@ -120,12 +120,6 @@ parameters:
 			count: 1
 			path: ../src/InjectorServiceProvider.php
 
-		-
-			message: '#^Call to an undefined method ReflectionType\:\:getName\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: ../src/Reflection/ParameterInspector.php
-
 		-
 			message: '#^Method Bigcommerce\\Injector\\Reflection\\ParameterInspector\:\:getMethodSignature\(\) has parameter \$refClass with generic class ReflectionClass but does not specify its types\: T$#'
 			identifier: missingType.generics

src/Reflection/ClassInspector.php

@@ -73,9 +73,8 @@ public function getStats(): ClassInspectorStats
      */
     private function getReflectionClass(string $class): ReflectionClass
     {
-        if ($this->reflectionClassCache->has($class)) {
-            $reflectionClass = $this->reflectionClassCache->get($class);
-        } else {
+        $reflectionClass = $this->reflectionClassCache->get($class);
+        if ($reflectionClass === null) {
             $reflectionClass = new ReflectionClass($class);
             $this->stats->incrementReflectionClassesCreated();
             $this->reflectionClassCache->put($reflectionClass);

src/Reflection/ParameterInspector.php

@@ -1,6 +1,8 @@
 <?php
 namespace Bigcommerce\Injector\Reflection;
 
+use ReflectionNamedType;
+
 /**
  * The ParameterInspector exposes cached reflection of a methods signature enabling auto-wiring of dependencies within
  * the Injector. This class does expose the \ReflectionParameter or utilise Parameter value objects but
@@ -64,7 +66,7 @@ private function getMethodSignature($className, $methodName, ?\ReflectionClass $
                     "name" => $name
                 ];
                 $type = $parameter->getType();
-                if ($type && method_exists($type, 'isBuiltin') && !$type->isBuiltin()) {
+                if ($type instanceof ReflectionNamedType && !$type->isBuiltin()) {
                     $parameterSignature['type'] = $type->getName();
                 }
                 if ($parameter->isDefaultValueAvailable()) {
@@ -77,8 +79,8 @@ private function getMethodSignature($className, $methodName, ?\ReflectionClass $
                 $methodSignature[] = $parameterSignature;
             }
         } catch (\ReflectionException $e) {
-            //The requested method doesn't exist on this class. Check if the class provides a magic call method or die.
-            if (!method_exists($className, "__call")) {
+            // The requested method doesn't exist on this class. Check if the class provides a magic call method or die.
+            if (!$refClass->hasMethod("__call")) {
                 throw $e;
             }
         }