update deps

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-    - 5.6
     - 7.0
     - 7.1
     - hhvm

composer.json

@@ -24,11 +24,11 @@
       "Util\\": "tests/util/"
     }
   },
-  "require": {
-    "propel/propel": "~2.0@dev",
-    "wollanup/php-api-rest-interfaces": "^1.1.17"
-  },
   "require-dev": {
-    "phpunit/phpunit": "^6.0"
+    "ext-sqlite3": "*",
+    "wollanup/php-api-rest": "dev-master",
+    "phpunit/phpunit": "^6.0",
+    "propel/propel": "~2.0@dev",
+    "slim/slim": "3.*"
   }
 }

tests/util/ActionMock.php

@@ -1,65 +1,87 @@
 <?php
-namespace Eukles\Action {
-
-    use Eukles\Service\QueryModifier\QueryModifierInterface;
-    use Propel\Runtime\ActiveQuery\ModelCriteria;
-    use Psr\Container\ContainerInterface;
-    use Psr\Http\Message\ResponseInterface;
-    use Psr\Http\Message\ServerRequestInterface;
-
-    class ActionMock implements ActionInterface
-    {
-
-        /**
-         * ActionInterface constructor.
-         *
-         * @param ContainerInterface $c
-         */
-        public function __construct(ContainerInterface $c) { }
-
-        /**
-         * Action factory
-         *
-         * @param ContainerInterface $c
-         *
-         * @return ActionInterface
-         */
-        public static function create(ContainerInterface $c) { }
-
-        /**
-         * @param QueryModifierInterface $qm
-         *
-         * @return ModelCriteria
-         */
-        public function createQuery(QueryModifierInterface $qm = null) { }
-
-        /**
-         * @return ContainerInterface
-         */
-        public function getContainer() { }
-
-        /**
-         * @return ServerRequestInterface
-         */
-        public function getRequest() { }
 
-        /**
-         * @return ResponseInterface
-         */
-        public function getResponse() { }
+namespace Eukles\Action;
 
-        /**
-         * @param ServerRequestInterface $serverRequest
-         *
-         * @return ActionInterface
-         */
-        public function setRequest(ServerRequestInterface $serverRequest) { }
+use Eukles\Service\QueryModifier\QueryModifierInterface;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
-        /**
-         * @param ResponseInterface $response
-         *
-         * @return ActionInterface
-         */
-        public function setResponse(ResponseInterface $response) { }
+class ActionMock implements ActionInterface
+{
+
+    /**
+     * ActionInterface constructor.
+     *
+     * @param ContainerInterface $c
+     */
+    public function __construct(ContainerInterface $c) { }
+
+    /**
+     * Action factory
+     *
+     * @param ContainerInterface $c
+     *
+     * @return ActionInterface
+     */
+    public static function create(ContainerInterface $c): ActionInterface
+    {
+        // TODO: Implement create() method.
+    }
+
+    /**
+     * @param QueryModifierInterface $qm
+     *
+     * @return ModelCriteria
+     */
+    public function createQuery(QueryModifierInterface $qm = null): ModelCriteria
+    {
+        // TODO: Implement createQuery() method.
+    }
+
+    /**
+     * @return ContainerInterface
+     */
+    public function getContainer(): ContainerInterface
+    {
+        // TODO: Implement getContainer() method.
+    }
+
+    /**
+     * @return ServerRequestInterface
+     */
+    public function getRequest(): ServerRequestInterface
+    {
+        // TODO: Implement getRequest() method.
+    }
+
+    /**
+     * @return ResponseInterface
+     */
+    public function getResponse(): ResponseInterface
+    {
+        // TODO: Implement getResponse() method.
+    }
+
+    /**
+     * @param ServerRequestInterface $serverRequest
+     *
+     * @return ActionInterface
+     */
+    public function setRequest(ServerRequestInterface $serverRequest): ActionInterface
+    {
+        // TODO: Implement setRequest() method.
+    }
+
+    /**
+     * @param ResponseInterface $response
+     *
+     * @return ActionInterface
+     */
+    public function setResponse(ResponseInterface $response): ActionInterface
+    {
+        // TODO: Implement setResponse() method.
     }
 }
+

tests/util/ContainerMock.php

@@ -1,106 +1,157 @@
 <?php
 namespace Eukles\Container {
-
+
+    use Eukles\Config\ConfigInterface;
     use Eukles\Entity\EntityFactoryInterface;
     use Eukles\Service\Pagination\RequestPaginationInterface;
     use Eukles\Service\QueryModifier\RequestQueryModifierInterface;
     use Eukles\Service\ResponseBuilder\ResponseBuilderInterface;
     use Eukles\Service\ResponseFormatter\ResponseFormatterInterface;
     use Eukles\Service\RoutesClasses\RoutesClassesInterface;
-    use Eukles\Service\XssCleaner\XssCleanerInterface;
     use Eukles\Slim\Handlers\ActionErrorInterface;
     use Eukles\Slim\Handlers\EntityRequestErrorInterface;
-    use Slim\Http\Request;
-    use Slim\Interfaces\RouterInterface;
-
+    use Psr\Container\ContainerExceptionInterface;
+    use Psr\Container\NotFoundExceptionInterface;
+    use Psr\Http\Message\ResponseInterface;
+    use Psr\Http\Message\ServerRequestInterface;
+
     class ContainerMock implements ContainerInterface
     {
-        
+
         /**
          * @inheritdoc
          */
-        public function get($id) { }
-    
+        public function has($id) { }
+
         /**
          * @return ActionErrorInterface
          */
-        public function getActionErrorHandler()
+        public function getActionErrorHandler(): ActionErrorInterface
+        {
+            // TODO: Implement getActionErrorHandler() method.
+        }
+
+        /**
+         * @return ConfigInterface
+         */
+        public function getConfig(): ConfigInterface
         {
+            // TODO: Implement getConfig() method.
         }
-    
+
         /**
          * @return EntityFactoryInterface
          */
-        public function getEntityFactory()
+        public function getEntityFactory(): EntityFactoryInterface
         {
+            // TODO: Implement getEntityFactory() method.
         }
-    
+
         /**
          * @return EntityRequestErrorInterface
          */
-        public function getEntityRequestErrorHandler()
+        public function getEntityRequestErrorHandler(): EntityRequestErrorInterface
         {
+            // TODO: Implement getEntityRequestErrorHandler() method.
         }
-    
+
         /**
-         * @return Request
+         * @return ServerRequestInterface
          */
-        public function getRequest()
+        public function getRequest(): ServerRequestInterface
         {
+            // TODO: Implement getRequest() method.
         }
-    
+
         /**
          * @return RequestPaginationInterface
          */
-        public function getRequestPagination()
+        public function getRequestPagination(): RequestPaginationInterface
         {
+            // TODO: Implement getRequestPagination() method.
         }
-    
+
         /**
          * @return RequestQueryModifierInterface
          */
-        public function getRequestQueryModifier()
+        public function getRequestQueryModifier(): RequestQueryModifierInterface
         {
+            // TODO: Implement getRequestQueryModifier() method.
         }
-
+
+        /**
+         * @return ResponseInterface
+         */
+        public function getResponse(): ResponseInterface
+        {
+            // TODO: Implement getResponse() method.
+        }
+
         /**
          * @return ResponseBuilderInterface
          */
-        public function getResponseBuilder()
+        public function getResponseBuilder(): ResponseBuilderInterface
         {
+            // TODO: Implement getResponseBuilder() method.
         }
-    
+
         /**
          * @return ResponseFormatterInterface
          */
-        public function getResponseFormatter()
+        public function getResponseFormatter(): ResponseFormatterInterface
         {
+            // TODO: Implement getResponseFormatter() method.
         }
-    
+
         /**
-         * @return RouterInterface
+         * Result is populated in ActionStrategy and becomes available in middlewares post-app
+         *
+         * @return mixed
          */
-        public function getRouter()
+        public function getResult()
         {
+            // TODO: Implement getResult() method.
         }
-    
+
         /**
-         * @return RoutesClassesInterface
+         * @param $result
+         *
+         * @return void
          */
-        public function getRoutesClasses()
+        public function setResult($result)
         {
+            // TODO: Implement setResult() method.
         }
-    
+
         /**
-         * @return XssCleanerInterface
+         * @return \Eukles\Service\Router\RouterInterface
          */
-        public function getXssCleaner()
+        public function getRouter(): \Eukles\Service\Router\RouterInterface
         {
+            // TODO: Implement getRouter() method.
         }
-    
+
         /**
-         * @inheritdoc
+         * @return RoutesClassesInterface
          */
-        public function has($id) { }
+        public function getRoutesClasses(): RoutesClassesInterface
+        {
+            // TODO: Implement getRoutesClasses() method.
+        }
+
+        /**
+         * Finds an entry of the container by its identifier and returns it.
+         *
+         * @param string $id Identifier of the entry to look for.
+         *
+         * @throws NotFoundExceptionInterface  No entry was found for **this** identifier.
+         * @throws ContainerExceptionInterface Error while retrieving the entry.
+         *
+         * @return mixed Entry.
+         */
+        public function get($id)
+        {
+            // TODO: Implement get() method.
+        }
     }
 }