PHP 8: test first class callable; fix static enum method

php/WP_Mock/HookedCallback.php

@@ -23,11 +23,29 @@ public function react($callback, $priority, $argument_count)
 
         $safe_callback = $this->safe_offset($callback);
 
-        if (is_array($callback)) {
-            $any_instance_callback = array( new AnyInstance($callback[0]), $callback[1] );
-            $safe_any_instance_callback = $this->safe_offset($any_instance_callback);
-            if (! empty($this->processors[ $safe_any_instance_callback ])) {
-                $safe_callback = $safe_any_instance_callback;
+        if (is_array($callback) && count($callback) === 2 && method_exists($callback[0], $callback[1])) {
+            $isEnum = false;
+            if(method_exists(\ReflectionClass::class, 'isEnum')) {
+                try {
+                    $rc = new \ReflectionClass($callback[0]);
+                    /** @phpstan-ignore-next-line (requires PHP 8.1+) */
+                    $isEnum = $rc->isEnum();
+                } catch (\ReflectionException $e) {
+                    // Unreachable: method_exists() above guarantees the class exists.
+                }
+            }
+            try {
+                $isStatic = (new \ReflectionMethod($callback[0], $callback[1]))->isStatic();
+            } catch (\ReflectionException $e) {
+                // Unreachable: method_exists() above guarantees the method exists.
+                $isStatic = false;
+            }
+            if(!$isEnum && !$isStatic) {
+                $any_instance_callback      = array( new AnyInstance( $callback[0] ), $callback[1] );
+                $safe_any_instance_callback = $this->safe_offset( $any_instance_callback );
+                if ( ! empty( $this->processors[ $safe_any_instance_callback ] ) ) {
+                    $safe_callback = $safe_any_instance_callback;
+                }
             }
         }
 

phpstan.neon

@@ -11,6 +11,9 @@ parameters:
 	paths:
 		- php
 		- tests
+	excludePaths:
+		# Enum syntax; phpstan analyses as PHP 7.4 (composer platform config). Only loaded at runtime on 8.1+.
+		- tests/Mocks/SampleEnum.php
 	bootstrapFiles:
 		- vendor/php-stubs/wordpress-globals/wordpress-globals.php
 		- vendor/php-stubs/wordpress-stubs/wordpress-stubs.php

tests/Integration/WP_MockTest.php

@@ -314,6 +314,47 @@ public function testCanExpectHooksAdded() : void
         add_action('wpMockTestAction', 'wpMockTestFunction', 10, 2);
         add_filter('wpMockTestFilter', 'wpMockTestFunction', 10, 2);
 
+        WP_Mock::expectActionAdded('wpMockTestAction', array(\WP_Mock\Tests\Mocks\SampleClass::class, 'staticMethod'));
+        add_action('wpMockTestAction', array(\WP_Mock\Tests\Mocks\SampleClass::class, 'staticMethod'));
+
+        $sampleClassInstance = new \WP_Mock\Tests\Mocks\SampleClass();
+        WP_Mock::expectActionAdded('wpMockTestAction', array($sampleClassInstance, 'action'), 10, 2);
+        add_action('wpMockTestAction', array($sampleClassInstance, 'action'), 10, 2);
+
+        /**
+         * PHP 8.1 First Class Callable – `$instance->method( ... )`.
+         *
+         * If we use PHP 8.1 syntax in this file it will fail to parse when run under older versions, so we
+         * will use `eval()` for now.
+         *
+         * @see https://www.php.net/manual/en/functions.first_class_callable_syntax.php
+         */
+        if(PHP_VERSION_ID >= 80100) {
+            $php81FirstClassCallableSyntaxPhpString = <<<'EOD'
+            WP_Mock::expectActionAdded('wpMockTestAction', $sampleClassInstance->action( ... ), 10, 2);
+            add_action('wpMockTestAction', $sampleClassInstance->action( ... ), 10, 2);
+            EOD;
+            eval($php81FirstClassCallableSyntaxPhpString);
+        }
+
+        /**
+         * @see https://www.php.net/manual/en/language.enumerations.methods.php
+         * @see https://www.php.net/manual/en/language.enumerations.static-methods.php
+         */
+        if(PHP_VERSION_ID >= 80100) {
+            $php81EnumMethodPhpString = <<<'EOD'
+            WP_Mock::expectActionAdded('wpMockTestAction', array(\WP_Mock\Tests\Mocks\SampleEnum::Code, 'method'));
+            add_action('wpMockTestAction', array(\WP_Mock\Tests\Mocks\SampleEnum::Code, 'method'));
+
+            WP_Mock::expectActionAdded('wpMockTestAction', array(\WP_Mock\Tests\Mocks\SampleEnum::class, 'staticMethod'));
+            add_action('wpMockTestAction', array(\WP_Mock\Tests\Mocks\SampleEnum::class, 'staticMethod'));
+
+            WP_Mock::expectActionAdded('wpMockTestAction', array(\WP_Mock\Functions::type(\WP_Mock\Tests\Mocks\SampleEnum::class), 'method'));
+            add_action('wpMockTestAction', array(\WP_Mock\Tests\Mocks\SampleEnum::Code, 'method'));
+            EOD;
+            eval($php81EnumMethodPhpString);
+        }
+
         WP_Mock::assertHooksAdded();
     }
 

tests/Mocks/SampleClass.php

@@ -7,4 +7,8 @@ class SampleClass
     public function action(): void
     {
     }
+
+    public static function staticMethod(): void
+    {
+    }
 }

tests/Mocks/SampleEnum.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace WP_Mock\Tests\Mocks;
+
+enum SampleEnum
+{
+    case Code;
+
+    public function method(): void
+    {
+    }
+
+    public static function staticMethod(): void
+    {
+    }
+}