deprecate calling queue method on handlers

laravel · Feb 6, 2017 · 0360cb1 · 0360cb1
1 parent d41435a
commit 0360cb1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 128 deletions.
diff --git a/src/Illuminate/Events/CallQueuedHandler.php b/src/Illuminate/Events/CallQueuedHandler.php
diff --git a/src/Illuminate/Events/Dispatcher.php b/src/Illuminate/Events/Dispatcher.php
@@ -411,35 +411,12 @@ protected function handlerShouldBeQueued($class)
     protected function createQueuedHandlerCallable($class, $method)
     {
         return function () use ($class, $method) {
-            $arguments = array_map(function ($a) {
+            $this->queueHandler($class, $method, array_map(function ($a) {
                 return is_object($a) ? clone $a : $a;
-            }, func_get_args());
-
-            if (method_exists($class, 'queue')) {
-                $this->callQueueMethodOnHandler($class, $method, $arguments);
-            } else {
-                $this->queueHandler($class, $method, $arguments);
-            }
+            }, func_get_args()));
         };
     }
 
-    /**
-     * Call the queue method on the handler class.
-     *
-     * @param  string  $class
-     * @param  string  $method
-     * @param  array  $arguments
-     * @return void
-     */
-    protected function callQueueMethodOnHandler($class, $method, $arguments)
-    {
-        $handler = (new ReflectionClass($class))->newInstanceWithoutConstructor();
-
-        $handler->queue($this->resolveQueue(), 'Illuminate\Events\CallQueuedHandler@call', [
-            'class' => $class, 'method' => $method, 'data' => serialize($arguments),
-        ]);
-    }
-
     /**
      * Queue the handler class.
      *

diff --git a/tests/Events/EventsDispatcherTest.php b/tests/Events/EventsDispatcherTest.php
@@ -183,23 +183,6 @@ public function testQueuedEventHandlersAreQueued()
         $d->fire('some.event', ['foo', 'bar']);
     }
 
-    public function testQueuedEventHandlersAreQueuedWithCustomHandlers()
-    {
-        $d = new Dispatcher;
-        $queue = m::mock('Illuminate\Contracts\Queue\Queue');
-        $queue->shouldReceive('push')->once()->with('Illuminate\Events\CallQueuedHandler@call', [
-            'class' => 'Illuminate\Tests\Events\TestDispatcherQueuedHandlerCustomQueue',
-            'method' => 'someMethod',
-            'data' => serialize(['foo', 'bar']),
-        ]);
-        $d->setQueueResolver(function () use ($queue) {
-            return $queue;
-        });
-
-        $d->listen('some.event', 'Illuminate\Tests\Events\TestDispatcherQueuedHandlerCustomQueue@someMethod');
-        $d->fire('some.event', ['foo', 'bar']);
-    }
-
     public function testClassesWork()
     {
         unset($_SERVER['__event.test']);