OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed dependency on expressive-helpers package

Browse Source
This commit is contained in:
Alejandro Celaya
2016-07-31 16:42:19 +02:00
parent 7b1e855e7f
commit d73d3049b7
3 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
composer.json
View File

@@ -2,11 +2,11 @@
"name": "shlinkio/shlink", "name": "shlinkio/shlink",
"type": "project", "type": "project",
"homepage": "http://shlink.io", "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", "license": "MIT",
"authors": [ "authors": [
{ {
"name": "Alejandro Celaya ALastrué", "name": "Alejandro Celaya Alastrué",
"homepage": "http://www.alejandrocelaya.com", "homepage": "http://www.alejandrocelaya.com",
"email": "alejandro@alejandrocelaya.com" "email": "alejandro@alejandrocelaya.com"
} }
@@ -14,7 +14,6 @@
"require": { "require": {
"php": "^5.6 || ^7.0", "php": "^5.6 || ^7.0",
"zendframework/zend-expressive": "^1.0", "zendframework/zend-expressive": "^1.0",
"zendframework/zend-expressive-helpers": "^2.0",
"zendframework/zend-expressive-fastroute": "^1.1", "zendframework/zend-expressive-fastroute": "^1.1",
"zendframework/zend-expressive-twigrenderer": "^1.0", "zendframework/zend-expressive-twigrenderer": "^1.0",
"zendframework/zend-stdlib": "^2.7", "zendframework/zend-stdlib": "^2.7",

9
config/autoload/dependencies.global.php
View File

@@ -2,7 +2,6 @@
use Shlinkio\Shlink\Common\ErrorHandler\ContentBasedErrorHandler; use Shlinkio\Shlink\Common\ErrorHandler\ContentBasedErrorHandler;
use Zend\Expressive; use Zend\Expressive;
use Zend\Expressive\Container; use Zend\Expressive\Container;
use Zend\Expressive\Helper;
use Zend\Expressive\Router; use Zend\Expressive\Router;
use Zend\Expressive\Template; use Zend\Expressive\Template;
use Zend\Expressive\Twig; use Zend\Expressive\Twig;
@@ -13,15 +12,7 @@ return [
'dependencies' => [ 'dependencies' => [
'factories' => [ 'factories' => [
Expressive\Application::class => Container\ApplicationFactory::class, 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, Router\FastRouteRouter::class => InvokableFactory::class,
// View
Template\TemplateRendererInterface::class => Twig\TwigRendererFactory::class, Template\TemplateRendererInterface::class => Twig\TwigRendererFactory::class,
], ],
'aliases' => [ 'aliases' => [

9
config/autoload/middleware-pipeline.global.php
View File

@@ -1,17 +1,9 @@
<?php <?php
use Zend\Expressive\Container\ApplicationFactory; use Zend\Expressive\Container\ApplicationFactory;
use Zend\Expressive\Helper;
return [ return [
'middleware_pipeline' => [ 'middleware_pipeline' => [
'always' => [
'middleware' => [
Helper\ServerUrlMiddleware::class,
],
'priority' => 10000,
],
'routing' => [ 'routing' => [
'middleware' => [ 'middleware' => [
ApplicationFactory::ROUTING_MIDDLEWARE, ApplicationFactory::ROUTING_MIDDLEWARE,
@@ -21,7 +13,6 @@ return [
'post-routing' => [ 'post-routing' => [
'middleware' => [ 'middleware' => [
Helper\UrlHelperMiddleware::class,
ApplicationFactory::DISPATCH_MIDDLEWARE, ApplicationFactory::DISPATCH_MIDDLEWARE,
], ],
'priority' => 1, 'priority' => 1,