Completed
Pull Request — 4.0 (#4616)
by Hideki
04:49
created
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/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/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/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/Entity/Order.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1761,7 +1761,7 @@
 block discarded – undo
1761 1761
         /**
1762 1762
          * Set orderStatus.
1763 1763
          *
1764
-         * @param \Eccube\Entity\Master\OrderStatus|object|null $orderStatus
1764
+         * @param null|Master\OrderStatus $orderStatus
1765 1765
          *
1766 1766
          * @return Order
1767 1767
          */
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/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.
codeception/acceptance/EA10PluginCest.php 1 patch
Doc Comments   +12 added lines patch added patch discarded remove patch
@@ -436,6 +436,9 @@  discard block
 block discarded – undo
436 436
         $fs->remove($dir);
437 437
     }
438 438
 
439
+    /**
440
+     * @param string $fileName
441
+     */
439 442
     private function publishPlugin($fileName)
440 443
     {
441 444
         copy(codecept_data_dir().'/'.'plugins/'.$fileName, codecept_root_dir().'/repos/'.$fileName);
@@ -581,6 +584,9 @@  discard block
 block discarded – undo
581 584
     /** @var Store_Plugin */
582 585
     protected $dependency;
583 586
 
587
+    /**
588
+     * @param string $code
589
+     */
584 590
     public function __construct(AcceptanceTester $I, $code, Store_Plugin $dependency = null)
585 591
     {
586 592
         parent::__construct($I);
@@ -713,6 +719,9 @@  discard block
 block discarded – undo
713 719
         return $this;
714 720
     }
715 721
 
722
+    /**
723
+     * @param string $fileName
724
+     */
716 725
     protected function publishPlugin($fileName)
717 726
     {
718 727
         $published = copy(codecept_data_dir().'/'.'plugins/'.$fileName, codecept_root_dir().'/repos/'.$fileName);
@@ -731,6 +740,9 @@  discard block
 block discarded – undo
731 740
     /** @var string */
732 741
     private $code;
733 742
 
743
+    /**
744
+     * @param string $code
745
+     */
734 746
     public function __construct(AcceptanceTester $I, $code)
735 747
     {
736 748
         parent::__construct($I);
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ProductType.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -194,7 +194,7 @@
 block discarded – undo
194 194
     /**
195 195
      * 指定された複数ディレクトリのうち、いずれかのディレクトリ以下にファイルが存在するかを確認。
196 196
      *
197
-     * @param $form FormInterface
197
+     * @param FormInterface $form FormInterface
198 198
      * @param $dirs array
199 199
      */
200 200
     private function validateFilePath($form, $dirs)
Please login to merge, or discard this patch.
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@
 block discarded – undo
24 24
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
25 25
 use Symfony\Component\Form\Extension\Core\Type\FileType;
26 26
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
27
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
28 27
 use Symfony\Component\Form\Extension\Core\Type\TextType;
28
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
29 29
 use Symfony\Component\Form\FormBuilderInterface;
30 30
 use Symfony\Component\Form\FormError;
31 31
 use Symfony\Component\Form\FormEvent;
Please login to merge, or discard this patch.