@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | /** |
| 84 | - * @param $param |
|
| 84 | + * @param string $param |
|
| 85 | 85 | * @param null $default |
| 86 | 86 | * @return mixed|null|string |
| 87 | 87 | */ |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | /** |
| 135 | - * @return PDO |
|
| 135 | + * @return \PDO |
|
| 136 | 136 | */ |
| 137 | 137 | public function getDbAdapter() |
| 138 | 138 | { |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | |
| 275 | 275 | /** |
| 276 | 276 | * @param ServerRequestInterface $request |
| 277 | - * @return Controller |
|
| 277 | + * @return AbstractController |
|
| 278 | 278 | */ |
| 279 | 279 | public function setRequest(ServerRequestInterface $request) |
| 280 | 280 | { |
@@ -48,7 +48,6 @@ |
||
| 48 | 48 | /** |
| 49 | 49 | * Ahoy! There nay be boardin without yer configuration |
| 50 | 50 | * |
| 51 | - * @param array $config |
|
| 52 | 51 | * @return Application |
| 53 | 52 | */ |
| 54 | 53 | public static function ahoy() |
@@ -2,27 +2,14 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Bone\Mvc; |
| 4 | 4 | |
| 5 | -use Barnacle\Container; |
|
| 6 | -use Barnacle\RegistrationInterface; |
|
| 7 | -use Bone\Mvc\Router\Decorator\ExceptionDecorator; |
|
| 8 | -use Bone\Mvc\Router\Decorator\NotFoundDecorator; |
|
| 9 | -use Bone\Mvc\Router\PlatesStrategy; |
|
| 10 | -use Bone\Mvc\Router\RouterConfigInterface; |
|
| 11 | -use Bone\Mvc\View\PlatesEngine; |
|
| 12 | -use Bone\Server\Environment; |
|
| 13 | -use Bone\Server\I18nHandler; |
|
| 14 | -use League\Route\Http\Exception\NotFoundException; |
|
| 15 | -use League\Route\Router; |
|
| 16 | -use League\Route\RouteGroup; |
|
| 17 | -use League\Route\Strategy\ApplicationStrategy; |
|
| 18 | -use League\Route\Strategy\JsonStrategy; |
|
| 19 | -use PDO; |
|
| 20 | -use Psr\Http\Message\ResponseInterface; |
|
| 21 | -use Psr\Http\Message\ServerRequestInterface; |
|
| 22 | -use Zend\Diactoros\ResponseFactory; |
|
| 23 | -use Zend\Diactoros\ServerRequestFactory; |
|
| 24 | -use Zend\Diactoros\Response; |
|
| 25 | -use Zend\Diactoros\Response\RedirectResponse; |
|
| 5 | +use Barnacle\Container; |
|
| 6 | +use Bone\Server\Environment; |
|
| 7 | +use Bone\Server\I18nHandler; |
|
| 8 | +use League\Route\Http\Exception\NotFoundException; |
|
| 9 | +use League\Route\Router; |
|
| 10 | +use Psr\Http\Message\ServerRequestInterface; |
|
| 11 | +use Zend\Diactoros\ServerRequestFactory; |
|
| 12 | +use Zend\Diactoros\Response\RedirectResponse; |
|
| 26 | 13 | use Zend\HttpHandlerRunner\Emitter\SapiEmitter; |
| 27 | 14 | |
| 28 | 15 | class Application |
@@ -12,11 +12,9 @@ |
||
| 12 | 12 | use Bone\Mvc\View\Extension\Plates\Translate; |
| 13 | 13 | use Bone\Mvc\View\Helper\Paginator; |
| 14 | 14 | use Bone\Mvc\View\PlatesEngine; |
| 15 | -use Bone\Mvc\View\ViewRenderer; |
|
| 16 | 15 | use Bone\Service\TranslatorFactory; |
| 17 | 16 | use League\Route\Router; |
| 18 | 17 | use Locale; |
| 19 | -use Psr\Http\Server\MiddlewareInterface; |
|
| 20 | 18 | use Zend\I18n\Translator\Translator; |
| 21 | 19 | |
| 22 | 20 | class ApplicationPackage implements RegistrationInterface |
@@ -162,7 +162,6 @@ discard block |
||
| 162 | 162 | /** |
| 163 | 163 | * Get a middleware that will decorate a NotFoundException |
| 164 | 164 | * |
| 165 | - * @param \League\Route\Http\Exception\NotFoundException $exception |
|
| 166 | 165 | * |
| 167 | 166 | * @return \Psr\Http\Server\MiddlewareInterface |
| 168 | 167 | */ |
@@ -174,7 +173,7 @@ discard block |
||
| 174 | 173 | /** |
| 175 | 174 | * Get a middleware that will decorate a NotAllowedException |
| 176 | 175 | * |
| 177 | - * @param \League\Route\Http\Exception\NotFoundException $e |
|
| 176 | + * @param \League\Route\Http\Exception\MethodNotAllowedException $e |
|
| 178 | 177 | * |
| 179 | 178 | * @return \Psr\Http\Server\MiddlewareInterface |
| 180 | 179 | */ |
@@ -2,21 +2,15 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Bone\Mvc\Router; |
| 4 | 4 | |
| 5 | -use Bone\Http\Response as BoneResponse; |
|
| 6 | -use Bone\Mvc\Router\Decorator\ExceptionDecorator; |
|
| 7 | 5 | use Bone\Mvc\Router\Decorator\NotAllowedDecorator; |
| 8 | 6 | use Bone\Mvc\Router\Decorator\NotFoundDecorator; |
| 9 | 7 | use Bone\Mvc\View\PlatesEngine; |
| 10 | -use Bone\Mvc\View\ViewEngine; |
|
| 11 | -use Bone\Mvc\View\ViewRenderer; |
|
| 12 | -use Bone\Server\I18nHandler; |
|
| 13 | 8 | use Bone\Traits\LayoutAwareTrait; |
| 14 | 9 | use Exception; |
| 15 | 10 | use League\Route\Http\Exception\{MethodNotAllowedException, NotFoundException}; |
| 16 | 11 | use League\Route\Route; |
| 17 | 12 | use League\Route\Strategy\ApplicationStrategy; |
| 18 | 13 | use League\Route\Strategy\StrategyInterface; |
| 19 | -use Psr\Http\Server\RequestHandlerInterface; |
|
| 20 | 14 | use Psr\Http\Message\ResponseInterface; |
| 21 | 15 | use Psr\Http\Message\ServerRequestInterface; |
| 22 | 16 | use Psr\Http\Server\MiddlewareInterface; |
@@ -23,7 +23,6 @@ |
||
| 23 | 23 | /** |
| 24 | 24 | * InternationalisationMiddleware constructor. |
| 25 | 25 | * @param $helper |
| 26 | - * @param string|null $defaultLocale |
|
| 27 | 26 | */ |
| 28 | 27 | public function __construct(Translator $translator, array $supportedLocales) |
| 29 | 28 | { |
@@ -4,10 +4,7 @@ |
||
| 4 | 4 | |
| 5 | 5 | use League\Route\Http\Exception\NotFoundException; |
| 6 | 6 | use Locale; |
| 7 | -use Psr\Http\Message\ResponseInterface; |
|
| 8 | 7 | use Psr\Http\Message\ServerRequestInterface; |
| 9 | -use Psr\Http\Server\MiddlewareInterface; |
|
| 10 | -use Psr\Http\Server\RequestHandlerInterface; |
|
| 11 | 8 | use Zend\I18n\Translator\Translator; |
| 12 | 9 | |
| 13 | 10 | class I18nHandler |