@@ -114,7 +114,7 @@ |
||
| 114 | 114 | */ |
| 115 | 115 | public function delete($News) |
| 116 | 116 | { |
| 117 | - $this->createQueryBuilder('n') |
|
| 117 | + $this->createQueryBuilder('n') |
|
| 118 | 118 | ->update() |
| 119 | 119 | ->set('n.rank', 'n.rank - 1') |
| 120 | 120 | ->where('n.rank > :rank') |
@@ -77,8 +77,8 @@ |
||
| 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( |
@@ -1,6 +1,6 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | ]; |
@@ -1,39 +1,39 @@ |
||
| 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 | ]; |
@@ -660,13 +660,13 @@ |
||
| 660 | 660 | $pluginConfigs = PluginConfigManager::getPluginConfigAll($this['debug']); |
| 661 | 661 | $ormMappings = array(); |
| 662 | 662 | $ormMappings[] = array( |
| 663 | - 'type' => 'annotation', |
|
| 664 | - 'namespace' => 'Eccube\Entity', |
|
| 665 | - 'path' => array( |
|
| 666 | - __DIR__.'/Entity' |
|
| 667 | - ), |
|
| 668 | - 'use_simple_annotation_reader' => false, |
|
| 669 | - ); |
|
| 663 | + 'type' => 'annotation', |
|
| 664 | + 'namespace' => 'Eccube\Entity', |
|
| 665 | + 'path' => array( |
|
| 666 | + __DIR__.'/Entity' |
|
| 667 | + ), |
|
| 668 | + 'use_simple_annotation_reader' => false, |
|
| 669 | + ); |
|
| 670 | 670 | |
| 671 | 671 | if (isset($this['config']['vendor_dir']) && file_exists($this['config']['vendor_dir'].'/Entity')) { |
| 672 | 672 | |
@@ -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,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php return [ |
| 2 | - 'session_handler' => |
|
| 3 | - [ |
|
| 2 | + 'session_handler' => |
|
| 3 | + [ |
|
| 4 | 4 | // PHP/PHP拡張のセッションハンドラを利用する場合, trueに設定します。 |
| 5 | 5 | 'enabled' => false, |
| 6 | 6 | |
@@ -15,5 +15,5 @@ discard block |
||
| 15 | 15 | // redisの設定例 |
| 16 | 16 | //'save_handler' => 'redis', |
| 17 | 17 | //'save_path' => '127.0.0.1:6379', |
| 18 | - ], |
|
| 18 | + ], |
|
| 19 | 19 | ]; |