Completed
Pull Request — 4.0 (#3836)
by Ryo
06:28
created
src/Eccube/Controller/Admin/Product/CsvImportController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -211,7 +211,7 @@
 block discarded – undo
211 211
                             }
212 212
 
213 213
                             if (isset($row[$headerByKey['product_del_flg']])) {
214
-                                if (StringUtil::isNotBlank($row[$headerByKey['product_del_flg']]) && $row[$headerByKey['product_del_flg']] == (string)Constant::ENABLED) {
214
+                                if (StringUtil::isNotBlank($row[$headerByKey['product_del_flg']]) && $row[$headerByKey['product_del_flg']] == (string) Constant::ENABLED) {
215 215
                                     // 商品を物理削除
216 216
                                     $deleteImages[] = $Product->getProductImage();
217 217
 
Please login to merge, or discard this patch.
src/Eccube/DependencyInjection/EccubeExtension.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -64,12 +64,12 @@
 block discarded – undo
64 64
 
65 65
         // SSL強制時は, httpsのみにアクセス制限する
66 66
         $accessControl = [
67
-          [ 'path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY' ],
68
-          [ 'path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN' ],
69
-          [ 'path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY' ],
70
-          [ 'path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY' ],
71
-          [ 'path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY' ],
72
-          [ 'path' => '^/mypage/', 'roles' => 'ROLE_USER' ],
67
+          ['path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
68
+          ['path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN'],
69
+          ['path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
70
+          ['path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
71
+          ['path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY'],
72
+          ['path' => '^/mypage/', 'roles' => 'ROLE_USER'],
73 73
         ];
74 74
         if ($forceSSL) {
75 75
             foreach ($accessControl as &$control) {
Please login to merge, or discard this patch.