Failed Conditions
Pull Request — experimental/3.1 (#2533)
by chihiro
44:21
created
src/Eccube/Application.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
         $this->register(new MobileDetectServiceProvider());
174 174
         $this->register(new TwigLintServiceProvider());
175 175
 
176
-        $this->error(function (\Exception $e, Request $request, $code) {
176
+        $this->error(function(\Exception $e, Request $request, $code) {
177 177
             if ($this['debug']) {
178 178
                 return;
179 179
             }
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 
241 241
         $pluginSubDirs = (function($dirName) use ($enabledPluginDirs) {
242 242
             return array_map(function($pluginDir) use ($dirName) {
243
-                return $pluginDir . '/' . $dirName;
243
+                return $pluginDir.'/'.$dirName;
244 244
             }, $enabledPluginDirs);
245 245
         });
246 246
 
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
             return $router;
302 302
         });
303 303
 
304
-        $this['eccube.router.origin'] = function ($app) {
304
+        $this['eccube.router.origin'] = function($app) {
305 305
             $resource = __DIR__.'/Controller';
306 306
             $cachePrefix = 'Origin';
307 307
 
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 
311 311
         $this['eccube.routers.plugin'] = [];
312 312
 
313
-        $this['eccube.router.extend'] = function ($app) {
313
+        $this['eccube.router.extend'] = function($app) {
314 314
             // TODO ディレクトリ名は暫定
315 315
             $resource = $app['config']['root_dir'].'/app/Acme/Controller';
316 316
             $cachePrefix = 'Extend';
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
             return $router;
321 321
         };
322 322
 
323
-        $this->extend('request_matcher', function ($matcher, $app) {
323
+        $this->extend('request_matcher', function($matcher, $app) {
324 324
             $matchers = [];
325 325
             $matchers[] = $app['eccube.router.extend'];
326 326
             foreach ($app['eccube.routers.plugin'] as $router) {
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
             return new ChainUrlMatcher($matchers, $app['request_context']);
333 333
         });
334 334
 
335
-        $this->extend('url_generator', function ($generator, $app) {
335
+        $this->extend('url_generator', function($generator, $app) {
336 336
             $generators = [];
337 337
             $generators[] = $app['eccube.router.extend'];
338 338
             foreach ($app['eccube.routers.plugin'] as $router) {
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
         });
346 346
 
347 347
         // Route CollectionにEC-CUBEで定義したルーティングを追加(debug tool barに出力するため)
348
-        $this->extend('routes', function ($routes, $app) {
348
+        $this->extend('routes', function($routes, $app) {
349 349
             $routes->addCollection($app['eccube.router.extend']->getRouteCollection());
350 350
             foreach ($app['eccube.routers.plugin'] as $router) {
351 351
                 $routes->addCollection($router->getRouteCollection());
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
             'translator.cache_dir' => $this['debug'] ? null : $this['config']['root_dir'].'/app/cache/translator',
379 379
             'locale_fallbacks' => ['ja', 'en'],
380 380
         ));
381
-        $this->extend('translator', function ($translator, \Silex\Application $app) {
381
+        $this->extend('translator', function($translator, \Silex\Application $app) {
382 382
             $translator->addLoader('php', new \Symfony\Component\Translation\Loader\PhpFileLoader());
383 383
 
384 384
             $file = __DIR__.'/Resource/locale/messages.'.$app['locale'].'.php';
@@ -421,14 +421,14 @@  discard block
 block discarded – undo
421 421
         $this->register(new \Silex\Provider\TwigServiceProvider(), array(
422 422
             'twig.form.templates' => array('Form/form_layout.twig'),
423 423
         ));
424
-        $this->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) {
424
+        $this->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) {
425 425
             $twig->addExtension(new \Eccube\Twig\Extension\EccubeExtension($app));
426 426
             $twig->addExtension(new \Twig_Extension_StringLoader());
427 427
 
428 428
             return $twig;
429 429
         });
430 430
 
431
-        $this->before(function (Request $request, \Silex\Application $app) {
431
+        $this->before(function(Request $request, \Silex\Application $app) {
432 432
             $app['admin'] = $app['front'] = false;
433 433
             $pathinfo = rawurldecode($request->getPathInfo());
434 434
             if (strpos($pathinfo, '/'.trim($app['config']['admin_route'], '/').'/') === 0) {
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
                 }
445 445
                 $paths[] = $app['config']['template_admin_realdir'];
446 446
                 $paths[] = __DIR__.'/../../app/Plugin';
447
-                $cacheDir =  __DIR__.'/../../app/cache/twig/admin';
447
+                $cacheDir = __DIR__.'/../../app/cache/twig/admin';
448 448
             } else {
449 449
                 // モバイル端末時、smartphoneディレクトリを探索パスに追加する.
450 450
                 if ($app['mobile_detect.device_type'] == \Eccube\Entity\Master\DeviceType::DEVICE_TYPE_SP) {
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
459 459
                 }
460 460
                 $paths[] = $app['config']['template_default_realdir'];
461 461
                 $paths[] = __DIR__.'/../../app/Plugin';
462
-                $cacheDir =  __DIR__.'/../../app/cache/twig/'.$app['config']['template_code'];
462
+                $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code'];
463 463
             }
464 464
             $app['twig']->setCache($app['debug'] ? null : $cacheDir);
465 465
             $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths));
@@ -477,7 +477,7 @@  discard block
 block discarded – undo
477 477
         }, self::EARLY_EVENT);
478 478
 
479 479
         // twigのグローバル変数を定義.
480
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) {
480
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) {
481 481
             // 未ログイン時にマイページや管理画面以下にアクセスするとSubRequestで実行されるため,
482 482
             // $event->isMasterRequest()ではなく、グローバル変数が初期化済かどうかの判定を行う
483 483
             if (isset($this['twig_global_initialized']) && $this['twig_global_initialized'] === true) {
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
562 562
         // メール送信時の文字エンコード指定(デフォルトはUTF-8)
563 563
         if (isset($this['config']['mail']['charset_iso_2022_jp']) && is_bool($this['config']['mail']['charset_iso_2022_jp'])) {
564 564
             if ($this['config']['mail']['charset_iso_2022_jp'] === true) {
565
-                \Swift::init(function () {
565
+                \Swift::init(function() {
566 566
                     \Swift_DependencyContainer::getInstance()
567 567
                         ->register('mime.qpheaderencoder')
568 568
                         ->asAliasOf('mime.base64headerencoder');
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
         $this->register(new \Saxulum\DoctrineOrmManagerRegistry\Provider\DoctrineOrmManagerRegistryProvider());
598 598
 
599 599
         $app = $this;
600
-        $this->extend('db.event_manager', function ($evm) use ($app) {
600
+        $this->extend('db.event_manager', function($evm) use ($app) {
601 601
             $initSubscriber = new InitSubscriber($app);
602 602
             $evm->addEventSubscriber($initSubscriber);
603 603
 
@@ -692,7 +692,7 @@  discard block
 block discarded – undo
692 692
 
693 693
         $this->extend(
694 694
             'orm.em.config',
695
-            function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
695
+            function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
696 696
 
697 697
                 /** @var $chain \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain */
698 698
                 $chain = $config->getMetadataDriverImpl();
@@ -714,7 +714,7 @@  discard block
 block discarded – undo
714 714
             }
715 715
         );
716 716
 
717
-        $this->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
717
+        $this->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
718 718
             // save
719 719
             $saveEventSubscriber = new \Eccube\Doctrine\EventSubscriber\SaveEventSubscriber($app);
720 720
             $em->getEventManager()->addEventSubscriber($saveEventSubscriber);
@@ -735,7 +735,7 @@  discard block
 block discarded – undo
735 735
             // second level cacheの設定.
736 736
             $this->extend(
737 737
                 'orm.em.config',
738
-                function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
738
+                function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
739 739
                     $config->setSecondLevelCacheEnabled();
740 740
                     $cacheConfig = $config->getSecondLevelCacheConfiguration();
741 741
                     $regionConfig = $cacheConfig->getRegionsConfiguration();
@@ -824,31 +824,31 @@  discard block
 block discarded – undo
824 824
             array('^/mypage', 'ROLE_USER', $channel),
825 825
         );
826 826
 
827
-        $this['eccube.password_encoder'] = function ($app) {
827
+        $this['eccube.password_encoder'] = function($app) {
828 828
             return new \Eccube\Security\Core\Encoder\PasswordEncoder($app['config']);
829 829
         };
830
-        $this['security.encoder_factory'] = function ($app) {
830
+        $this['security.encoder_factory'] = function($app) {
831 831
             return new \Symfony\Component\Security\Core\Encoder\EncoderFactory(array(
832 832
                 'Eccube\Entity\Customer' => $app['eccube.password_encoder'],
833 833
                 'Eccube\Entity\Member' => $app['eccube.password_encoder'],
834 834
             ));
835 835
         };
836
-        $this['eccube.event_listner.security'] = function ($app) {
836
+        $this['eccube.event_listner.security'] = function($app) {
837 837
             return new \Eccube\EventListener\SecurityEventListener($app['orm.em']);
838 838
         };
839 839
 
840 840
         // Voterの設定
841
-        $this['authority_voter'] = function ($app) {
841
+        $this['authority_voter'] = function($app) {
842 842
             return new \Eccube\Security\Voter\AuthorityVoter($app);
843 843
         };
844 844
 
845
-        $this->extend('security.voters', function ($voters, \Silex\Application $app) {
845
+        $this->extend('security.voters', function($voters, \Silex\Application $app) {
846 846
             $voters[] = $app['authority_voter'];
847 847
 
848 848
             return $voters;
849 849
         });
850 850
 
851
-        $this['security.access_manager'] = function ($app) {
851
+        $this['security.access_manager'] = function($app) {
852 852
             return new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager($app['security.voters'], 'unanimous');
853 853
         };
854 854
 
@@ -862,7 +862,7 @@  discard block
 block discarded – undo
862 862
     {
863 863
         $config = $this['config'];
864 864
         if (isset($config['trusted_proxies_connection_only']) && !empty($config['trusted_proxies_connection_only'])) {
865
-            $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($config) {
865
+            $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($config) {
866 866
                 // サブリクエストのREMOTE_ADDRも動的に設定を行う必要があるため、KernelEvents::REQUESTを使用する
867 867
                 Request::setTrustedProxies(array_merge(array($event->getRequest()->server->get('REMOTE_ADDR')), $config['trusted_proxies']));
868 868
             }, self::EARLY_EVENT);
@@ -879,7 +879,7 @@  discard block
 block discarded – undo
879 879
         $this->register(new ServiceProvider\EccubePluginServiceProvider());
880 880
 
881 881
         // TODO Acme\ServiceProvider の初期化はここで OK?
882
-        if (array_key_exists('service',$this['config'])) {
882
+        if (array_key_exists('service', $this['config'])) {
883 883
             foreach ($this['config']['service'] as $service) {
884 884
                 $this->register(new $service);
885 885
             }
@@ -1016,7 +1016,7 @@  discard block
 block discarded – undo
1016 1016
         $app = $this;
1017 1017
 
1018 1018
         // Response Event(http cache対応、event実行は一番遅く設定)
1019
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
1019
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
1020 1020
 
1021 1021
             if (!$event->isMasterRequest()) {
1022 1022
                 return;
Please login to merge, or discard this patch.
src/Eccube/Controller/Install/InstallController.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -420,6 +420,9 @@
 block discarded – undo
420 420
         $session->set('eccube.session.install', $data);
421 421
     }
422 422
 
423
+    /**
424
+     * @param InstallApplication $app
425
+     */
423 426
     private function checkModules($app)
424 427
     {
425 428
         foreach ($this->requiredModules as $module) {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -214,7 +214,7 @@
 block discarded – undo
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",
Please login to merge, or discard this patch.
eccube_install.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -400,15 +400,15 @@
 block discarded – undo
400 400
     foreach ($finder as $content) {
401 401
         $permission = $content->getPerms();
402 402
         // see also http://www.php.net/fileperms
403
-        if (!($permission & 0x0010) || !($permission & 0x0002)) {
403
+        if (!($permission&0x0010) || !($permission&0x0002)) {
404 404
             $realPath = $content->getRealPath();
405 405
             if ($verbose) {
406 406
                 out(sprintf('%s %s to ', $realPath, substr(sprintf('%o', $permission), -4)), 'info', false);
407 407
             }
408
-            $permission = !($permission & 0x0020) ? $permission += 040 : $permission; // g+r
409
-            $permission = !($permission & 0x0010) ? $permission += 020 : $permission; // g+w
410
-            $permission = !($permission & 0x0004) ? $permission += 04 : $permission;  // o+r
411
-            $permission = !($permission & 0x0002) ? $permission += 02 : $permission;  // o+w
408
+            $permission = !($permission&0x0020) ? $permission += 040 : $permission; // g+r
409
+            $permission = !($permission&0x0010) ? $permission += 020 : $permission; // g+w
410
+            $permission = !($permission&0x0004) ? $permission += 04 : $permission; // o+r
411
+            $permission = !($permission&0x0002) ? $permission += 02 : $permission; // o+w
412 412
             $result = chmod($realPath, $permission);
413 413
             if ($verbose) {
414 414
                 if ($result) {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/SecurityController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
                     } else {
96 96
                         // httpから変更されたらfalseのまま
97 97
                         $config['force_ssl'] = Constant::DISABLED;
98
-                        $data['force_ssl'] = (bool)Constant::DISABLED;
98
+                        $data['force_ssl'] = (bool) Constant::DISABLED;
99 99
                     }
100 100
                 } else {
101 101
                     $config['force_ssl'] = Constant::DISABLED;
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
             if (count($allowHost) > 0) {
141 141
                 $form->get('admin_allow_hosts')->setData(Str::convertLineFeed(implode("\n", $allowHost)));
142 142
             }
143
-            $form->get('force_ssl')->setData((bool)$this->appConfig['force_ssl']);
143
+            $form->get('force_ssl')->setData((bool) $this->appConfig['force_ssl']);
144 144
         }
145 145
 
146 146
         return [
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/SecurityType.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,8 +77,8 @@
 block discarded – undo
77 77
                     new Assert\NotBlank(),
78 78
                     new Assert\Length(array('max' => $this->appConfig['stext_len'])),
79 79
                     new Assert\Regex(array(
80
-                       'pattern' => "/^[0-9a-zA-Z]+$/",
81
-                   )),
80
+                        'pattern' => "/^[0-9a-zA-Z]+$/",
81
+                    )),
82 82
                 ),
83 83
             ))
84 84
             ->add('admin_allow_hosts', TextareaType::class, array(
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -92,19 +92,19 @@
 block discarded – undo
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
             })
Please login to merge, or discard this patch.
src/Eccube/Resource/config/path.php 2 patches
Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -1,31 +1,31 @@
 block discarded – undo
1 1
 <?php return [
2
-  'root_dir' => '%ROOT_DIR%',
3
-  'root_urlpath' => env('ROOT_URLPATH', null),
4
-  'template_code' => env('TEMPLATE_CODE','default'),
5
-  'admin_route' => env('ADMIN_ROUTE','admin'),
6
-  'user_data_route' => env('USER_DATA_ROUTE', 'user_data'),
7
-  'public_path' => '/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' => '/html/template/admin',
26
-  'front_urlpath' => '/html/template/default',
27
-  'image_save_urlpath' => '/html/upload/save_image',
28
-  'image_temp_urlpath' => '/html/upload/temp_image',
29
-  'user_data_urlpath' => '/html/user_data',
30
-  'plugin_urlpath' => '/html/plugin',
2
+    'root_dir' => '%ROOT_DIR%',
3
+    'root_urlpath' => env('ROOT_URLPATH', null),
4
+    'template_code' => env('TEMPLATE_CODE','default'),
5
+    'admin_route' => env('ADMIN_ROUTE','admin'),
6
+    'user_data_route' => env('USER_DATA_ROUTE', 'user_data'),
7
+    'public_path' => '/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' => '/html/template/admin',
26
+    'front_urlpath' => '/html/template/default',
27
+    'image_save_urlpath' => '/html/upload/save_image',
28
+    'image_temp_urlpath' => '/html/upload/temp_image',
29
+    'user_data_urlpath' => '/html/user_data',
30
+    'plugin_urlpath' => '/html/plugin',
31 31
 ];
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php return [
2 2
   'root_dir' => '%ROOT_DIR%',
3 3
   'root_urlpath' => env('ROOT_URLPATH', null),
4
-  'template_code' => env('TEMPLATE_CODE','default'),
5
-  'admin_route' => env('ADMIN_ROUTE','admin'),
4
+  'template_code' => env('TEMPLATE_CODE', 'default'),
5
+  'admin_route' => env('ADMIN_ROUTE', 'admin'),
6 6
   'user_data_route' => env('USER_DATA_ROUTE', 'user_data'),
7 7
   'public_path' => '/html',
8 8
   'public_path_realdir' => '%ROOT_DIR%/html',
Please login to merge, or discard this patch.
src/Eccube/Resource/config/log.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php return [
2
-  'log' => 
3
-  [
2
+    'log' => 
3
+    [
4 4
     'suffix' => null,
5 5
     'filename' => 'site',
6 6
     'delimiter' => '_',
@@ -13,8 +13,8 @@  discard block
 block discarded – undo
13 13
     'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
14 14
     'channel' => 
15 15
     [
16
-      'monolog' => 
17
-      [
16
+        'monolog' => 
17
+        [
18 18
         'name' => 'eccube',
19 19
         'filename' => 'site',
20 20
         'delimiter' => '_',
@@ -25,9 +25,9 @@  discard block
 block discarded – undo
25 25
         'max_files' => 90,
26 26
         'log_dateformat' => 'Y-m-d H:i:s,u',
27 27
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
28
-      ],
29
-      'front' => 
30
-      [
28
+        ],
29
+        'front' => 
30
+        [
31 31
         'name' => 'front',
32 32
         'filename' => 'front_site',
33 33
         'delimiter' => '_',
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
38 38
         'max_files' => 90,
39 39
         'log_dateformat' => 'Y-m-d H:i:s,u',
40 40
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
41
-      ],
42
-      'admin' => 
43
-      [
41
+        ],
42
+        'admin' => 
43
+        [
44 44
         'name' => 'admin',
45 45
         'filename' => 'admin_site',
46 46
         'delimiter' => '_',
@@ -51,12 +51,12 @@  discard block
 block discarded – undo
51 51
         'max_files' => 90,
52 52
         'log_dateformat' => 'Y-m-d H:i:s,u',
53 53
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
54
-      ],
54
+        ],
55 55
     ],
56 56
     'exclude_keys' => 
57 57
     [
58
-      'password',
59
-      'app',
58
+        'password',
59
+        'app',
60
+    ],
60 61
     ],
61
-  ],
62 62
 ];
Please login to merge, or discard this patch.
src/Eccube/Resource/config/doctrine_cache.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -1,39 +1,39 @@
 block discarded – undo
1 1
 <?php return [
2
-  'doctrine_cache' => 
3
-  [
2
+    'doctrine_cache' => 
3
+    [
4 4
     'metadata_cache' => 
5 5
     [
6
-      'driver' => 'array',
7
-      'path' => null,
8
-      'host' => null,
9
-      'port' => null,
10
-      'password' => null,
6
+        'driver' => 'array',
7
+        'path' => null,
8
+        'host' => null,
9
+        'port' => null,
10
+        'password' => null,
11 11
     ],
12 12
     'query_cache' => 
13 13
     [
14
-      'driver' => 'array',
15
-      'path' => null,
16
-      'host' => null,
17
-      'port' => null,
18
-      'password' => null,
14
+        'driver' => 'array',
15
+        'path' => null,
16
+        'host' => null,
17
+        'port' => null,
18
+        'password' => null,
19 19
     ],
20 20
     'result_cache' => 
21 21
     [
22
-      'driver' => 'array',
23
-      'path' => null,
24
-      'host' => null,
25
-      'port' => null,
26
-      'password' => null,
27
-      'lifetime' => 3600,
28
-      'clear_cache' => true,
22
+        'driver' => 'array',
23
+        'path' => null,
24
+        'host' => null,
25
+        'port' => null,
26
+        'password' => null,
27
+        'lifetime' => 3600,
28
+        'clear_cache' => true,
29 29
     ],
30 30
     'hydration_cache' => 
31 31
     [
32
-      'driver' => 'array',
33
-      'path' => null,
34
-      'host' => null,
35
-      'port' => null,
36
-      'password' => null,
32
+        'driver' => 'array',
33
+        'path' => null,
34
+        'host' => null,
35
+        'port' => null,
36
+        'password' => null,
37
+    ],
37 38
     ],
38
-  ],
39 39
 ];
Please login to merge, or discard this patch.
install.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
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);
Please login to merge, or discard this patch.