updated to PSR11 container

updated controller middleware to PSR15
updated url helper plugin to use leverage additional parameters from expressive helpers > 3.0

Author: n3vrax

CHANGELOG.md

@@ -1,3 +1,25 @@
+## 0.2.0 - 2017-03-15
+
+### Changed
+* Updated factories to use PSR11 container
+* Updated base controller classes to use PSR15 middleware
+* Updated `UrlHelperPlugin` to use new version of expressive helpers
+
+### Added
+* `UrlHelperPlugin` now supports the additional `UrlHelper` generate parameters
+* Abstract controller added property `DelegateInterface` $delegate, replacing the $next
+
+### Deprecated
+* Nothing
+
+### Removed
+* $next property from AbstractController(use $delegate instead)
+* $response property from AbstractController
+
+### Fixed
+* Nothing
+
+
 ## 0.1.1 - 2017-03-11
 
 ### Added

composer.json

@@ -12,14 +12,14 @@
   "require": {
     "php": "^7.1",
     "psr/http-message": "^1.0",
-    "container-interop/container-interop": "^1.1",
-    "zendframework/zend-servicemanager": "^3.0",
+    "http-interop/http-middleware": "^0.4.1",
+    "zendframework/zend-servicemanager": "^3.3.0",
 
-    "dotkernel/dot-event": "^0.1"
+    "dotkernel/dot-event": "^0.2"
   },
   "require-dev": {
     "zendframework/zend-expressive-template": "^1.0",
-    "zendframework/zend-expressive-helpers": "^2.0",
+    "zendframework/zend-expressive-helpers": "^3.0",
 
     "phpunit/phpunit": "^4.8",
     "squizlabs/php_codesniffer": "^2.3"
@@ -36,7 +36,8 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "0.2-dev"
+      "dev-master": "0.2-dev",
+      "dev-develop": "0.3-dev"
     }
   }
 }

src/AbstractActionController.php

@@ -23,9 +23,7 @@ abstract class AbstractActionController extends AbstractController
      */
     public function dispatch(): ResponseInterface
     {
-        $request = $this->request;
-
-        $action = strtolower(trim($request->getAttribute('action', 'index')));
+        $action = strtolower(trim($this->request->getAttribute('action', 'index')));
         if (empty($action)) {
             $action = 'index';
         }
@@ -34,19 +32,20 @@ public function dispatch(): ResponseInterface
 
         if (method_exists($this, $action)) {
             $r = $this->dispatchEvent(ControllerEvent::EVENT_CONTROLLER_DISPATCH, [
-                'request' => $request,
-                'next' => $this->getNext(),
+                'request' => $this->request,
+                'delegate' => $this->getDelegate(),
                 'method' => $action
             ]);
             if ($r instanceof ResponseInterface) {
                 return $r;
             }
 
+            $this->request = $r->getParam('request');
             return $this->$action();
         }
 
         //just go the the next middleware, it will eventually hit a 404 if no one handles the request
-        $next = $this->getNext();
-        return $next($this->getRequest(), $this->getResponse());
+        $delegate = $this->getDelegate();
+        return $delegate->process($this->request);
     }
 }

src/AbstractController.php

@@ -13,6 +13,8 @@
 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 Zend\EventManager\EventManagerAwareInterface;
@@ -22,6 +24,7 @@
  * @package Dot\Controller
  */
 abstract class AbstractController implements
+    MiddlewareInterface,
     PluginManagerAwareInterface,
     EventManagerAwareInterface
 {
@@ -33,11 +36,8 @@ abstract class AbstractController implements
     /** @var  ServerRequestInterface */
     protected $request;
 
-    /** @var  ResponseInterface */
-    protected $response;
-
-    /** @var  callable */
-    protected $next;
+    /** @var  DelegateInterface */
+    protected $delegate;
 
     /** @var bool */
     protected $debug = false;
@@ -58,20 +58,10 @@ public static function getMethodFromAction(string $action): string
         return $method;
     }
 
-    /**
-     * @param ServerRequestInterface $request
-     * @param ResponseInterface $response
-     * @param callable|null $next
-     * @return ResponseInterface
-     */
-    public function __invoke(
-        ServerRequestInterface $request,
-        ResponseInterface $response,
-        callable $next = null
-    ): ResponseInterface {
+    public function process(ServerRequestInterface $request, DelegateInterface $delegate): ResponseInterface
+    {
         $this->request = $request;
-        $this->response = $response;
-        $this->next = $next;
+        $this->delegate = $delegate;
 
         return $this->dispatch();
     }
@@ -87,19 +77,11 @@ public function getRequest(): ServerRequestInterface
     }
 
     /**
-     * @return ResponseInterface
-     */
-    public function getResponse(): ResponseInterface
-    {
-        return $this->response;
-    }
-
-    /**
-     * @return callable
+     * @return DelegateInterface
      */
-    public function getNext(): callable
+    public function getDelegate(): DelegateInterface
     {
-        return $this->next;
+        return $this->delegate;
     }
 
     /**

src/Factory/ControllerEventListenersInitializer.php

@@ -12,18 +12,17 @@
 use Dot\Controller\AbstractController;
 use Dot\Controller\Event\ControllerEventListenerInterface;
 use Dot\Controller\Exception\RuntimeException;
-use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Initializer\InitializerInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * Class ControllerEventListenersInitializer
  * @package Dot\Controller\Factory
  */
-class ControllerEventListenersInitializer implements InitializerInterface
+class ControllerEventListenersInitializer
 {
     /**
      * @param ContainerInterface $container
-     * @param object $instance
+     * @param $instance
      */
     public function __invoke(ContainerInterface $container, $instance)
     {
@@ -32,6 +31,10 @@ public function __invoke(ContainerInterface $container, $instance)
         }
     }
 
+    /**
+     * @param ContainerInterface $container
+     * @param AbstractController $controller
+     */
     public function attachControllerListeners(ContainerInterface $container, AbstractController $controller)
     {
         $config = $container->get('config')['dot_controller'];

src/Factory/PluginManagerAwareInitializer.php

@@ -12,14 +12,13 @@
 use Dot\Controller\AbstractController;
 use Dot\Controller\Plugin\PluginManager;
 use Dot\Controller\Plugin\PluginManagerAwareInterface;
-use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Initializer\InitializerInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * Class PluginManagerAwareInitializer
  * @package Dot\Controller\Factory
  */
-class PluginManagerAwareInitializer implements InitializerInterface
+class PluginManagerAwareInitializer
 {
     /**
      * @param ContainerInterface $container

src/Factory/PluginManagerFactory.php

@@ -12,7 +12,7 @@
 use Dot\Controller\Plugin\PluginManager;
 use Dot\Controller\Plugin\TemplatePlugin;
 use Dot\Controller\Plugin\UrlHelperPlugin;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Zend\Expressive\Helper\UrlHelper;
 use Zend\Expressive\Template\TemplateRendererInterface;
 

src/Plugin/UrlHelperPlugin.php

@@ -31,31 +31,42 @@ public function __construct(UrlHelper $helper)
 
     /**
      * @param string|null $routeName
-     * @param array|null $routeParams
-     * @return mixed
+     * @param array $routeParams
+     * @param array $queryParams
+     * @param null $fragmentIdentifier
+     * @param array $options
+     * @return UrlHelperPlugin|string
      */
-    public function __invoke(string $routeName = null, array $routeParams = [])
-    {
+    public function __invoke(
+        string $routeName = null,
+        array $routeParams = [],
+        $queryParams = [],
+        $fragmentIdentifier = null,
+        array $options = []
+    ) {
         $args = func_get_args();
         if (empty($args)) {
             return $this;
         }
 
-        return $this->generate($routeName, $routeParams);
+        return $this->generate($routeName, $routeParams, $queryParams, $fragmentIdentifier, $options);
     }
 
     /**
-     * @param string $routeName
+     * @param string|null $routeName
      * @param array $routeParams
+     * @param array $queryParams
+     * @param null $fragmentIdentifier
+     * @param array $options
      * @return string
      */
     public function generate(
-        string $routeName,
-        array $routeParams = []
+        string $routeName = null,
+        array $routeParams = [],
+        $queryParams = [],
+        $fragmentIdentifier = null,
+        array $options = []
     ): string {
-        return $this->urlHelper->generate(
-            $routeName,
-            $routeParams
-        );
+        return $this->urlHelper->generate($routeName, $routeParams, $queryParams, $fragmentIdentifier, $options);
     }
 }