..

plvhx · Sep 24, 2017 · dd23bc2 · dd23bc2
1 parent 0bbd7ec
commit dd23bc2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/src/Invoker/MethodInvoker.php b/src/Invoker/MethodInvoker.php
@@ -14,7 +14,7 @@ class MethodInvoker implements InvokerInterface
      */
     private $method;
 
-    public function __construct(Container $container, $args)
+    public function __construct($args)
     {
         if (!is_array($args)) {
             throw new \InvalidArgumentException(
@@ -38,7 +38,7 @@ public function __construct(Container $container, $args)
 
         $args['instance'] = (!is_object($args['instance'])
             ? (class_exists($args['instance'])
-                ? $container->make($args['instance'])
+                ? (new Container)->make($args['instance'])
                 : null)
             : $args['instance']);
 

diff --git a/tests/Invoker/MethodInvokerTest.php b/tests/Invoker/MethodInvokerTest.php
@@ -13,7 +13,7 @@ class MethodInvokerTest extends \PHPUnit_Framework_TestCase
     public function testCanGetInstance()
     {
         $invoker = new MethodInvoker(
-            new Container, ['instance' => \SplPriorityQueue::class, 'method' => 'count']
+            ['instance' => \SplPriorityQueue::class, 'method' => 'count']
         );
 
         $this->assertInstanceOf(MethodInvoker::class, $invoker);
@@ -24,37 +24,37 @@ public function testCanGetInstance()
      */
     public function testCannotGetInstanceAndThrowsException0()
     {
-        $invoker = new MethodInvoker(new Container, null);
+        $invoker = new MethodInvoker(null);
     }
 
     /**
      * @expectedException \TaskQueue\Invoker\Exception\ArrayPairLengthAwareException
      */
     public function testCannotGetInstanceAndThrowsException1()
     {
-        $invoker = new MethodInvoker(new Container, []);
+        $invoker = new MethodInvoker([]);
     }
 
     /**
      * @expectedException \TaskQueue\Invoker\Exception\ClassInstanceException
      */
     public function testCannotGetInstanceAndThrowsException2()
     {
-        $invoker = new MethodInvoker(new Container, [\SplPriorityQueue::class, 'method' => 'count']);
+        $invoker = new MethodInvoker([\SplPriorityQueue::class, 'method' => 'count']);
     }
 
     /**
      * @expectedException \TaskQueue\Invoker\Exception\ClassMethodException
      */
     public function testCannotGetInstanceAndThrowsException3()
     {
-        $invoker = new MethodInvoker(new Container, ['instance' => \SplPriotiyQueue::class, 'count']);
+        $invoker = new MethodInvoker(['instance' => \SplPriotiyQueue::class, 'count']);
     }
 
     public function testCanInvokeMethodWithPHPBuiltinArgumentGetter()
     {
         $invoker = new MethodInvoker(
-            new Container, ['instance' => \SplPriorityQueue::class, 'method' => 'count']
+            ['instance' => \SplPriorityQueue::class, 'method' => 'count']
         );
 
         $this->assertInstanceOf(MethodInvoker::class, $invoker);
@@ -68,7 +68,7 @@ public function testCanInvokeMethodWithPHPBuiltinArgumentGetter()
     public function testCannotInvokeMethodAndThrowsException()
     {
         $invoker = new MethodInvoker(
-            new Container, ['instance' => \SplPriorityQueue::class, 'method' => 'count']
+            ['instance' => \SplPriorityQueue::class, 'method' => 'count']
         );
 
         $invoker->invokeWithArgs(null);
@@ -77,7 +77,7 @@ public function testCannotInvokeMethodAndThrowsException()
     public function testCanInvokeMethodWithArrayOfArguments()
     {
         $invoker = new MethodInvoker(
-            new Container, ['instance' => \SplPriorityQueue::class, 'method' => 'count']
+            ['instance' => \SplPriorityQueue::class, 'method' => 'count']
         );
 
         $this->assertInstanceOf(MethodInvoker::class, $invoker);

diff --git a/tests/TaskQueueTest.php b/tests/TaskQueueTest.php
@@ -36,4 +36,14 @@ public function testCanRegisterFunctionBasedMultipleTasks()
 
         $taskQueue->run();
     }
+
+    public function testCanRegisterMethodBasedSingleTask()
+    {
+        $taskQueue = new TaskQueue;
+
+	$taskQueue
+            ->add(new MethodInvoker(['instance' => new \SplFixedArray, 'method' => 'count']));
+
+        $taskQueue->run();
+    }
 }