Completed
Push — return-of-the-e2e ( b36159...b86876 )
by Kiyotaka
04:33
created
src/Eccube/Command/UpdateSchemaDoctrineCommand.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -112,6 +112,9 @@
 block discarded – undo
112 112
         }
113 113
     }
114 114
 
115
+    /**
116
+     * @param string $outputDir
117
+     */
115 118
     protected function removeOutputDir($outputDir)
116 119
     {
117 120
         if (file_exists($outputDir)) {
Please login to merge, or discard this patch.
src/Eccube/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -19,6 +19,9 @@
 block discarded – undo
19 19
 {
20 20
     protected $trait_proxies_directory;
21 21
 
22
+    /**
23
+     * @param string $dir
24
+     */
22 25
     public function setTraitProxiesDirectory($dir)
23 26
     {
24 27
         $this->trait_proxies_directory = $dir;
Please login to merge, or discard this patch.
src/Eccube/Service/SchemaService.php 1 patch
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,7 +45,6 @@  discard block
 block discarded – undo
45 45
      * @param callable $callback Metadata を生成した後に実行されるコールバック関数
46 46
      * @param array $generatedFiles Proxy ファイルパスの配列
47 47
      * @param string $proxiesDirectory Proxy ファイルを格納したディレクトリ
48
-     * @param bool $saveMode UpdateSchema を即時実行する場合 true
49 48
      * @param string $outputDir Metadata の出力先ディレクトリ
50 49
      */
51 50
     public function executeCallback(callable $callback, $generatedFiles, $proxiesDirectory, $outputDir = null)
@@ -107,7 +106,7 @@  discard block
 block discarded – undo
107 106
     /**
108 107
      * ネームスペースに含まれるEntityのテーブルを削除する
109 108
      *
110
-     * @param $targetNamespace string 削除対象のネームスペース
109
+     * @param string $targetNamespace string 削除対象のネームスペース
111 110
      */
112 111
     public function dropTable($targetNamespace)
113 112
     {
Please login to merge, or discard this patch.
src/Eccube/Twig/Extension/EccubeExtension.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -347,7 +347,7 @@
 block discarded – undo
347 347
      *
348 348
      * @param null $currency
349 349
      *
350
-     * @return bool|string
350
+     * @return string|null
351 351
      */
352 352
     public function getCurrencySymbol($currency = null)
353 353
     {
Please login to merge, or discard this patch.
src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@
 block discarded – undo
83 83
                 } elseif ($item->isProduct()) {
84 84
                     // ポイント = 単価 * ポイント付与率 * 数量
85 85
                     $point = round($item->getPrice() * ($pointRate / 100)) * $item->getQuantity();
86
-                } elseif($item->isDiscount()) {
86
+                } elseif ($item->isDiscount()) {
87 87
                     $point = round($item->getPrice() * ($pointRate / 100)) * $item->getQuantity();
88 88
                 }
89 89
 
Please login to merge, or discard this patch.
src/Eccube/DependencyInjection/EccubeExtension.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -64,12 +64,12 @@  discard block
 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) {
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 
80 80
         // security.ymlでは制御できないため, ここで定義する.
81 81
         $container->prependExtensionConfig('security', [
82
-          'access_control' => $accessControl,
82
+            'access_control' => $accessControl,
83 83
         ]);
84 84
     }
85 85
 
Please login to merge, or discard this patch.
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.
src/Eccube/Service/PurchaseFlow/PurchaseFlow.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -391,7 +391,7 @@
 block discarded – undo
391 391
             'DiscountProcessor' => $this->discountProcessors->map($callback)->toArray(),
392 392
             'ItemHolderPostValidator' => $this->itemHolderPostValidators->map($callback)->toArray()
393 393
         ];
394
-        $tree  = new \RecursiveTreeIterator(new \RecursiveArrayIterator($flows));
394
+        $tree = new \RecursiveTreeIterator(new \RecursiveArrayIterator($flows));
395 395
         $tree->setPrefixPart(\RecursiveTreeIterator::PREFIX_RIGHT, ' ');
396 396
         $tree->setPrefixPart(\RecursiveTreeIterator::PREFIX_MID_LAST, ' ');
397 397
         $tree->setPrefixPart(\RecursiveTreeIterator::PREFIX_MID_HAS_NEXT, '│');
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/CsvImportController.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -855,7 +855,7 @@
 block discarded – undo
855 855
     protected function createProductImage($row, Product $Product, $data, $headerByKey)
856 856
     {
857 857
         if (!isset($row[$headerByKey['product_image']])) {
858
-             return;
858
+                return;
859 859
         }
860 860
         if (StringUtil::isNotBlank($row[$headerByKey['product_image']])) {
861 861
             // 画像の削除
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -291,7 +291,7 @@
 block discarded – undo
291 291
                                     $message = trans('admin.common.csv_invalid_description_detail_upper_limit', [
292 292
                                         '%line%' => $line,
293 293
                                         '%name%' => $headerByKey['description_detail'],
294
-                                        '%max%' => $this->eccubeConfig['eccube_ltext_len'],]);
294
+                                        '%max%' => $this->eccubeConfig['eccube_ltext_len'], ]);
295 295
                                     $this->addErrors($message);
296 296
 
297 297
                                     return $this->renderWithError($form, $headers);
Please login to merge, or discard this patch.