Make codestyle happy

Signed-off-by: Sven Rautenberg <[email protected]>
laminas · Jan 14, 2025 · eb54767 · eb54767
1 parent 523e13c
commit eb54767
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -394,6 +394,9 @@
     <PossiblyUnusedProperty>
       <code><![CDATA[$property]]></code>
     </PossiblyUnusedProperty>
+    <UnusedProperty>
+      <code><![CDATA[$closure]]></code>
+    </UnusedProperty>
   </file>
   <file src="test/Psr/CacheItemPool/CacheItemPoolDecoratorTest.php">
     <InvalidArgument>

diff --git a/src/Pattern/CallbackCache.php b/src/Pattern/CallbackCache.php
@@ -7,6 +7,7 @@
 
 use function array_key_exists;
 use function array_values;
+use function is_array;
 use function is_callable;
 use function is_object;
 use function md5;
@@ -111,19 +112,18 @@ public function generateKey(callable $callback, array $args = []): string
      */
     protected function generateCallbackKey(callable $callback, array $args): string
     {
+        if (! is_callable($callback, false, $callbackKey)) {
+            throw new Exception\InvalidArgumentException('Invalid callback');
+        }
 
         // Create a cache key for the ObjectCache use case.
         $options = $this->getOptions();
-        if (is_object($options->getObject())) {
+        if (is_object($options->getObject()) && is_array($callback) && isset($callback[1])) {
             $callbackKey = md5($options->getObjectKey() . '::' . strtolower($callback[1]));
             $argumentKey = $this->generateArgumentsKey($args);
             return $callbackKey . $argumentKey;
         }
 
-        if (! is_callable($callback, false, $callbackKey)) {
-            throw new Exception\InvalidArgumentException('Invalid callback');
-        }
-
         // functions, methods and classnames are case-insensitive
         $callbackKey = strtolower($callbackKey);
 

diff --git a/test/Pattern/TestAsset/TestObjectCache.php b/test/Pattern/TestAsset/TestObjectCache.php
@@ -4,6 +4,8 @@
 
 namespace LaminasTest\Cache\Pattern\TestAsset;
 
+use Closure;
+
 use function func_get_args;
 use function implode;
 
@@ -22,13 +24,15 @@ final class TestObjectCache
     /** @var string */
     public $property = 'testProperty';
 
-    private \Closure $closure;
+    private Closure $closure;
 
     public function __construct()
     {
         // Closures prevent serialization - this acts as a detector to verify this object is not serialized during test.
-        $this->closure = function () {};
+        $this->closure = function (): void {
+        };
     }
+
     public function bar(): string
     {
         ++static::$fooCounter;