Completed
Pull Request — 4.0 (#4605)
by Ryo
04:41
created
src/Eccube/Controller/Admin/Content/FileController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -284,7 +284,7 @@
 block discarded – undo
284 284
             $filename = $this->convertStrToServer($file->getClientOriginalName());
285 285
             try {
286 286
                 $file->move($nowDir, $filename);
287
-                $successCount ++;
287
+                $successCount++;
288 288
             } catch (FileException $e) {
289 289
                 $this->errors[] = ['message' => trans('admin.content.file.upload_error', [
290 290
                     '%file_name%' => $filename,
Please login to merge, or discard this patch.
codeception/acceptance/EA07BasicinfoCest.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,6 +11,7 @@  discard block
 block discarded – undo
11 11
  * file that was distributed with this source code.
12 12
  */
13 13
 
14
+use Codeception\Util\Fixtures;
14 15
 use Page\Admin\CsvSettingsPage;
15 16
 use Page\Admin\DeliveryEditPage;
16 17
 use Page\Admin\DeliveryManagePage;
@@ -19,7 +20,6 @@  discard block
 block discarded – undo
19 20
 use Page\Admin\PaymentManagePage;
20 21
 use Page\Admin\ShopSettingPage;
21 22
 use Page\Admin\TaxManagePage;
22
-use Codeception\Util\Fixtures;
23 23
 
24 24
 /**
25 25
  * @group admin
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Order/EditController.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,6 @@
 block discarded – undo
14 14
 namespace Eccube\Controller\Admin\Order;
15 15
 
16 16
 use Doctrine\Common\Collections\ArrayCollection;
17
-use Doctrine\Common\Collections\Criteria;
18 17
 use Eccube\Controller\AbstractController;
19 18
 use Eccube\Entity\Master\CustomerStatus;
20 19
 use Eccube\Entity\Master\OrderItemType;
Please login to merge, or discard this patch.
src/Eccube/Service/OrderPdfService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -557,7 +557,7 @@
 block discarded – undo
557 557
             $arrOrder[$i][2] = '';
558 558
             $arrOrder[$i][3] = '';
559 559
 
560
-            foreach($Order->getTaxFreeDiscountItems() as $Item) {
560
+            foreach ($Order->getTaxFreeDiscountItems() as $Item) {
561 561
                 ++$i;
562 562
                 $arrOrder[$i][0] = '';
563 563
                 $arrOrder[$i][1] = '';
Please login to merge, or discard this patch.
src/Eccube/Util/CacheUtil.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,6 @@
 block discarded – undo
111 111
     /**
112 112
      * Doctrineのキャッシュを削除します.
113 113
      *
114
-     * @param null $env
115 114
      *
116 115
      * @return string
117 116
      *
Please login to merge, or discard this patch.
src/Eccube/Repository/PageRepository.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@
 block discarded – undo
132 132
      * @param  string                            $where 追加の検索条件
133 133
      * @param  string[]                          $parameters 追加の検索パラメーター
134 134
      *
135
-     * @return array                             ページ属性の配列
135
+     * @return null|\Symfony\Component\HttpFoundation\Request                             ページ属性の配列
136 136
      */
137 137
     public function getPageList($where = null, $parameters = [])
138 138
     {
Please login to merge, or discard this patch.
src/Eccube/Controller/ShoppingController.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,8 +33,8 @@
 block discarded – undo
33 33
 use Eccube\Service\PurchaseFlow\PurchaseFlow;
34 34
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
35 35
 use Symfony\Component\Form\FormInterface;
36
-use Symfony\Component\HttpFoundation\Response;
37 36
 use Symfony\Component\HttpFoundation\Request;
37
+use Symfony\Component\HttpFoundation\Response;
38 38
 use Symfony\Component\Routing\Annotation\Route;
39 39
 use Symfony\Component\Routing\RouterInterface;
40 40
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
Please login to merge, or discard this patch.
src/Eccube/Controller/EntryController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -251,7 +251,7 @@
 block discarded – undo
251 251
             ]
252 252
         );
253 253
 
254
-        if(!is_null($qtyInCart)) {
254
+        if (!is_null($qtyInCart)) {
255 255
 
256 256
             return [
257 257
                 'qtyInCart' => $qtyInCart,
Please login to merge, or discard this patch.
src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -126,14 +126,14 @@
 block discarded – undo
126 126
                     setcookie($this->sessionName, '', 0, ini_get('session.cookie_path'), ini_get('session.cookie_domain'), filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN), filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN));
127 127
                 } else {
128 128
                     setcookie($this->sessionName, '',
129
-                              [
130
-                                  'expires' => 0,
131
-                                  'path' => $this->getCookiePath(),
132
-                                  'domain' => ini_get('session.cookie_domain'),
133
-                                  'secure' => filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN),
134
-                                  'httponly' => filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN),
135
-                                  'samesite' => $this->getCookieSameSite(),
136
-                              ]
129
+                                [
130
+                                    'expires' => 0,
131
+                                    'path' => $this->getCookiePath(),
132
+                                    'domain' => ini_get('session.cookie_domain'),
133
+                                    'secure' => filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN),
134
+                                    'httponly' => filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN),
135
+                                    'samesite' => $this->getCookieSameSite(),
136
+                                ]
137 137
                     );
138 138
                 }
139 139
             }
Please login to merge, or discard this patch.