Merge pull request #278 from cakephp/2.next-more-dic

2.next: more DIC

Author: markstory

src/Middleware/AuthorizationMiddleware.php

@@ -27,6 +27,7 @@
 use Authorization\IdentityInterface;
 use Authorization\Middleware\UnauthorizedHandler\UnauthorizedHandlerTrait;
 use Cake\Core\ContainerApplicationInterface;
+use Cake\Core\ContainerInterface;
 use Cake\Core\InstanceConfigTrait;
 use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
@@ -73,15 +74,26 @@ class AuthorizationMiddleware implements MiddlewareInterface
      */
     protected $subject;
 
+    /**
+     * The container instance from the application
+     *
+     * @var \Cake\Core\ContainerInterface|null
+     */
+    protected $container;
+
     /**
      * Constructor.
      *
      * @param \Authorization\AuthorizationServiceInterface|\Authorization\AuthorizationServiceProviderInterface $subject Authorization service or provider instance.
      * @param array $config Config array.
+     * @param \Cake\Core\ContainerInterface|null $container The container instance from the application
      * @throws \InvalidArgumentException
      */
-    public function __construct($subject, array $config = [])
-    {
+    public function __construct(
+        $subject,
+        array $config = [],
+        ?ContainerInterface $container = null
+    ) {
         /** @psalm-suppress DocblockTypeContradiction */
         if (
             !$subject instanceof AuthorizationServiceInterface &&
@@ -104,6 +116,7 @@ public function __construct($subject, array $config = [])
         }
 
         $this->subject = $subject;
+        $this->container = $container;
         $this->setConfig($config);
     }
 
@@ -122,6 +135,8 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         if ($this->subject instanceof ContainerApplicationInterface) {
             $container = $this->subject->getContainer();
             $container->add(AuthorizationService::class, $service);
+        } elseif ($this->container) {
+            $this->container->add(AuthorizationService::class, $service);
         }
 
         $attribute = $this->getConfig('identityAttribute');

tests/TestCase/Middleware/AuthorizationMiddlewareTest.php

@@ -24,6 +24,7 @@
 use Authorization\IdentityDecorator;
 use Authorization\IdentityInterface;
 use Authorization\Middleware\AuthorizationMiddleware;
+use Cake\Core\Container;
 use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\Http\ServerRequestFactory;
@@ -302,4 +303,29 @@ public function testMiddlewareInjectsServiceIntoDIC()
         $container = $application->getContainer();
         $this->assertInstanceOf(AuthorizationService::class, $container->get(AuthorizationService::class));
     }
+
+    public function testMiddlewareInjectsServiceIntoDICViaCustomContainerInstance()
+    {
+        $request = ServerRequestFactory::fromGlobals(
+            ['REQUEST_URI' => '/testpath'],
+            [],
+            ['username' => 'mariano', 'password' => 'password']
+        );
+        $handler = new TestRequestHandler();
+
+        $service = $this->createMock(AuthorizationServiceInterface::class);
+        $provider = $this->createMock(AuthorizationServiceProviderInterface::class);
+        $provider
+            ->expects($this->once())
+            ->method('getAuthorizationService')
+            ->with($this->isInstanceOf(ServerRequestInterface::class))
+            ->willReturn($service);
+
+        $container = new Container();
+
+        $middleware = new AuthorizationMiddleware($provider, ['requireAuthorizationCheck' => false], $container);
+        $middleware->process($request, $handler);
+
+        $this->assertEquals($service, $container->get(AuthorizationService::class));
+    }
 }