EC-CUBE / ec-cube

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,
+    ],
     ],
-  ],
 ];

src/Eccube/Application.php

Indentation +7 added lines, -7 removed lines

@@ -660,13 +660,13 @@
         $pluginConfigs = PluginConfigManager::getPluginConfigAll($this['debug']);
         $ormMappings = array();
         $ormMappings[] = array(
-             'type' => 'annotation',
-             'namespace' => 'Eccube\Entity',
-             'path' => array(
-                 __DIR__.'/Entity'
-             ),
-             'use_simple_annotation_reader' => false,
-         );
+                'type' => 'annotation',
+                'namespace' => 'Eccube\Entity',
+                'path' => array(
+                    __DIR__.'/Entity'
+                ),
+                'use_simple_annotation_reader' => false,
+            );
 
         if (isset($this['config']['vendor_dir']) && file_exists($this['config']['vendor_dir'].'/Entity')) {
 

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('ECCUBE_ROOT_URLPATH', null),
-  'template_code' => env('ECCUBE_TEMPLATE_CODE','default'),
-  'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'),
-  'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'),
-  'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/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' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/admin',
-  'front_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/default',
-  'image_save_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/save_image',
-  'image_temp_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/temp_image',
-  'user_data_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/user_data',
-  'plugin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/plugin',
+    'root_dir' => '%ROOT_DIR%',
+    'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null),
+    'template_code' => env('ECCUBE_TEMPLATE_CODE','default'),
+    'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'),
+    'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'),
+    'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/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' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/admin',
+    'front_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/default',
+    'image_save_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/save_image',
+    'image_temp_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/temp_image',
+    'user_data_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/user_data',
+    'plugin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/plugin',
 ];

src/Eccube/Resource/config/session_handler.php

Indentation +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php return [
-  'session_handler' =>
-  [
+    'session_handler' =>
+    [
     // PHP/PHP拡張のセッションハンドラを利用する場合, trueに設定します。
     'enabled' => false,
 
@@ -15,5 +15,5 @@ 
     // redisの設定例
     //'save_handler' => 'redis',
     //'save_path' => '127.0.0.1:6379',
-  ],
+    ],
 ];

src/Eccube/Repository/NewsRepository.php

Indentation +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
      */
     public function delete($News)
     {
-       $this->createQueryBuilder('n')
+        $this->createQueryBuilder('n')
             ->update()
             ->set('n.sort_no', 'n.sort_no - 1')
             ->where('n.sort_no > :sort_no')

src/Eccube/Controller/Admin/Product/CsvImportController.php

Indentation +5 added lines, -5 removed lines

@@ -1206,11 +1206,11 @@
     }
     
         /**
-     * ProductCategory作成
-     * @param \Eccube\Entity\Product $Product
-     * @param \Eccube\Entity\Category $Category
-     * @return ProductCategory
-     */
+         * ProductCategory作成
+         * @param \Eccube\Entity\Product $Product
+         * @param \Eccube\Entity\Category $Category
+         * @return ProductCategory
+         */
     private function makeProductCategory($Product, $Category, $sortNo)
     {
         $ProductCategory = new ProductCategory();