Merge branch '1.x' of github.com:radarphp/Radar.Adr into 1.x

src/Adr.php

@@ -30,11 +30,6 @@ public function __call($method, $params)
         return call_user_func_array([$this->map, $method], $params);
     }
 
-    public function __invoke()
-    {
-        return call_user_func($this->dispatcher);
-    }
-
     public function before($spec)
     {
         $this->middle->before($spec);
@@ -74,4 +69,9 @@ public function sendingHandler($spec)
     {
         $this->dispatcher->sendingHandler($spec);
     }
+
+    public function run()
+    {
+        return $this->dispatcher->run();
+    }
 }

src/Boot.php

@@ -13,7 +13,7 @@ public function __construct($envPath)
         $this->envPath = $envPath;
     }
 
-    public function __invoke(array $config = [])
+    public function adr(array $config = [])
     {
         $loader = new Loader($this->envPath);
         $loader->parse();

src/Dispatcher.php

@@ -34,7 +34,7 @@ public function __get($key)
         return $this->$key;
     }
 
-    public function __invoke()
+    public function run()
     {
         try {
             $this->inbound();
@@ -71,22 +71,18 @@ public function sendingHandler($spec)
 
     protected function inbound()
     {
-        $middle = $this->middle;
-
-        $early = $middle($this->request, $this->response, 'before');
+        $early = $this->middle->run($this->request, $this->response, 'before');
         if ($early) {
             return;
         }
 
         $this->response = $this->action($this->route());
-        $middle($this->request, $this->response, 'after');
+        $this->middle->run($this->request, $this->response, 'after');
     }
 
     protected function route()
     {
-        $factory = $this->factory;
-
-        $routingHandler = $factory($this->routingHandler);
+        $routingHandler = $this->factory->invokable($this->routingHandler);
         $route = $routingHandler($this->request);
         foreach ($route->attributes as $key => $val) {
             $this->request = $this->request->withAttribute($key, $val);
@@ -96,26 +92,21 @@ protected function route()
 
     protected function action(Route $route)
     {
-        $factory = $this->factory;
-        $actionHandler = $factory($this->actionHandler);
+        $actionHandler = $this->factory->invokable($this->actionHandler);
         return $actionHandler($this->request, $this->response, $route);
     }
 
     protected function outbound()
     {
-        $factory = $this->factory;
-        $sendingHandler = $factory($this->sendingHandler);
+        $sendingHandler = $this->factory->invokable($this->sendingHandler);
         $sendingHandler($this->response);
-
-        $middle = $this->middle;
-        $middle($this->request, $this->response, 'finish');
+        $this->middle->run($this->request, $this->response, 'finish');
     }
 
 
     protected function exception(Exception $exception)
     {
-        $factory = $this->factory;
-        $exceptionHandler = $factory($this->exceptionHandler);
+        $exceptionHandler = $this->factory->invokable($this->exceptionHandler);
         $this->response = $exceptionHandler(
             $this->request,
             $this->response,

src/Factory.php

@@ -12,7 +12,7 @@ public function __construct(InjectionFactory $injectionFactory)
         $this->injectionFactory = $injectionFactory;
     }
 
-    public function __invoke($spec)
+    public function invokable($spec)
     {
         if (is_string($spec)) {
             return $this->injectionFactory->newInstance($spec);

src/Handler/ActionHandler.php

@@ -20,8 +20,7 @@ public function __invoke(
         ResponseInterface $response,
         Route $route
     ) {
-        $factory = $this->factory;
-        $responder = $factory($route->responder);
+        $responder = $this->factory->invokable($route->responder);
 
         if ($route->domain) {
             $payload = $this->domain($route, $request);
@@ -33,12 +32,11 @@ public function __invoke(
 
     protected function domain(Route $route, ServerRequestInterface $request)
     {
-        $factory = $this->factory;
-        $domain = $factory($route->domain);
+        $domain = $this->factory->invokable($route->domain);
 
         $input = [];
         if ($route->input) {
-            $input = $factory($route->input);
+            $input = $this->factory->invokable($route->input);
             $input = (array) $input($request);
             return call_user_func_array($domain, $input);
         }

src/Handler/SendingHandler.php

@@ -12,7 +12,7 @@ public function __invoke(ResponseInterface $response)
         $this->sendBody($response);
     }
 
-    protected function sendStatus($response)
+    protected function sendStatus(ResponseInterface $response)
     {
         $version = $response->getProtocolVersion();
         $status = $response->getStatusCode();

src/Middle.php

@@ -15,16 +15,15 @@ public function __construct(Factory $factory)
         $this->factory = $factory;
     }
 
-    public function __invoke(
+    public function run(
         ServerRequestInterface &$request,
         ResponseInterface &$response,
         $key
     ) {
-        $factory = $this->factory;
         ksort($this->$key);
         foreach ($this->$key as $priority => $classes) {
             foreach ($classes as $class) {
-                $object = $factory($class);
+                $object = $this->factory->invokable($class);
                 $early = $object($request, $response);
                 if ($early instanceof ResponseInterface) {
                     $response = $early;

tests/AdrTest.php

@@ -80,10 +80,10 @@ public function testGetDispatcherParams()
         $this->assertSame($expect, $this->fakeMiddle->finish);
     }
 
-    public function testInvoke()
+    public function testRun()
     {
-        $expect = 'Radar\Adr\Fake\FakeDispatcher::__invoke';
-        $actual = $this->adr->__invoke();
+        $expect = 'Radar\Adr\Fake\FakeDispatcher::run';
+        $actual = $this->adr->run();
         $this->assertSame($expect, $actual);
     }
 }

tests/DispatcherTest.php

@@ -26,13 +26,13 @@ protected function newAdr(array $server = [])
         FakeWare::$count = 0;
         $_SERVER = array_merge($_SERVER, $server);
         $boot = new Boot(__DIR__ . DIRECTORY_SEPARATOR . '_env');
-        return $boot();
+        return $boot->adr();
     }
 
     protected function assertOutput($adr, $expectHeaders, $expectBody)
     {
         ob_start();
-        $adr();
+        $adr->run();
         $actualBody = ob_get_clean();
         $this->assertEquals($expectBody, $actualBody);
         $this->assertEquals($expectHeaders, FakePhp::$headers);

tests/Fake/FakeDispatcher.php

@@ -10,7 +10,7 @@ public function __construct(FakeMiddle $middle)
         $this->middle = $middle;
     }
 
-    public function __invoke() {
+    public function run() {
         return __METHOD__;
     }
 }