@@ -214,7 +214,7 @@ |
||
| 214 | 214 | |
| 215 | 215 | // ロードバランサ, プロキシサーバ |
| 216 | 216 | if (!empty($config['trusted_proxies_connection_only'])) { |
| 217 | - $sessionData['trusted_proxies_connection_only'] = (bool)$config['trusted_proxies_connection_only']; |
|
| 217 | + $sessionData['trusted_proxies_connection_only'] = (bool) $config['trusted_proxies_connection_only']; |
|
| 218 | 218 | } |
| 219 | 219 | if (!empty($config['trusted_proxies'])) { |
| 220 | 220 | $sessionData['trusted_proxies'] = Str::convertLineFeed(implode("\n", |
@@ -92,19 +92,19 @@ |
||
| 92 | 92 | 'label' => 'SSLを強制', |
| 93 | 93 | 'required' => false, |
| 94 | 94 | )) |
| 95 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use($app) { |
|
| 95 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) use($app) { |
|
| 96 | 96 | $form = $event->getForm(); |
| 97 | 97 | $data = $form->getData(); |
| 98 | 98 | |
| 99 | 99 | $ips = preg_split("/\R/", $data['admin_allow_hosts'], null, PREG_SPLIT_NO_EMPTY); |
| 100 | 100 | |
| 101 | - foreach($ips as $ip) { |
|
| 101 | + foreach ($ips as $ip) { |
|
| 102 | 102 | $errors = $this->recursiveValidator->validate($ip, array( |
| 103 | 103 | new Assert\Ip(), |
| 104 | 104 | ) |
| 105 | 105 | ); |
| 106 | 106 | if ($errors->count() != 0) { |
| 107 | - $form['admin_allow_hosts']->addError(new FormError($ip . 'はIPv4アドレスではありません。')); |
|
| 107 | + $form['admin_allow_hosts']->addError(new FormError($ip.'はIPv4アドレスではありません。')); |
|
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | }) |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | apc_clear_cache(); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | -require __DIR__ . '/autoload.php'; |
|
| 29 | +require __DIR__.'/autoload.php'; |
|
| 30 | 30 | |
| 31 | 31 | set_time_limit(0); |
| 32 | 32 | ini_set('memory_limit', -1); |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | $loader = require __DIR__.'/autoload.php'; |
| 26 | 26 | |
| 27 | 27 | ini_set('display_errors', 'Off'); |
| 28 | -error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT); |
|
| 28 | +error_reporting(E_ALL&~E_DEPRECATED&~E_STRICT); |
|
| 29 | 29 | |
| 30 | 30 | // see http://silex.sensiolabs.org/doc/web_servers.html#php-5-4 |
| 31 | 31 | $filename = __DIR__.preg_replace('#(\?.*)$#', '', $_SERVER['REQUEST_URI']); |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | 'allow_delete' => true, |
| 208 | 208 | 'prototype' => true, |
| 209 | 209 | )) |
| 210 | - ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) { |
|
| 210 | + ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) { |
|
| 211 | 211 | /** @var \Eccube\Entity\Shipping $data */ |
| 212 | 212 | $data = $event->getData(); |
| 213 | 213 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | 'placeholder' => '指定なし', |
| 229 | 229 | 'required' => false, |
| 230 | 230 | 'data' => $DeliveryTime, |
| 231 | - 'query_builder' => function (EntityRepository $er) use ($Delivery) { |
|
| 231 | + 'query_builder' => function(EntityRepository $er) use ($Delivery) { |
|
| 232 | 232 | $qb = $er->createQueryBuilder('dt'); |
| 233 | 233 | if ($Delivery) { |
| 234 | 234 | $qb |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | 'mapped' => false, |
| 241 | 241 | )); |
| 242 | 242 | }) |
| 243 | - ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
| 243 | + ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) { |
|
| 244 | 244 | $data = $event->getData(); |
| 245 | 245 | $form = $event->getForm(); |
| 246 | 246 | |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | 'choice_label' => 'delivery_time', |
| 262 | 262 | 'placeholder' => '指定なし', |
| 263 | 263 | 'required' => false, |
| 264 | - 'query_builder' => function (EntityRepository $er) use ($Delivery) { |
|
| 264 | + 'query_builder' => function(EntityRepository $er) use ($Delivery) { |
|
| 265 | 265 | $qb = $er->createQueryBuilder('dt'); |
| 266 | 266 | if ($Delivery) { |
| 267 | 267 | $qb |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | 'mapped' => false, |
| 274 | 274 | )); |
| 275 | 275 | }) |
| 276 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 276 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 277 | 277 | $form = $event->getForm(); |
| 278 | 278 | $OrderItems = $form['OrderItems']->getData(); |
| 279 | 279 | |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | $form['shipping_delivery_date']->addError(new FormError('商品が追加されていません。')); |
| 283 | 283 | } |
| 284 | 284 | }) |
| 285 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 285 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 286 | 286 | $form = $event->getForm(); |
| 287 | 287 | $Shipping = $event->getData(); |
| 288 | 288 | $Delivery = $Shipping->getDelivery(); |
@@ -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 | |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | |
| 45 | 45 | public function updateSchema($generatedFiles, $proxiesDirectory) |
| 46 | 46 | { |
| 47 | - $outputDir = sys_get_temp_dir() . '/proxy_' . Str::random(12); |
|
| 47 | + $outputDir = sys_get_temp_dir().'/proxy_'.Str::random(12); |
|
| 48 | 48 | mkdir($outputDir); |
| 49 | 49 | |
| 50 | 50 | try { |
@@ -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,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', |