@@ -1,17 +1,17 @@ |
||
1 | 1 | <?php return [ |
2 | - 'auth_magic' => '${AUTH_MAGIC}', |
|
3 | - 'password_hash_algos' => 'sha256', |
|
4 | - 'shop_name' => '${SHOP_NAME}', |
|
5 | - 'force_ssl' => '${FORCE_SSL}', |
|
6 | - 'admin_allow_host' => NULL, |
|
7 | - 'cookie_lifetime' => 0, |
|
8 | - 'cookie_name' => 'eccube', |
|
9 | - 'locale' => 'ja', |
|
10 | - 'timezone' => 'Asia/Tokyo', |
|
11 | - 'currency' => 'JPY', |
|
12 | - 'pageinrange' => false, |
|
13 | - 'trusted_proxies_connection_only' => false, |
|
14 | - 'trusted_proxies' => |
|
15 | - [ |
|
16 | - ], |
|
2 | + 'auth_magic' => '${AUTH_MAGIC}', |
|
3 | + 'password_hash_algos' => 'sha256', |
|
4 | + 'shop_name' => '${SHOP_NAME}', |
|
5 | + 'force_ssl' => '${FORCE_SSL}', |
|
6 | + 'admin_allow_host' => NULL, |
|
7 | + 'cookie_lifetime' => 0, |
|
8 | + 'cookie_name' => 'eccube', |
|
9 | + 'locale' => 'ja', |
|
10 | + 'timezone' => 'Asia/Tokyo', |
|
11 | + 'currency' => 'JPY', |
|
12 | + 'pageinrange' => false, |
|
13 | + 'trusted_proxies_connection_only' => false, |
|
14 | + 'trusted_proxies' => |
|
15 | + [ |
|
16 | + ], |
|
17 | 17 | ]; |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php return [ |
2 | - 'database' => |
|
3 | - [ |
|
2 | + 'database' => |
|
3 | + [ |
|
4 | 4 | 'driver' => '${DBDRIVER}', |
5 | 5 | 'path' => '${DBPATH}', |
6 | - ], |
|
6 | + ], |
|
7 | 7 | ]; |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php return [ |
2 | - 'database' => |
|
3 | - [ |
|
2 | + 'database' => |
|
3 | + [ |
|
4 | 4 | 'driver' => '${DBDRIVER}', |
5 | 5 | 'host' => '${DBSERVER}', |
6 | 6 | 'dbname' => '${DBNAME}', |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | 'charset' => 'utf8', |
11 | 11 | 'defaultTableOptions' => |
12 | 12 | [ |
13 | - 'collate' => 'utf8_general_ci', |
|
13 | + 'collate' => 'utf8_general_ci', |
|
14 | + ], |
|
14 | 15 | ], |
15 | - ], |
|
16 | 16 | ]; |
@@ -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 | ]; |
@@ -1,38 +1,38 @@ |
||
1 | 1 | <?php return [ |
2 | - // duplicated |
|
3 | - 'root' => '${ROOT_URLPATH}/', |
|
4 | - 'admin_dir' => '${ADMIN_ROUTE}/', |
|
5 | - 'tpl' => '${ROOT_PUBLIC_URLPATH}/user_data/packages/default/', |
|
6 | - 'admin_tpl' => '${ROOT_PUBLIC_URLPATH}/user_data/packages/admin/', |
|
7 | - 'image_path' => '${ROOT_PUBLIC_URLPATH}/upload/save_image/', |
|
2 | + // duplicated |
|
3 | + 'root' => '${ROOT_URLPATH}/', |
|
4 | + 'admin_dir' => '${ADMIN_ROUTE}/', |
|
5 | + 'tpl' => '${ROOT_PUBLIC_URLPATH}/user_data/packages/default/', |
|
6 | + 'admin_tpl' => '${ROOT_PUBLIC_URLPATH}/user_data/packages/admin/', |
|
7 | + 'image_path' => '${ROOT_PUBLIC_URLPATH}/upload/save_image/', |
|
8 | 8 | |
9 | - 'root_dir' => '${ROOT_DIR}', |
|
10 | - 'root_urlpath' => '${ROOT_URLPATH}', |
|
11 | - 'template_code' => '${TEMPLATE_CODE}', |
|
12 | - 'admin_route' => '${ADMIN_ROUTE}', |
|
13 | - 'user_data_route' => '${USER_DATA_ROUTE}', |
|
14 | - 'public_path' => '/html', |
|
15 | - 'public_path_realdir' => '${ROOT_DIR}/html', |
|
16 | - 'image_save_realdir' => '${ROOT_DIR}/html/upload/save_image', |
|
17 | - 'image_temp_realdir' => '${ROOT_DIR}/html/upload/temp_image', |
|
18 | - 'user_data_realdir' => '${ROOT_DIR}/html/user_data', |
|
19 | - 'block_default_realdir' => '${ROOT_DIR}/src/Eccube/Resource/template/default/Block', |
|
20 | - 'block_realdir' => '${ROOT_DIR}/app/template/${TEMPLATE_CODE}/Block', |
|
21 | - 'template_default_realdir' => '${ROOT_DIR}/src/Eccube/Resource/template/default', |
|
22 | - 'template_default_html_realdir' => '${ROOT_DIR}/html/template/default', |
|
23 | - 'template_admin_realdir' => '${ROOT_DIR}/src/Eccube/Resource/template/admin', |
|
24 | - 'template_admin_html_realdir' => '${ROOT_DIR}/html/template/admin', |
|
25 | - 'template_realdir' => '${ROOT_DIR}/app/template/${TEMPLATE_CODE}', |
|
26 | - 'template_html_realdir' => '${ROOT_DIR}/html/template/${TEMPLATE_CODE}', |
|
27 | - 'template_temp_realdir' => '${ROOT_DIR}/app/cache/eccube/template', |
|
28 | - 'csv_temp_realdir' => '${ROOT_DIR}/app/cache/eccube/csv', |
|
29 | - 'plugin_realdir' => '${ROOT_DIR}/app/Plugin', |
|
30 | - 'plugin_temp_realdir' => '${ROOT_DIR}/app/cache/plugin', |
|
31 | - 'plugin_html_realdir' => '${ROOT_DIR}/html/plugin', |
|
32 | - 'admin_urlpath' => '${ROOT_PUBLIC_URLPATH}/template/admin', |
|
33 | - 'front_urlpath' => '${ROOT_PUBLIC_URLPATH}/template/${TEMPLATE_CODE}', |
|
34 | - 'image_save_urlpath' => '${ROOT_PUBLIC_URLPATH}/upload/save_image', |
|
35 | - 'image_temp_urlpath' => '${ROOT_PUBLIC_URLPATH}/upload/temp_image', |
|
36 | - 'user_data_urlpath' => '${ROOT_PUBLIC_URLPATH}/user_data', |
|
37 | - 'plugin_urlpath' => '${ROOT_PUBLIC_URLPATH}/plugin', |
|
9 | + 'root_dir' => '${ROOT_DIR}', |
|
10 | + 'root_urlpath' => '${ROOT_URLPATH}', |
|
11 | + 'template_code' => '${TEMPLATE_CODE}', |
|
12 | + 'admin_route' => '${ADMIN_ROUTE}', |
|
13 | + 'user_data_route' => '${USER_DATA_ROUTE}', |
|
14 | + 'public_path' => '/html', |
|
15 | + 'public_path_realdir' => '${ROOT_DIR}/html', |
|
16 | + 'image_save_realdir' => '${ROOT_DIR}/html/upload/save_image', |
|
17 | + 'image_temp_realdir' => '${ROOT_DIR}/html/upload/temp_image', |
|
18 | + 'user_data_realdir' => '${ROOT_DIR}/html/user_data', |
|
19 | + 'block_default_realdir' => '${ROOT_DIR}/src/Eccube/Resource/template/default/Block', |
|
20 | + 'block_realdir' => '${ROOT_DIR}/app/template/${TEMPLATE_CODE}/Block', |
|
21 | + 'template_default_realdir' => '${ROOT_DIR}/src/Eccube/Resource/template/default', |
|
22 | + 'template_default_html_realdir' => '${ROOT_DIR}/html/template/default', |
|
23 | + 'template_admin_realdir' => '${ROOT_DIR}/src/Eccube/Resource/template/admin', |
|
24 | + 'template_admin_html_realdir' => '${ROOT_DIR}/html/template/admin', |
|
25 | + 'template_realdir' => '${ROOT_DIR}/app/template/${TEMPLATE_CODE}', |
|
26 | + 'template_html_realdir' => '${ROOT_DIR}/html/template/${TEMPLATE_CODE}', |
|
27 | + 'template_temp_realdir' => '${ROOT_DIR}/app/cache/eccube/template', |
|
28 | + 'csv_temp_realdir' => '${ROOT_DIR}/app/cache/eccube/csv', |
|
29 | + 'plugin_realdir' => '${ROOT_DIR}/app/Plugin', |
|
30 | + 'plugin_temp_realdir' => '${ROOT_DIR}/app/cache/plugin', |
|
31 | + 'plugin_html_realdir' => '${ROOT_DIR}/html/plugin', |
|
32 | + 'admin_urlpath' => '${ROOT_PUBLIC_URLPATH}/template/admin', |
|
33 | + 'front_urlpath' => '${ROOT_PUBLIC_URLPATH}/template/${TEMPLATE_CODE}', |
|
34 | + 'image_save_urlpath' => '${ROOT_PUBLIC_URLPATH}/upload/save_image', |
|
35 | + 'image_temp_urlpath' => '${ROOT_PUBLIC_URLPATH}/upload/temp_image', |
|
36 | + 'user_data_urlpath' => '${ROOT_PUBLIC_URLPATH}/user_data', |
|
37 | + 'plugin_urlpath' => '${ROOT_PUBLIC_URLPATH}/plugin', |
|
38 | 38 | ]; |
@@ -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 | // memcachedの設定例 |
16 | 16 | //'save_handler' => 'redis', |
17 | 17 | //'save_path' => '127.0.0.1:6379', |
18 | - ], |
|
18 | + ], |
|
19 | 19 | ]; |
@@ -28,7 +28,6 @@ |
||
28 | 28 | use Eccube\Annotation\Component; |
29 | 29 | use Eccube\Annotation\Inject; |
30 | 30 | use Eccube\Application; |
31 | -use Eccube\Common\Constant; |
|
32 | 31 | use Eccube\Controller\AbstractController; |
33 | 32 | use Eccube\Entity\Delivery; |
34 | 33 | use Eccube\Event\EccubeEvents; |
@@ -28,14 +28,12 @@ |
||
28 | 28 | use Eccube\Annotation\Component; |
29 | 29 | use Eccube\Annotation\Inject; |
30 | 30 | use Eccube\Application; |
31 | -use Eccube\Common\Constant; |
|
32 | 31 | use Eccube\Controller\AbstractController; |
33 | 32 | use Eccube\Entity\Master\CustomerStatus; |
34 | 33 | use Eccube\Event\EccubeEvents; |
35 | 34 | use Eccube\Event\EventArgs; |
36 | 35 | use Eccube\Repository\Master\CustomerStatusRepository; |
37 | 36 | use Eccube\Service\MailService; |
38 | -use Eccube\Util\Str; |
|
39 | 37 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
40 | 38 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
41 | 39 | use Symfony\Component\EventDispatcher\EventDispatcher; |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use Doctrine\ORM\EntityManager; |
7 | 7 | use Eccube\Annotation\Inject; |
8 | 8 | use Eccube\Annotation\Service; |
9 | -use Eccube\Common\Constant; |
|
10 | 9 | use Eccube\Entity\CartItem; |
11 | 10 | use Eccube\Entity\Customer; |
12 | 11 | use Eccube\Entity\CustomerAddress; |