mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-03-27 20:11:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed config files names

Browse source
This commit is contained in:
Alejandro Celaya 2016-07-19 17:12:50 +02:00
parent 55f954f50f
commit 170c96b8ef
5 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/autoload/services.global.php
View file

@ -40,7 +40,6 @@ return [
Service\UrlShortener::class => AnnotatedFactory::class, Service\UrlShortener::class => AnnotatedFactory::class,
Service\VisitsTracker::class => AnnotatedFactory::class, Service\VisitsTracker::class => AnnotatedFactory::class,
Service\ShortUrlService::class => AnnotatedFactory::class, Service\ShortUrlService::class => AnnotatedFactory::class,
Service\RestTokenService::class => AnnotatedFactory::class,
Cache::class => CacheFactory::class, Cache::class => CacheFactory::class,
// Cli commands // Cli commands

2
config/config.php
View file

@ -15,9 +15,9 @@ use Zend\Expressive\ConfigManager\ZendConfigProvider;
return call_user_func(function () { return call_user_func(function () {
$configManager = new ConfigManager([ $configManager = new ConfigManager([
new ZendConfigProvider('config/autoload/{{,*.}global,{,*.}local}.php'),
CLI\ConfigProvider::class, CLI\ConfigProvider::class,
Rest\ConfigProvider::class, Rest\ConfigProvider::class,
new ZendConfigProvider('config/autoload/{{,*.}global,{,*.}local}.php')
], 'data/cache/app_config.php'); ], 'data/cache/app_config.php');
return $configManager->getMergedConfig(); return $configManager->getMergedConfig();

0
module/Rest/config/middleware-pipeline.global.php → module/Rest/config/middleware-pipeline.config.php
View file

0
module/Rest/config/routes.global.php → module/Rest/config/routes.config.php
View file

3
module/Rest/config/services.global.php → module/Rest/config/services.config.php
View file

@ -2,12 +2,15 @@
use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory; use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
use Shlinkio\Shlink\Rest\Action; use Shlinkio\Shlink\Rest\Action;
use Shlinkio\Shlink\Rest\Middleware; use Shlinkio\Shlink\Rest\Middleware;
use Shlinkio\Shlink\Rest\Service;
use Zend\ServiceManager\Factory\InvokableFactory; use Zend\ServiceManager\Factory\InvokableFactory;
return [ return [
'services' => [ 'services' => [
'factories' => [ 'factories' => [
Service\RestTokenService::class => AnnotatedFactory::class,
Action\AuthenticateMiddleware::class => AnnotatedFactory::class, Action\AuthenticateMiddleware::class => AnnotatedFactory::class,
Action\CreateShortcodeMiddleware::class => AnnotatedFactory::class, Action\CreateShortcodeMiddleware::class => AnnotatedFactory::class,
Action\ResolveUrlMiddleware::class => AnnotatedFactory::class, Action\ResolveUrlMiddleware::class => AnnotatedFactory::class,