@@ -52,11 +52,11 @@ |
||
| 52 | 52 | /** |
| 53 | 53 | * Set SUT object |
| 54 | 54 | * |
| 55 | - * @param Collaborator|ControllerDispatchInflectorInterface $controllerDispatchInflector |
|
| 56 | - * @param Collaborator|ControllerInvokerInterface $invoker |
|
| 55 | + * @param ControllerDispatchInflectorInterface $controllerDispatchInflector |
|
| 56 | + * @param ControllerInvokerInterface $invoker |
|
| 57 | 57 | * @param Collaborator|ContainerInterface $container |
| 58 | - * @param Collaborator|TestController $controller |
|
| 59 | - * @param Collaborator|ControllerContextInterface $context |
|
| 58 | + * @param TestController $controller |
|
| 59 | + * @param ControllerContextInterface $context |
|
| 60 | 60 | */ |
| 61 | 61 | function let( |
| 62 | 62 | ControllerDispatchInflectorInterface $controllerDispatchInflector, |
@@ -12,14 +12,13 @@ |
||
| 12 | 12 | use Slick\Di\Exception\ClassNotFoundException; |
| 13 | 13 | use Slick\Http\Response; |
| 14 | 14 | use Slick\Http\Server\MiddlewareInterface; |
| 15 | -use Slick\Mvc\Controller\Context; |
|
| 16 | -use Slick\Mvc\Controller\ControllerContextInterface; |
|
| 17 | 15 | use Slick\Mvc\ControllerInterface; |
| 16 | +use Slick\Mvc\Controller\ControllerContextInterface; |
|
| 18 | 17 | use Slick\Mvc\Exception\ControllerNotFoundException; |
| 18 | +use Slick\Mvc\Http\DispatcherMiddleware; |
|
| 19 | 19 | use Slick\Mvc\Http\Dispatcher\ControllerDispatch; |
| 20 | 20 | use Slick\Mvc\Http\Dispatcher\ControllerDispatchInflectorInterface; |
| 21 | 21 | use Slick\Mvc\Http\Dispatcher\ControllerInvokerInterface; |
| 22 | -use Slick\Mvc\Http\DispatcherMiddleware; |
|
| 23 | 22 | |
| 24 | 23 | class DispatcherMiddlewareSpec extends ObjectBehavior |
| 25 | 24 | { |
@@ -3,9 +3,8 @@ |
||
| 3 | 3 | namespace spec\Slick\Mvc\Http\Renderer\TemplateExtension; |
| 4 | 4 | |
| 5 | 5 | use PhpSpec\Exception\Example\FailureException; |
| 6 | -use Slick\Mvc\Http\Renderer\TemplateExtension\HtmlExtension; |
|
| 7 | 6 | use PhpSpec\ObjectBehavior; |
| 8 | -use Prophecy\Argument; |
|
| 7 | +use Slick\Mvc\Http\Renderer\TemplateExtension\HtmlExtension; |
|
| 9 | 8 | use Slick\Mvc\Service\UriGeneratorInterface; |
| 10 | 9 | use Slick\Template\EngineExtensionInterface; |
| 11 | 10 | |
@@ -3,9 +3,8 @@ |
||
| 3 | 3 | namespace spec\Slick\Mvc\Http\Renderer; |
| 4 | 4 | |
| 5 | 5 | use Aura\Router\Route; |
| 6 | -use Slick\Mvc\Http\Renderer\ViewInflector; |
|
| 7 | 6 | use PhpSpec\ObjectBehavior; |
| 8 | -use Prophecy\Argument; |
|
| 7 | +use Slick\Mvc\Http\Renderer\ViewInflector; |
|
| 9 | 8 | use Slick\Mvc\Http\Renderer\ViewInflectorInterface; |
| 10 | 9 | |
| 11 | 10 | /** |
@@ -3,15 +3,14 @@ |
||
| 3 | 3 | namespace spec\Slick\Mvc\Http; |
| 4 | 4 | |
| 5 | 5 | use Aura\Router\Route; |
| 6 | +use PhpSpec\ObjectBehavior; |
|
| 7 | +use Prophecy\Argument; |
|
| 6 | 8 | use Psr\Http\Message\ResponseInterface; |
| 7 | 9 | use Psr\Http\Message\ServerRequestInterface; |
| 8 | 10 | use Slick\Http\Server\MiddlewareInterface; |
| 9 | 11 | use Slick\Http\Stream; |
| 10 | -use Slick\Mvc\Http\Renderer\ViewInflectorInterface; |
|
| 11 | 12 | use Slick\Mvc\Http\RendererMiddleware; |
| 12 | -use PhpSpec\ObjectBehavior; |
|
| 13 | -use Prophecy\Argument; |
|
| 14 | -use Slick\Template\Template; |
|
| 13 | +use Slick\Mvc\Http\Renderer\ViewInflectorInterface; |
|
| 15 | 14 | use Slick\Template\TemplateEngineInterface; |
| 16 | 15 | |
| 17 | 16 | /** |
@@ -4,10 +4,9 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Aura\Router\Map; |
| 6 | 6 | use Aura\Router\Route; |
| 7 | +use PhpSpec\ObjectBehavior; |
|
| 7 | 8 | use Slick\Mvc\Http\Router\Builder\FactoryInterface; |
| 8 | 9 | use Slick\Mvc\Http\Router\Builder\RouteFactory; |
| 9 | -use PhpSpec\ObjectBehavior; |
|
| 10 | -use Prophecy\Argument; |
|
| 11 | 10 | |
| 12 | 11 | class RouteFactorySpec extends ObjectBehavior |
| 13 | 12 | { |
@@ -5,12 +5,11 @@ |
||
| 5 | 5 | use Aura\Router\Matcher; |
| 6 | 6 | use Aura\Router\Route; |
| 7 | 7 | use Aura\Router\RouterContainer; |
| 8 | +use PhpSpec\ObjectBehavior; |
|
| 8 | 9 | use Psr\Http\Message\ResponseInterface; |
| 9 | 10 | use Psr\Http\Message\ServerRequestInterface; |
| 10 | 11 | use Slick\Http\Server\MiddlewareInterface; |
| 11 | 12 | use Slick\Mvc\Http\RouterMiddleware; |
| 12 | -use PhpSpec\ObjectBehavior; |
|
| 13 | -use Prophecy\Argument; |
|
| 14 | 13 | |
| 15 | 14 | class RouterMiddlewareSpec extends ObjectBehavior |
| 16 | 15 | { |
@@ -2,10 +2,9 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace spec\Slick\Mvc\Http\UrlRewriter; |
| 4 | 4 | |
| 5 | +use PhpSpec\ObjectBehavior; |
|
| 5 | 6 | use Psr\Http\Message\UriInterface; |
| 6 | 7 | use Slick\Mvc\Http\UrlRewriter\Uri; |
| 7 | -use PhpSpec\ObjectBehavior; |
|
| 8 | -use Prophecy\Argument; |
|
| 9 | 8 | |
| 10 | 9 | class UriSpec extends ObjectBehavior |
| 11 | 10 | { |
@@ -2,15 +2,14 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace spec\Slick\Mvc\Http; |
| 4 | 4 | |
| 5 | +use PhpSpec\ObjectBehavior; |
|
| 6 | +use Prophecy\Argument; |
|
| 5 | 7 | use Psr\Http\Message\ResponseInterface; |
| 6 | 8 | use Psr\Http\Message\ServerRequestInterface; |
| 7 | 9 | use Psr\Http\Message\UriInterface; |
| 8 | 10 | use Slick\Http\Server\MiddlewareInterface; |
| 9 | -use Slick\Http\Server\Request; |
|
| 10 | 11 | use Slick\Http\Uri; |
| 11 | 12 | use Slick\Mvc\Http\UrlRewriterMiddleware; |
| 12 | -use PhpSpec\ObjectBehavior; |
|
| 13 | -use Prophecy\Argument; |
|
| 14 | 13 | |
| 15 | 14 | class UrlRewriterMiddlewareSpec extends ObjectBehavior |
| 16 | 15 | { |
@@ -91,7 +91,7 @@ |
||
| 91 | 91 | /** |
| 92 | 92 | * Prepares the request collaborator |
| 93 | 93 | * |
| 94 | - * @param ServerRequestInterface|Collaborator $request |
|
| 94 | + * @param ServerRequestInterface $request |
|
| 95 | 95 | */ |
| 96 | 96 | private function prepareRequest(ServerRequestInterface $request) |
| 97 | 97 | { |
@@ -3,12 +3,12 @@ |
||
| 3 | 3 | namespace spec\Slick\Mvc\Service\UriGenerator\Transformer; |
| 4 | 4 | |
| 5 | 5 | use PhpSpec\Exception\Example\FailureException; |
| 6 | +use PhpSpec\ObjectBehavior; |
|
| 6 | 7 | use PhpSpec\Wrapper\Collaborator; |
| 7 | 8 | use Psr\Http\Message\ServerRequestInterface; |
| 8 | 9 | use Psr\Http\Message\UriInterface; |
| 9 | 10 | use Slick\Mvc\Service\UriGenerator\LocationTransformerInterface; |
| 10 | 11 | use Slick\Mvc\Service\UriGenerator\Transformer\BasePathTransformer; |
| 11 | -use PhpSpec\ObjectBehavior; |
|
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | 14 | * BasePathTransformerSpec |