version 1 released - Zend Expressive 3 ready

Author: gabidj

composer.json

@@ -5,8 +5,8 @@
   "license": "MIT",
   "authors": [
     {
-      "name": "n3vrax",
-      "email": "tibi@apidemia.com"
+      "name": "dotkernel",
+      "email": "team@dotkernel.com"
     }
   ],
   "require": {
@@ -36,8 +36,8 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "0.3-dev",
-      "dev-develop": "0.4-dev"
+      "dev-master": "1.0-dev",
+      "dev-develop": "1.1-dev"
     }
   }
 }

src/AbstractActionController.php

@@ -33,7 +33,7 @@ public function dispatch(): ResponseInterface
         if (method_exists($this, $action)) {
             $r = $this->dispatchEvent(ControllerEvent::EVENT_CONTROLLER_BEFORE_DISPATCH, [
                 'request' => $this->request,
-                'delegate' => $this->getDelegate(),
+                'handler' => $this->getHandler(),
                 'controller' => $this,
                 'method' => $action
             ]);
@@ -50,16 +50,11 @@ public function dispatch(): ResponseInterface
                 return $r;
             }
 
-            $eventResponse = $r->getParam('response');
-            if ($eventResponse instanceof ResponseInterface) {
-                $response = $eventResponse;
-            }
-
             return $response;
         }
 
         //just go the the next middleware, it will eventually hit a 404 if no one handles the request
-        $delegate = $this->getDelegate();
-        return $delegate->process($this->request);
+        $handler = $this->getHandler();
+        return $handler->handle($this->request);
     }
 }

src/AbstractController.php

@@ -8,18 +8,17 @@
 declare(strict_types = 1);
 
 namespace Dot\Controller;
-
 use Dot\Controller\Event\DispatchControllerEventsTrait;
 use Dot\Controller\Exception\RuntimeException;
 use Dot\Controller\Plugin\PluginInterface;
 use Dot\Controller\Plugin\PluginManager;
 use Dot\Controller\Plugin\PluginManagerAwareInterface;
-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Zend\EventManager\EventManagerAwareInterface;
-use Zend\ServiceManager\ServiceManager;
+
 
 /**
  * Class AbstractController
@@ -38,8 +37,9 @@ abstract class AbstractController implements
     /** @var  ServerRequestInterface */
     protected $request;
 
-    /** @var  DelegateInterface */
-    protected $delegate;
+    /** @var RequestHandlerInterface */
+    protected $handler;
+
 
     /** @var bool */
     protected $debug = false;
@@ -60,10 +60,10 @@ public static function getMethodFromAction(string $action): string
         return $method;
     }
 
-    public function process(ServerRequestInterface $request, DelegateInterface $delegate): ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->request = $request;
-        $this->delegate = $delegate;
+        $this->handler = $handler;
 
         return $this->dispatch();
     }
@@ -79,11 +79,11 @@ public function getRequest(): ServerRequestInterface
     }
 
     /**
-     * @return DelegateInterface
+     * @return RequestHandlerInterface
      */
-    public function getDelegate(): DelegateInterface
+    public function getHandler(): RequestHandlerInterface
     {
-        return $this->delegate;
+        return $this->handler;
     }
 
     /**
@@ -132,6 +132,7 @@ public function getPluginManager(): PluginManager
                 )
             );
         }
+        
         return $this->pluginManager;
     }
 

src/ConfigProvider.php

@@ -1,11 +1,6 @@
 <?php
-/**
- * @see https://github.com/dotkernel/dot-controller/ for the canonical source repository
- * @copyright Copyright (c) 2017 Apidemia (https://www.apidemia.com)
- * @license https://github.com/dotkernel/dot-controller/blob/master/LICENSE.md MIT License
- */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Dot\Controller;
 
@@ -14,12 +9,15 @@
 use Dot\Controller\Factory\PluginManagerFactory;
 use Dot\Controller\Plugin\PluginManager;
 
-/**
- * Class ConfigProvider
- * @package Dot\Controller
- */
 class ConfigProvider
 {
+    /**
+     * Returns the configuration array
+     *
+     * To add a bit of a structure, each section is defined in a separate
+     * method which returns an array with its configuration.
+     *
+     */
     public function __invoke(): array
     {
         return [