@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | public function register(Container $app) |
27 | 27 | { |
28 | 28 | // EventDispatcher |
29 | - $app['eccube.event.dispatcher'] = function () use ($app) { |
|
29 | + $app['eccube.event.dispatcher'] = function() use ($app) { |
|
30 | 30 | return $app['dispatcher']; |
31 | 31 | }; |
32 | 32 | |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | |
36 | 36 | $enabledPlugins = $app['orm.em']->getRepository('Eccube\Entity\Plugin')->findAllEnabled(); |
37 | 37 | |
38 | - $app['eccube.routers.plugin'] = function ($app) use ($enabledPlugins) { |
|
38 | + $app['eccube.routers.plugin'] = function($app) use ($enabledPlugins) { |
|
39 | 39 | $pluginDirs = array_map(function($plugin) use ($app) { |
40 | 40 | return $app['config']['root_dir'].'/app/Plugin/'.$plugin->getCode(); |
41 | 41 | }, $enabledPlugins); |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $config = $pluginConfig['config']; |
63 | 63 | |
64 | 64 | if (isset($config['const'])) { |
65 | - $app->extend('config', function ($eccubeConfig) use ($config) { |
|
65 | + $app->extend('config', function($eccubeConfig) use ($config) { |
|
66 | 66 | $eccubeConfig[$config['code']] = array( |
67 | 67 | 'const' => $config['const'], |
68 | 68 | ); |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | public function initPluginEventDispatcher(Application $app) |
85 | 85 | { |
86 | 86 | // hook point |
87 | - $app->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) { |
|
87 | + $app->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) { |
|
88 | 88 | if (!$event->isMasterRequest()) { |
89 | 89 | return; |
90 | 90 | } |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | $app['eccube.event.dispatcher']->dispatch($hookpoint, $event); |
93 | 93 | }, Application::EARLY_EVENT); |
94 | 94 | |
95 | - $app->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) { |
|
95 | + $app->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) { |
|
96 | 96 | if (!$event->isMasterRequest()) { |
97 | 97 | return; |
98 | 98 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | $app['eccube.event.dispatcher']->dispatch($hookpoint, $event); |
102 | 102 | }); |
103 | 103 | |
104 | - $app->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) { |
|
104 | + $app->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) { |
|
105 | 105 | if (!$event->isMasterRequest()) { |
106 | 106 | return; |
107 | 107 | } |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | $app['eccube.event.dispatcher']->dispatch($hookpoint, $event); |
111 | 111 | }); |
112 | 112 | |
113 | - $app->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) { |
|
113 | + $app->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) { |
|
114 | 114 | if (!$event->isMasterRequest()) { |
115 | 115 | return; |
116 | 116 | } |
@@ -118,13 +118,13 @@ discard block |
||
118 | 118 | $app['eccube.event.dispatcher']->dispatch($hookpoint, $event); |
119 | 119 | }, Application::LATE_EVENT); |
120 | 120 | |
121 | - $app->on(KernelEvents::TERMINATE, function (PostResponseEvent $event) use ($app) { |
|
121 | + $app->on(KernelEvents::TERMINATE, function(PostResponseEvent $event) use ($app) { |
|
122 | 122 | $route = $event->getRequest()->attributes->get('_route'); |
123 | 123 | $hookpoint = "eccube.event.controller.$route.finish"; |
124 | 124 | $app['eccube.event.dispatcher']->dispatch($hookpoint, $event); |
125 | 125 | }); |
126 | 126 | |
127 | - $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
127 | + $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
128 | 128 | if (!$event->isMasterRequest()) { |
129 | 129 | return; |
130 | 130 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | }); |
134 | 134 | |
135 | 135 | // Request Event |
136 | - $app->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function (\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) { |
|
136 | + $app->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function(\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) { |
|
137 | 137 | |
138 | 138 | if (!$event->isMasterRequest()) { |
139 | 139 | return; |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | }, 30); // Routing(32)が解決し, 認証判定(8)が実行される前のタイミング. |
165 | 165 | |
166 | 166 | // Controller Event |
167 | - $app->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) { |
|
167 | + $app->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) { |
|
168 | 168 | |
169 | 169 | if (!$event->isMasterRequest()) { |
170 | 170 | return; |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | }); |
194 | 194 | |
195 | 195 | // Response Event |
196 | - $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
196 | + $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
197 | 197 | if (!$event->isMasterRequest()) { |
198 | 198 | return; |
199 | 199 | } |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | }); |
223 | 223 | |
224 | 224 | // Exception Event |
225 | - $app->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function (\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) { |
|
225 | + $app->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function(\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) { |
|
226 | 226 | |
227 | 227 | if (!$event->isMasterRequest()) { |
228 | 228 | return; |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | }); |
253 | 253 | |
254 | 254 | // Terminate Event |
255 | - $app->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function (\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) { |
|
255 | + $app->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function(\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) { |
|
256 | 256 | |
257 | 257 | $route = $event->getRequest()->attributes->get('_route'); |
258 | 258 |
@@ -31,7 +31,7 @@ |
||
31 | 31 | { |
32 | 32 | /** |
33 | 33 | * FormExtensionAutoWiring constructor. |
34 | - * @param array|string[] $scanDirs |
|
34 | + * @param string[] $scanDirs |
|
35 | 35 | */ |
36 | 36 | public function __construct($scanDirs) |
37 | 37 | { |
@@ -30,7 +30,7 @@ |
||
30 | 30 | { |
31 | 31 | /** |
32 | 32 | * RepositoryAutoWiring constructor. |
33 | - * @param array|string[] $scanDirs |
|
33 | + * @param string[] $scanDirs |
|
34 | 34 | */ |
35 | 35 | public function __construct($scanDirs) |
36 | 36 | { |
@@ -161,7 +161,9 @@ |
||
161 | 161 | } |
162 | 162 | |
163 | 163 | if (!empty($components)) { |
164 | - if ($snippets) $snippets .= PHP_EOL; |
|
164 | + if ($snippets) { |
|
165 | + $snippets .= PHP_EOL; |
|
166 | + } |
|
165 | 167 | $snippets .= $wiring->generate($twig, $components); |
166 | 168 | $snippets .= $wiring->generateExtend($twig, $components); |
167 | 169 | } |
@@ -12,7 +12,7 @@ |
||
12 | 12 | { |
13 | 13 | public function register(Container $app) |
14 | 14 | { |
15 | - $app['eccube.di'] = function (Container $app) { |
|
15 | + $app['eccube.di'] = function(Container $app) { |
|
16 | 16 | $di = new DependencyBuilder( |
17 | 17 | $app['eccube.di.generator.dir'], |
18 | 18 | $app['eccube.di.generator.class'], |
@@ -1,31 +1,31 @@ |
||
1 | 1 | <?php return [ |
2 | - 'root_dir' => '%ROOT_DIR%', |
|
3 | - 'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null), |
|
4 | - 'template_code' => env('ECCUBE_TEMPLATE_CODE','default'), |
|
5 | - 'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'), |
|
6 | - 'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'), |
|
7 | - 'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/html', |
|
8 | - 'public_path_realdir' => '%ROOT_DIR%/html', |
|
9 | - 'image_save_realdir' => '%ROOT_DIR%/html/upload/save_image', |
|
10 | - 'image_temp_realdir' => '%ROOT_DIR%/html/upload/temp_image', |
|
11 | - 'user_data_realdir' => '%ROOT_DIR%/html/user_data', |
|
12 | - 'block_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default/Block', |
|
13 | - 'block_realdir' => '%ROOT_DIR%/app/template/default/Block', |
|
14 | - 'template_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default', |
|
15 | - 'template_default_html_realdir' => '%ROOT_DIR%/html/template/default', |
|
16 | - 'template_admin_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/admin', |
|
17 | - 'template_admin_html_realdir' => '%ROOT_DIR%/html/template/admin', |
|
18 | - 'template_realdir' => '%ROOT_DIR%/app/template/default', |
|
19 | - 'template_html_realdir' => '%ROOT_DIR%/html/template/default', |
|
20 | - 'template_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/template', |
|
21 | - 'csv_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/csv', |
|
22 | - 'plugin_realdir' => '%ROOT_DIR%/app/Plugin', |
|
23 | - 'plugin_temp_realdir' => '%ROOT_DIR%/app/cache/plugin', |
|
24 | - 'plugin_html_realdir' => '%ROOT_DIR%/html/plugin', |
|
25 | - 'admin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/admin', |
|
26 | - 'front_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/default', |
|
27 | - 'image_save_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/save_image', |
|
28 | - 'image_temp_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/temp_image', |
|
29 | - 'user_data_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/user_data', |
|
30 | - 'plugin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/plugin', |
|
2 | + 'root_dir' => '%ROOT_DIR%', |
|
3 | + 'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null), |
|
4 | + 'template_code' => env('ECCUBE_TEMPLATE_CODE','default'), |
|
5 | + 'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'), |
|
6 | + 'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'), |
|
7 | + 'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/html', |
|
8 | + 'public_path_realdir' => '%ROOT_DIR%/html', |
|
9 | + 'image_save_realdir' => '%ROOT_DIR%/html/upload/save_image', |
|
10 | + 'image_temp_realdir' => '%ROOT_DIR%/html/upload/temp_image', |
|
11 | + 'user_data_realdir' => '%ROOT_DIR%/html/user_data', |
|
12 | + 'block_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default/Block', |
|
13 | + 'block_realdir' => '%ROOT_DIR%/app/template/default/Block', |
|
14 | + 'template_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default', |
|
15 | + 'template_default_html_realdir' => '%ROOT_DIR%/html/template/default', |
|
16 | + 'template_admin_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/admin', |
|
17 | + 'template_admin_html_realdir' => '%ROOT_DIR%/html/template/admin', |
|
18 | + 'template_realdir' => '%ROOT_DIR%/app/template/default', |
|
19 | + 'template_html_realdir' => '%ROOT_DIR%/html/template/default', |
|
20 | + 'template_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/template', |
|
21 | + 'csv_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/csv', |
|
22 | + 'plugin_realdir' => '%ROOT_DIR%/app/Plugin', |
|
23 | + 'plugin_temp_realdir' => '%ROOT_DIR%/app/cache/plugin', |
|
24 | + 'plugin_html_realdir' => '%ROOT_DIR%/html/plugin', |
|
25 | + 'admin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/admin', |
|
26 | + 'front_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/default', |
|
27 | + 'image_save_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/save_image', |
|
28 | + 'image_temp_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/temp_image', |
|
29 | + 'user_data_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/user_data', |
|
30 | + 'plugin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/plugin', |
|
31 | 31 | ]; |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php return [ |
2 | 2 | 'root_dir' => '%ROOT_DIR%', |
3 | 3 | 'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null), |
4 | - 'template_code' => env('ECCUBE_TEMPLATE_CODE','default'), |
|
5 | - 'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'), |
|
4 | + 'template_code' => env('ECCUBE_TEMPLATE_CODE', 'default'), |
|
5 | + 'admin_route' => env('ECCUBE_ADMIN_ROUTE', 'admin'), |
|
6 | 6 | 'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'), |
7 | 7 | 'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/html', |
8 | 8 | 'public_path_realdir' => '%ROOT_DIR%/html', |
@@ -194,7 +194,7 @@ |
||
194 | 194 | |
195 | 195 | /** |
196 | 196 | * EntityからTraitを削除. |
197 | - * @param $entityTokens Tokens Entityのトークン |
|
197 | + * @param Tokens $entityTokens Tokens Entityのトークン |
|
198 | 198 | * @param $trait string 削除するTraitのFQCN |
199 | 199 | */ |
200 | 200 | private function removeTrait($entityTokens, $trait) |
@@ -16,7 +16,6 @@ |
||
16 | 16 | * This method should only be used to configure services and parameters. |
17 | 17 | * It should not get services. |
18 | 18 | * |
19 | - * @param Container $pimple A container instance |
|
20 | 19 | */ |
21 | 20 | public function register(Container $app) |
22 | 21 | { |
@@ -4,7 +4,6 @@ |
||
4 | 4 | namespace Eccube\ServiceProvider; |
5 | 5 | |
6 | 6 | |
7 | -use Eccube\Entity\Event\EntityEventDispatcher; |
|
8 | 7 | use Pimple\Container; |
9 | 8 | use Pimple\ServiceProviderInterface; |
10 | 9 |
@@ -20,7 +20,7 @@ |
||
20 | 20 | */ |
21 | 21 | public function register(Container $app) |
22 | 22 | { |
23 | - $app['eccube.queries'] = function () { |
|
23 | + $app['eccube.queries'] = function() { |
|
24 | 24 | return new \Eccube\Doctrine\Query\Queries(); |
25 | 25 | }; |
26 | 26 | } |
@@ -11,7 +11,7 @@ |
||
11 | 11 | { |
12 | 12 | public function register(Container $app) |
13 | 13 | { |
14 | - $app['paginator'] = $app->protect(function () { |
|
14 | + $app['paginator'] = $app->protect(function() { |
|
15 | 15 | $paginator = new Paginator(); |
16 | 16 | $paginator->subscribe(new PaginatorListener()); |
17 | 17 |