diff --git a/composer.json b/composer.json index b9be6c6d..56389b9f 100644 --- a/composer.json +++ b/composer.json @@ -2,11 +2,11 @@ "name": "shlinkio/shlink", "type": "project", "homepage": "http://shlink.io", - "description": "A PHP-based URL shortener application with analytics and management", + "description": "A self-hosted and PHP-based URL shortener application with CLI and REST interfaces", "license": "MIT", "authors": [ { - "name": "Alejandro Celaya ALastrué", + "name": "Alejandro Celaya Alastrué", "homepage": "http://www.alejandrocelaya.com", "email": "alejandro@alejandrocelaya.com" } @@ -14,7 +14,6 @@ "require": { "php": "^5.6 || ^7.0", "zendframework/zend-expressive": "^1.0", - "zendframework/zend-expressive-helpers": "^2.0", "zendframework/zend-expressive-fastroute": "^1.1", "zendframework/zend-expressive-twigrenderer": "^1.0", "zendframework/zend-stdlib": "^2.7", diff --git a/config/autoload/dependencies.global.php b/config/autoload/dependencies.global.php index c0c5c46a..209334b2 100644 --- a/config/autoload/dependencies.global.php +++ b/config/autoload/dependencies.global.php @@ -2,7 +2,6 @@ use Shlinkio\Shlink\Common\ErrorHandler\ContentBasedErrorHandler; use Zend\Expressive; use Zend\Expressive\Container; -use Zend\Expressive\Helper; use Zend\Expressive\Router; use Zend\Expressive\Template; use Zend\Expressive\Twig; @@ -13,15 +12,7 @@ return [ 'dependencies' => [ 'factories' => [ Expressive\Application::class => Container\ApplicationFactory::class, - - // Url helpers - Helper\UrlHelper::class => Helper\UrlHelperFactory::class, - Helper\ServerUrlMiddleware::class => Helper\ServerUrlMiddlewareFactory::class, - Helper\UrlHelperMiddleware::class => Helper\UrlHelperMiddlewareFactory::class, - Helper\ServerUrlHelper::class => InvokableFactory::class, Router\FastRouteRouter::class => InvokableFactory::class, - - // View Template\TemplateRendererInterface::class => Twig\TwigRendererFactory::class, ], 'aliases' => [ diff --git a/config/autoload/middleware-pipeline.global.php b/config/autoload/middleware-pipeline.global.php index 6e72ea1f..0e214307 100644 --- a/config/autoload/middleware-pipeline.global.php +++ b/config/autoload/middleware-pipeline.global.php @@ -1,17 +1,9 @@ [ - 'always' => [ - 'middleware' => [ - Helper\ServerUrlMiddleware::class, - ], - 'priority' => 10000, - ], - 'routing' => [ 'middleware' => [ ApplicationFactory::ROUTING_MIDDLEWARE, @@ -21,7 +13,6 @@ return [ 'post-routing' => [ 'middleware' => [ - Helper\UrlHelperMiddleware::class, ApplicationFactory::DISPATCH_MIDDLEWARE, ], 'priority' => 1,