Completed
Push — fix3975 ( 21358b )
by NOBU
05:17
created
src/Eccube/Service/PluginService.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,8 +25,8 @@
 block discarded – undo
25 25
 use Eccube\Util\CacheUtil;
26 26
 use Eccube\Util\StringUtil;
27 27
 use Symfony\Component\DependencyInjection\ContainerInterface;
28
-use Symfony\Component\Finder\Finder;
29 28
 use Symfony\Component\Filesystem\Filesystem;
29
+use Symfony\Component\Finder\Finder;
30 30
 
31 31
 class PluginService
32 32
 {
Please login to merge, or discard this patch.
src/Eccube/Service/SchemaService.php 2 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,7 +47,6 @@  discard block
 block discarded – undo
47 47
      * @param callable $callback Metadata を生成した後に実行されるコールバック関数
48 48
      * @param array $generatedFiles Proxy ファイルパスの配列
49 49
      * @param string $proxiesDirectory Proxy ファイルを格納したディレクトリ
50
-     * @param bool $saveMode UpdateSchema を即時実行する場合 true
51 50
      * @param string $outputDir Metadata の出力先ディレクトリ
52 51
      */
53 52
     public function executeCallback(callable $callback, $generatedFiles, $proxiesDirectory, $outputDir = null)
@@ -110,7 +109,7 @@  discard block
 block discarded – undo
110 109
     /**
111 110
      * ネームスペースに含まれるEntityのテーブルを削除する
112 111
      *
113
-     * @param $targetNamespace string 削除対象のネームスペース
112
+     * @param string $targetNamespace string 削除対象のネームスペース
114 113
      */
115 114
     public function dropTable($targetNamespace)
116 115
     {
Please login to merge, or discard this patch.
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,8 +18,8 @@
 block discarded – undo
18 18
 use Doctrine\ORM\Tools\SchemaTool;
19 19
 use Eccube\Doctrine\ORM\Mapping\Driver\ReloadSafeAnnotationDriver;
20 20
 use Eccube\Util\StringUtil;
21
-use Symfony\Component\Finder\Finder;
22 21
 use Symfony\Component\Filesystem\Filesystem;
22
+use Symfony\Component\Finder\Finder;
23 23
 
24 24
 class SchemaService
25 25
 {
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
@@ -355,7 +355,7 @@
 block discarded – undo
355 355
      *
356 356
      * @param null $currency
357 357
      *
358
-     * @return bool|string
358
+     * @return string|null
359 359
      */
360 360
     public function getCurrencySymbol($currency = null)
361 361
     {
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/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/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/Service/OrderPdfService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -559,7 +559,7 @@
 block discarded – undo
559 559
             $arrOrder[$i][2] = '';
560 560
             $arrOrder[$i][3] = '';
561 561
 
562
-            foreach($Order->getTaxFreeDiscountItems() as $Item) {
562
+            foreach ($Order->getTaxFreeDiscountItems() as $Item) {
563 563
                 ++$i;
564 564
                 $arrOrder[$i][0] = '';
565 565
                 $arrOrder[$i][1] = '';
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.