Fixed phpstan, cs and psalm issues

Author: divineniiquaye

phpstan.neon.dist

@@ -10,9 +10,6 @@ parameters:
         -
             message: "#^Construct empty\\(\\) is not allowed. Use more strict comparison.$#"
             path: src/ArgumentResolver.php
-        -
-            message: "#^Parameter \\#1 \\$object of function get_class expects object, array<int, string> given.$#"
-            path: src/CallableReflection.php
         -
             message: "#^Construct empty\\(\\) is not allowed. Use more strict comparison.$#"
             path: src/Invoker.php

psalm.xml.dist

@@ -35,6 +35,18 @@
             </errorLevel>
         </InvalidCatch>
 
+        <InvalidArrayOffset>
+            <errorLevel type="suppress">
+                <file name="src/CallableReflection.php"/>
+            </errorLevel>
+        </InvalidArrayOffset>
+
+        <InvalidArrayAccess>
+            <errorLevel type="suppress">
+                <file name="src/CallableReflection.php"/>
+            </errorLevel>
+        </InvalidArrayAccess>
+
         <ArgumentTypeCoercion>
             <errorLevel type="suppress">
                 <referencedFunction name="ReflectionClass::__construct"/>

src/CallableReflection.php

@@ -55,7 +55,7 @@ public static function create($callable): ReflectionFunctionAbstract
         if (!\is_callable($callable)) {
             throw new NotCallableException(\sprintf(
                 '%s is not a callable',
-                \is_string($callable) ? $callable : 'Instance of ' . \get_class($callable)
+                \is_object($callable) ? 'Instance of ' . \get_class($callable) : var_export($callable, true)
             ));
         }
 

src/CallableResolver.php

@@ -81,12 +81,12 @@ public function resolve($callable)
     }
 
     /**
-     * @param array<mixed,string>|object|string $callable
-     * @param bool                              $isStaticCallToNonStaticMethod
+     * @param array<mixed,string>|callable|object|string $callable
+     * @param bool                                       $isStaticCallToNonStaticMethod
      *
      * @throws NotCallableException
      *
-     * @return array<mixed,string>|callable|string
+     * @return callable
      */
     private function resolveCallable($callable, bool $isStaticCallToNonStaticMethod)
     {
@@ -104,7 +104,7 @@ private function resolveCallable($callable, bool $isStaticCallToNonStaticMethod)
                 if (null !== $this->container) {
                     // Replace the container entry name by the actual object
                     $class = $this->container->get($class);
-                } elseif (\is_string($class) && \class_exists($class)) {
+                } elseif (\class_exists($class)) {
                     $class = new $class();
                 }
 
@@ -113,8 +113,8 @@ private function resolveCallable($callable, bool $isStaticCallToNonStaticMethod)
                 if ($isStaticCallToNonStaticMethod) {
                     throw new NotCallableException(\sprintf(
                         'Cannot call %s::%s() because %2$s() is not a static method and "%1$s" is not a valid',
-                        $callable[0],
-                        $callable[1]
+                        $class,
+                        $method
                     ), 0, $e);
                 }
 

src/Exceptions/NotCallableException.php

@@ -17,9 +17,6 @@
 
 namespace DivineNii\Invoker\Exceptions;
 
-use Psr\Container\ContainerExceptionInterface;
-use Throwable;
-
 /**
  * The given callable is not actually callable.
  *
@@ -28,9 +25,9 @@
 class NotCallableException extends InvocationException
 {
     /**
-     * @param mixed                                 $value
-     * @param bool                                  $containerEntry
-     * @param ContainerExceptionInterface|Throwable $previous
+     * @param mixed      $value
+     * @param bool       $containerEntry
+     * @param \Throwable $previous
      *
      * @return InvocationException
      */

tests/CallableReflectionTest.php

@@ -70,7 +70,7 @@ public function testCreateCatchReflectionException(): void
 
     public function testCreateNotCallableException(): void
     {
-        $this->expectExceptionMessage('handler is not a callable');
+        $this->expectExceptionMessage('\'handler\' is not a callable');
         $this->expectException(NotCallableException::class);
 
         CallableReflection::create('handler');

tests/CallableResolverTest.php

@@ -212,7 +212,7 @@ public function testResolveWithContainerAndMagicException($hasContainer): void
     public function testResolveWithContainerHasNotException(): void
     {
         $container    = $this->createMock(ContainerInterface::class);
-        $newException = new class('is not a callable, none.') extends InvocationException {
+        $newException = new class ('is not a callable, none.') extends InvocationException {
         };
 
         $container->method('has')->willReturn(false);
@@ -327,7 +327,7 @@ function (string $something): string {
      */
     public static function notFoundException()
     {
-        return new class('Is not a callable, yeah.') extends Exception implements NotFoundExceptionInterface {
+        return new class ('Is not a callable, yeah.') extends Exception implements NotFoundExceptionInterface {
         };
     }
 }