Merge pull request #2 from dotkernel/development

reformat code to psr2, updated dep zend-expressive-helpers to version…

Author: n3vrax

composer.json

@@ -17,8 +17,7 @@
   },
   "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"
   },

src/AbstractActionController.php

@@ -24,7 +24,8 @@ public function dispatch()
     {
         $request = $this->request;
         $action = AbstractController::getMethodFromAction(
-            strtolower($request->getAttribute('action', 'index')));
+            strtolower($request->getAttribute('action', 'index'))
+        );
 
         if (method_exists($this, $action)) {
             return $this->$action();
@@ -34,4 +35,4 @@ public function dispatch()
         $next = $this->getNext();
         return $next($this->getRequest(), $this->getResponse());
     }
-}
+}

src/AbstractController.php

@@ -32,6 +32,22 @@ abstract class AbstractController implements PluginManagerAwareInterface
     /** @var  callable */
     protected $next;
 
+    /**
+     * Transform an "action" token into a method name
+     *
+     * @param  string $action
+     * @return string
+     */
+    public static function getMethodFromAction($action)
+    {
+        $method = str_replace(['.', '-', '_'], ' ', $action);
+        $method = ucwords($method);
+        $method = str_replace(' ', '', $method);
+        $method = lcfirst($method);
+        $method .= 'Action';
+        return $method;
+    }
+
     /**
      * @param ServerRequestInterface $request
      * @param ResponseInterface $response
@@ -48,9 +64,10 @@ public function __invoke(
         $this->next = $next;
 
         return $this->dispatch();
-
     }
 
+    abstract public function dispatch();
+
     /**
      * @return ServerRequestInterface
      */
@@ -75,8 +92,6 @@ public function getNext()
         return $this->next;
     }
 
-    public abstract function dispatch();
-
     /**
      * Method overloading: return/call plugins
      *
@@ -125,22 +140,4 @@ public function setPluginManager(PluginManager $pluginManager)
         $this->pluginManager = $pluginManager;
         return $this;
     }
-
-    /**
-     * Transform an "action" token into a method name
-     *
-     * @param  string $action
-     * @return string
-     */
-    public static function getMethodFromAction($action)
-    {
-        $method = str_replace(['.', '-', '_'], ' ', $action);
-        $method = ucwords($method);
-        $method = str_replace(' ', '', $method);
-        $method = lcfirst($method);
-        $method .= 'Action';
-        return $method;
-    }
-
-
-}
+}

src/ConfigProvider.php

@@ -37,4 +37,4 @@ public function __invoke()
             ],
         ];
     }
-}
+}

src/Exception/ExceptionInterface.php

@@ -16,4 +16,4 @@
 interface ExceptionInterface
 {
 
-}
+}

src/Exception/RuntimeException.php

@@ -16,4 +16,4 @@
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 
-}
+}

src/Factory/PluginManagerAwareInitializer.php

@@ -31,4 +31,4 @@ public function __invoke(ContainerInterface $container, $instance)
             $instance->setPluginManager($pluginManager);
         }
     }
-}
+}

src/Factory/PluginManagerFactory.php

@@ -45,4 +45,4 @@ public function __invoke(ContainerInterface $container)
 
         return $pluginManager;
     }
-}
+}

src/Plugin/PluginInterface.php

@@ -16,4 +16,4 @@
 interface PluginInterface
 {
 
-}
+}

src/Plugin/PluginManager.php

@@ -18,4 +18,4 @@
 class PluginManager extends AbstractPluginManager
 {
     protected $instanceOf = PluginInterface::class;
-}
+}