EC-CUBE / ec-cube

src/Eccube/Controller/Install/InstallController.php

Doc Comments +3 added lines

@@ -420,6 +420,9 @@
         $session->set('eccube.session.install', $data);
     }
 
+    /**
+     * @param InstallApplication $app
+     */
     private function checkModules($app)
     {
         foreach ($this->requiredModules as $module) {

Spacing +1 added lines, -1 removed lines

@@ -214,7 +214,7 @@
 
                 // ロードバランサ, プロキシサーバ
                 if (!empty($config['trusted_proxies_connection_only'])) {
-                    $sessionData['trusted_proxies_connection_only'] = (bool)$config['trusted_proxies_connection_only'];
+                    $sessionData['trusted_proxies_connection_only'] = (bool) $config['trusted_proxies_connection_only'];
                 }
                 if (!empty($config['trusted_proxies'])) {
                     $sessionData['trusted_proxies'] = Str::convertLineFeed(implode("\n",

eccube_install.php

Spacing +5 added lines, -5 removed lines

@@ -400,15 +400,15 @@
     foreach ($finder as $content) {
         $permission = $content->getPerms();
         // see also http://www.php.net/fileperms
-        if (!($permission & 0x0010) || !($permission & 0x0002)) {
+        if (!($permission&0x0010) || !($permission&0x0002)) {
             $realPath = $content->getRealPath();
             if ($verbose) {
                 out(sprintf('%s %s to ', $realPath, substr(sprintf('%o', $permission), -4)), 'info', false);
             }
-            $permission = !($permission & 0x0020) ? $permission += 040 : $permission; // g+r
-            $permission = !($permission & 0x0010) ? $permission += 020 : $permission; // g+w
-            $permission = !($permission & 0x0004) ? $permission += 04 : $permission;  // o+r
-            $permission = !($permission & 0x0002) ? $permission += 02 : $permission;  // o+w
+            $permission = !($permission&0x0020) ? $permission += 040 : $permission; // g+r
+            $permission = !($permission&0x0010) ? $permission += 020 : $permission; // g+w
+            $permission = !($permission&0x0004) ? $permission += 04 : $permission; // o+r
+            $permission = !($permission&0x0002) ? $permission += 02 : $permission; // o+w
             $result = chmod($realPath, $permission);
             if ($verbose) {
                 if ($result) {

src/Eccube/Controller/Admin/Setting/System/SecurityController.php

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
                     } else {
                         // httpから変更されたらfalseのまま
                         $config['force_ssl'] = Constant::DISABLED;
-                        $data['force_ssl'] = (bool)Constant::DISABLED;
+                        $data['force_ssl'] = (bool) Constant::DISABLED;
                     }
                 } else {
                     $config['force_ssl'] = Constant::DISABLED;
@@ -140,7 +140,7 @@ 
             if (count($allowHost) > 0) {
                 $form->get('admin_allow_hosts')->setData(Str::convertLineFeed(implode("\n", $allowHost)));
             }
-            $form->get('force_ssl')->setData((bool)$this->appConfig['force_ssl']);
+            $form->get('force_ssl')->setData((bool) $this->appConfig['force_ssl']);
         }
 
         return [

src/Eccube/Form/Type/Admin/SecurityType.php

Indentation +2 added lines, -2 removed lines

@@ -77,8 +77,8 @@
                     new Assert\NotBlank(),
                     new Assert\Length(array('max' => $this->appConfig['stext_len'])),
                     new Assert\Regex(array(
-                       'pattern' => "/^[0-9a-zA-Z]+$/",
-                   )),
+                        'pattern' => "/^[0-9a-zA-Z]+$/",
+                    )),
                 ),
             ))
             ->add('admin_allow_hosts', TextareaType::class, array(

Spacing +3 added lines, -3 removed lines

@@ -92,19 +92,19 @@
                 'label' => 'SSLを強制',
                 'required' => false,
             ))
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use($app) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) use($app) {
                 $form = $event->getForm();
                 $data = $form->getData();
 
                 $ips = preg_split("/\R/", $data['admin_allow_hosts'], null, PREG_SPLIT_NO_EMPTY);
 
-                foreach($ips as $ip) {
+                foreach ($ips as $ip) {
                     $errors = $this->recursiveValidator->validate($ip, array(
                             new Assert\Ip(),
                         )
                     );
                     if ($errors->count() != 0) {
-                        $form['admin_allow_hosts']->addError(new FormError($ip . 'はIPv4アドレスではありません。'));
+                        $form['admin_allow_hosts']->addError(new FormError($ip.'はIPv4アドレスではありません。'));
                     }
                 }
             })

src/Eccube/Resource/config/path.php

Indentation +29 added lines, -29 removed lines

@@ -1,31 +1,31 @@
 <?php return [
-  'root_dir' => '%ROOT_DIR%',
-  'root_urlpath' => env('ROOT_URLPATH', null),
-  'template_code' => env('TEMPLATE_CODE','default'),
-  'admin_route' => env('ADMIN_ROUTE','admin'),
-  'user_data_route' => env('USER_DATA_ROUTE', 'user_data'),
-  'public_path' => '/html',
-  'public_path_realdir' => '%ROOT_DIR%/html',
-  'image_save_realdir' => '%ROOT_DIR%/html/upload/save_image',
-  'image_temp_realdir' => '%ROOT_DIR%/html/upload/temp_image',
-  'user_data_realdir' => '%ROOT_DIR%/html/user_data',
-  'block_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default/Block',
-  'block_realdir' => '%ROOT_DIR%/app/template/default/Block',
-  'template_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default',
-  'template_default_html_realdir' => '%ROOT_DIR%/html/template/default',
-  'template_admin_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/admin',
-  'template_admin_html_realdir' => '%ROOT_DIR%/html/template/admin',
-  'template_realdir' => '%ROOT_DIR%/app/template/default',
-  'template_html_realdir' => '%ROOT_DIR%/html/template/default',
-  'template_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/template',
-  'csv_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/csv',
-  'plugin_realdir' => '%ROOT_DIR%/app/Plugin',
-  'plugin_temp_realdir' => '%ROOT_DIR%/app/cache/plugin',
-  'plugin_html_realdir' => '%ROOT_DIR%/html/plugin',
-  'admin_urlpath' => '/html/template/admin',
-  'front_urlpath' => '/html/template/default',
-  'image_save_urlpath' => '/html/upload/save_image',
-  'image_temp_urlpath' => '/html/upload/temp_image',
-  'user_data_urlpath' => '/html/user_data',
-  'plugin_urlpath' => '/html/plugin',
+    'root_dir' => '%ROOT_DIR%',
+    'root_urlpath' => env('ROOT_URLPATH', null),
+    'template_code' => env('TEMPLATE_CODE','default'),
+    'admin_route' => env('ADMIN_ROUTE','admin'),
+    'user_data_route' => env('USER_DATA_ROUTE', 'user_data'),
+    'public_path' => '/html',
+    'public_path_realdir' => '%ROOT_DIR%/html',
+    'image_save_realdir' => '%ROOT_DIR%/html/upload/save_image',
+    'image_temp_realdir' => '%ROOT_DIR%/html/upload/temp_image',
+    'user_data_realdir' => '%ROOT_DIR%/html/user_data',
+    'block_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default/Block',
+    'block_realdir' => '%ROOT_DIR%/app/template/default/Block',
+    'template_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default',
+    'template_default_html_realdir' => '%ROOT_DIR%/html/template/default',
+    'template_admin_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/admin',
+    'template_admin_html_realdir' => '%ROOT_DIR%/html/template/admin',
+    'template_realdir' => '%ROOT_DIR%/app/template/default',
+    'template_html_realdir' => '%ROOT_DIR%/html/template/default',
+    'template_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/template',
+    'csv_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/csv',
+    'plugin_realdir' => '%ROOT_DIR%/app/Plugin',
+    'plugin_temp_realdir' => '%ROOT_DIR%/app/cache/plugin',
+    'plugin_html_realdir' => '%ROOT_DIR%/html/plugin',
+    'admin_urlpath' => '/html/template/admin',
+    'front_urlpath' => '/html/template/default',
+    'image_save_urlpath' => '/html/upload/save_image',
+    'image_temp_urlpath' => '/html/upload/temp_image',
+    'user_data_urlpath' => '/html/user_data',
+    'plugin_urlpath' => '/html/plugin',
 ];

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php return [
   'root_dir' => '%ROOT_DIR%',
   'root_urlpath' => env('ROOT_URLPATH', null),
-  'template_code' => env('TEMPLATE_CODE','default'),
-  'admin_route' => env('ADMIN_ROUTE','admin'),
+  'template_code' => env('TEMPLATE_CODE', 'default'),
+  'admin_route' => env('ADMIN_ROUTE', 'admin'),
   'user_data_route' => env('USER_DATA_ROUTE', 'user_data'),
   'public_path' => '/html',
   'public_path_realdir' => '%ROOT_DIR%/html',

src/Eccube/Resource/config/log.php

Indentation +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php return [
-  'log' => 
-  [
+    'log' => 
+    [
     'suffix' => null,
     'filename' => 'site',
     'delimiter' => '_',
@@ -13,8 +13,8 @@ 
     'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
     'channel' => 
     [
-      'monolog' => 
-      [
+        'monolog' => 
+        [
         'name' => 'eccube',
         'filename' => 'site',
         'delimiter' => '_',
@@ -25,9 +25,9 @@ 
         'max_files' => 90,
         'log_dateformat' => 'Y-m-d H:i:s,u',
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
-      ],
-      'front' => 
-      [
+        ],
+        'front' => 
+        [
         'name' => 'front',
         'filename' => 'front_site',
         'delimiter' => '_',
@@ -38,9 +38,9 @@ 
         'max_files' => 90,
         'log_dateformat' => 'Y-m-d H:i:s,u',
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
-      ],
-      'admin' => 
-      [
+        ],
+        'admin' => 
+        [
         'name' => 'admin',
         'filename' => 'admin_site',
         'delimiter' => '_',
@@ -51,12 +51,12 @@ 
         'max_files' => 90,
         'log_dateformat' => 'Y-m-d H:i:s,u',
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
-      ],
+        ],
     ],
     'exclude_keys' => 
     [
-      'password',
-      'app',
+        'password',
+        'app',
+    ],
     ],
-  ],
 ];

src/Eccube/Resource/config/doctrine_cache.php

Indentation +25 added lines, -25 removed lines

@@ -1,39 +1,39 @@
 <?php return [
-  'doctrine_cache' => 
-  [
+    'doctrine_cache' => 
+    [
     'metadata_cache' => 
     [
-      'driver' => 'array',
-      'path' => null,
-      'host' => null,
-      'port' => null,
-      'password' => null,
+        'driver' => 'array',
+        'path' => null,
+        'host' => null,
+        'port' => null,
+        'password' => null,
     ],
     'query_cache' => 
     [
-      'driver' => 'array',
-      'path' => null,
-      'host' => null,
-      'port' => null,
-      'password' => null,
+        'driver' => 'array',
+        'path' => null,
+        'host' => null,
+        'port' => null,
+        'password' => null,
     ],
     'result_cache' => 
     [
-      'driver' => 'array',
-      'path' => null,
-      'host' => null,
-      'port' => null,
-      'password' => null,
-      'lifetime' => 3600,
-      'clear_cache' => true,
+        'driver' => 'array',
+        'path' => null,
+        'host' => null,
+        'port' => null,
+        'password' => null,
+        'lifetime' => 3600,
+        'clear_cache' => true,
     ],
     'hydration_cache' => 
     [
-      'driver' => 'array',
-      'path' => null,
-      'host' => null,
-      'port' => null,
-      'password' => null,
+        'driver' => 'array',
+        'path' => null,
+        'host' => null,
+        'port' => null,
+        'password' => null,
+    ],
     ],
-  ],
 ];

install.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     apc_clear_cache();
 }
 
-require __DIR__ . '/autoload.php';
+require __DIR__.'/autoload.php';
 
 set_time_limit(0);
 ini_set('memory_limit', -1);