fix bug in ClassListener.php that caused shouldListen to not be called when a Listener got created as a string callable Listener@handle

Author: calvinalkan

src/Listeners/ClassListener.php

@@ -5,8 +5,10 @@
 	use BetterWpHooks\Contracts\AbstractListener;
 	use BetterWpHooks\Traits\ReflectsCallable;
 	use Contracts\ContainerAdapter;
-	
-	use function BetterWpHooks\Functions\normalizeClassMethod;
+
+    use Illuminate\Support\Str;
+
+    use function BetterWpHooks\Functions\normalizeClassMethod;
 
 	class ClassListener extends AbstractListener {
 
@@ -24,7 +26,7 @@ class ClassListener extends AbstractListener {
 
 		public function __construct( array $listener, ContainerAdapter $container ) {
 
-			$this->class_callable = array_values( $listener );
+			$this->class_callable = $this->toArrayCallable( $listener );
 			$this->container      = $container;
 
 		}
@@ -35,15 +37,13 @@ public function toArray(): array {
 			return $this->class_callable;
 
 		}
-		
-		
+
 		public function execute( $payload ) {
 
 			return $this->callClassMethod( $this->class_callable, $payload );
 
 		}
-		
-		
+
 		public function aliases(): array {
 
 			return [
@@ -54,8 +54,7 @@ public function aliases(): array {
 			];
 
 		}
-		
-		
+
 		public function shouldHandle( $payload ): bool {
 
 			if ( ! $hasTrait = $this->hasConditionalTrait( $this->class_callable[0] ) ) {
@@ -66,8 +65,7 @@ public function shouldHandle( $payload ): bool {
 
 
 		}
-		
-		
+
 		private function callClassMethod( array $class_callable, $payload ) {
 
 			$parameters = $this->buildParameterNames( $class_callable, $payload );
@@ -76,6 +74,20 @@ private function callClassMethod( array $class_callable, $payload ) {
 
 
 		}
-		
+
+		private function toArrayCallable(array $listener) : array
+        {
+
+		    $listener = array_values($listener);
+
+		    if (Str::contains($listener[0],'@')) {
+
+		        $listener = Str::parseCallback($listener[0]);
+
+            }
+
+		    return $listener;
+
+        }
 
 	}

tests/Unit/WordpressDispatcherTest.php

@@ -821,7 +821,34 @@ public function the_payload_is_not_changed_when_a_listener_does_not_listen_at_ru
 
 
 		}
-		
+
+		/** @test */
+        public function should_listen_gets_called_even_when_the_listener_got_created_as_a_string_callable()
+        {
+
+            // Class Listener
+            $_SERVER['should_handle'] = TRUE;
+
+            $this->dispatcher->listen( 'event', ConditionalListener::class . '@foobar' );
+
+            $this->dispatchAndAssertAction( 'event', 'foo', [ ConditionalListener::class . '@foobar', 'foobar' ] );
+
+            $this->reset();
+
+
+            // Nothing
+            $_SERVER['should_handle'] = FALSE;
+
+            $this->dispatcher->listen( 'event',  ConditionalListener::class . '@foobar'  );
+
+            $this->dispatchAndAssertNoActionDone( 'event', 'foo', [
+                ConditionalListener::class . '@foobar',
+                'foobar',
+            ] );
+
+            unset( $_SERVER['should_handle'] );
+
+		}
 
 
 		/**