Merge pull request #6 from moufmouf/master

Removing dependencies on Mouf

.travis.yml

@@ -10,6 +10,7 @@ before_script:
 script:
  - composer cs-check
  - composer phpstan
+ - ./vendor/bin/composer-require-checker
  - ./vendor/bin/phpunit
 
 after_script:

composer.json

@@ -21,18 +21,16 @@
 	],
 	"require" : {
 		"php" : ">=7.1",
-		"psr/cache": "^1.0",
 		"cache/void-adapter": "^0.3.0",
 		"doctrine/annotations": "^1.2",
-		"mouf/html.htmlelement" : "^2.0",
-		"mouf/utils.action.common-action" : "~1.0",
-		"mouf/utils.common.url-interface" : "~1.0",
-		"mouf/html.renderer.twig-extensions": "~1.0",
-		"mouf/utils.common.conditioninterface": "~2.0",
-		"mouf/utils.cache.cache-interface": "~2.0",
-        "zendframework/zend-diactoros": "~1.0",
-		"mouf/html.template.templateinterface": "^2.1",
-		"psr/http-server-middleware": "^1.0"
+		"mouf/utils.common.url-interface" : "^1",
+        "zendframework/zend-diactoros": "^1",
+		"psr/cache": "^1.0",
+		"psr/http-server-handler": "^1",
+		"psr/http-server-middleware": "^1",
+		"psr/http-message": "^1",
+		"psr/container": "^1",
+		"psr/log": "^1"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "^7.0",
@@ -41,7 +39,8 @@
 		"mnapoli/simplex": "^0.3",
 		"cache/array-adapter": "^0.4.0",
 		"squizlabs/php_codesniffer": "^3.1",
-		"phpstan/phpstan": "^0.10.1"
+		"phpstan/phpstan": "^0.10.1",
+		"maglnet/composer-require-checker": "^1.0"
 	},
 	"conflict": {
 		"zendframework/zend-stratigility": "<2.0"

doc/filters.md

@@ -58,7 +58,7 @@ To create a filter:
  - The filters must be a valid [Doctrine annotation](http://doctrine-orm.readthedocs.io/projects/doctrine-common/en/latest/reference/annotations.html).
  - The filter must implement the  FilterInterface.
 
-Note that a filter is very similar to a PSR-7 middleware, except the `__invoke` method is additionally passed a container (useful to bind the annotation to a given service).
+Note that a filter is very similar to a PSR-15 middleware, except the `process` method is additionally passed a container (useful to bind the annotation to a given service).
 
 Here is the typical filter layout:
 

src/TheCodingMachine/Splash/Routers/SplashRouter.php

@@ -3,12 +3,11 @@
 namespace TheCodingMachine\Splash\Routers;
 
 use Cache\Adapter\Void\VoidCachePool;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use TheCodingMachine\Splash\Controllers\Http400HandlerInterface;
 use TheCodingMachine\Splash\Exception\BadRequestException;
 use TheCodingMachine\Splash\Exception\PageNotFoundException;
 use TheCodingMachine\Splash\Filters\FilterPipe;
-use TheCodingMachine\Splash\Services\ParameterFetcher;
 use TheCodingMachine\Splash\Services\ParameterFetcherRegistry;
 use TheCodingMachine\Splash\Services\SplashRoute;
 use TheCodingMachine\Splash\Services\SplashRouteInterface;
@@ -24,7 +23,6 @@
 use TheCodingMachine\Splash\Services\SplashUtils;
 use Psr\Log\NullLogger;
 use Zend\Diactoros\Response\RedirectResponse;
-use Zend\Stratigility\MiddlewarePipe;
 
 class SplashRouter implements MiddlewareInterface
 {

src/TheCodingMachine/Splash/Services/ControllerAnalyzer.php

@@ -3,7 +3,7 @@
 namespace TheCodingMachine\Splash\Services;
 
 use Doctrine\Common\Annotations\Reader;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use TheCodingMachine\Splash\Annotations\Action;
 use TheCodingMachine\Splash\Annotations\URL;
 use TheCodingMachine\Splash\Annotations\Delete;