Failed Conditions
Pull Request — experimental/3.1 (#2534)
by chihiro
09:59
created
src/Eccube/Controller/Admin/Store/TemplateController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -187,7 +187,7 @@
 block discarded – undo
187 187
         // ダウンロード完了後にファイルを削除する.
188 188
         // http://stackoverflow.com/questions/15238897/removing-file-after-delivering-response-with-silex-symfony
189 189
         $app->finish(
190
-            function (Request $request, Response $response, \Silex\Application $app) use (
190
+            function(Request $request, Response $response, \Silex\Application $app) use (
191 191
                 $tmpDir,
192 192
                 $tarFile,
193 193
                 $tarGzFile
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Store/PluginController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -690,7 +690,7 @@
 block discarded – undo
690 690
             [
691 691
                 'label' => '認証キー',
692 692
                 'constraints' => [
693
-                    new Assert\Regex(['pattern' => "/^[0-9a-zA-Z]+$/",]),
693
+                    new Assert\Regex(['pattern' => "/^[0-9a-zA-Z]+$/", ]),
694 694
                 ],
695 695
             ]
696 696
         );
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/SecurityController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
                     } else {
101 101
                         // httpから変更されたらfalseのまま
102 102
                         $config['force_ssl'] = Constant::DISABLED;
103
-                        $data['force_ssl'] = (bool)Constant::DISABLED;
103
+                        $data['force_ssl'] = (bool) Constant::DISABLED;
104 104
                     }
105 105
                 } else {
106 106
                     $config['force_ssl'] = Constant::DISABLED;
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
             if (count($allowHost) > 0) {
162 162
                 $form->get('admin_allow_host')->setData(Str::convertLineFeed(implode("\n", $allowHost)));
163 163
             }
164
-            $form->get('force_ssl')->setData((bool)$this->appConfig['force_ssl']);
164
+            $form->get('force_ssl')->setData((bool) $this->appConfig['force_ssl']);
165 165
         }
166 166
 
167 167
         return [
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/MasterdataController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -174,7 +174,7 @@
 block discarded – undo
174 174
                 $entity = new $entityName();
175 175
                 $rank = 0;
176 176
                 $ids = array_map(
177
-                    function ($v) {
177
+                    function($v) {
178 178
                         return $v['id'];
179 179
                     },
180 180
                     $data['data']
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Shopping/ShippingType.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
         // 配送業者のプルダウンを生成
76 76
         $builder->addEventListener(
77 77
             FormEvents::PRE_SET_DATA,
78
-            function (FormEvent $event) {
78
+            function(FormEvent $event) {
79 79
                 /* @var Shipping $Shipping */
80 80
                 $Shipping = $event->getData();
81 81
                 if (is_null($Shipping) || !$Shipping->getId()) {
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
         // お届け日のプルダウンを生成
118 118
         $builder->addEventListener(
119 119
             FormEvents::PRE_SET_DATA,
120
-            function (FormEvent $event) {
120
+            function(FormEvent $event) {
121 121
                 $Shipping = $event->getData();
122 122
                 if (is_null($Shipping) || !$Shipping->getId()) {
123 123
                     return;
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 
156 156
                 // 配送日数が設定されている
157 157
                 if ($deliveryDateFlag) {
158
-                    $period = new \DatePeriod (
158
+                    $period = new \DatePeriod(
159 159
                         new \DateTime($minDate.' day'),
160 160
                         new \DateInterval('P1D'),
161 161
                         new \DateTime($minDate + $this->appConfig['deliv_date_end_max'].' day')
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
         // お届け時間のプルダウンを生成
184 184
         $builder->addEventListener(
185 185
             FormEvents::PRE_SET_DATA,
186
-            function (FormEvent $event) {
186
+            function(FormEvent $event) {
187 187
                 $Shipping = $event->getData();
188 188
                 if (is_null($Shipping) || !$Shipping->getId()) {
189 189
                     return;
Please login to merge, or discard this patch.
src/Eccube/Form/Type/PriceType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
         $max = $this->appConfig['price_max'];
57 57
         $min = -$max;
58 58
 
59
-        $constraints = function (Options $options) use ($max, $min){
59
+        $constraints = function(Options $options) use ($max, $min){
60 60
             $constraints = [];
61 61
 
62 62
             // requiredがtrueに指定されている場合, NotBlankを追加
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/SecurityType.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,8 +77,8 @@
 block discarded – undo
77 77
                     new Assert\NotBlank(),
78 78
                     new Assert\Length(array('max' => $this->appConfig['stext_len'])),
79 79
                     new Assert\Regex(array(
80
-                       'pattern' => "/^[0-9a-zA-Z]+$/",
81
-                   )),
80
+                        'pattern' => "/^[0-9a-zA-Z]+$/",
81
+                    )),
82 82
                 ),
83 83
             ))
84 84
             ->add('admin_allow_host', TextareaType::class, array(
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -92,19 +92,19 @@
 block discarded – undo
92 92
                 'label' => 'SSLを強制',
93 93
                 'required' => false,
94 94
             ))
95
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use($app) {
95
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) use($app) {
96 96
                 $form = $event->getForm();
97 97
                 $data = $form->getData();
98 98
 
99 99
                 $ips = preg_split("/\R/", $data['admin_allow_host'], null, PREG_SPLIT_NO_EMPTY);
100 100
 
101
-                foreach($ips as $ip) {
101
+                foreach ($ips as $ip) {
102 102
                     $errors = $this->recursiveValidator->validate($ip, array(
103 103
                             new Assert\Ip(),
104 104
                         )
105 105
                     );
106 106
                     if ($errors->count() != 0) {
107
-                        $form['admin_allow_host']->addError(new FormError($ip . 'はIPv4アドレスではありません。'));
107
+                        $form['admin_allow_host']->addError(new FormError($ip.'はIPv4アドレスではありません。'));
108 108
                     }
109 109
                 }
110 110
             })
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/CsvImportType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,8 +67,8 @@
 block discarded – undo
67 67
                 'constraints' => array(
68 68
                     new Assert\NotBlank(array('message' => 'ファイルを選択してください。')),
69 69
                     new Assert\File(array(
70
-                        'maxSize' => $this->appConfig['csv_size'] . 'M',
71
-                        'maxSizeMessage' => 'CSVファイルは' . $this->appConfig['csv_size'] . 'M以下でアップロードしてください。',
70
+                        'maxSize' => $this->appConfig['csv_size'].'M',
71
+                        'maxSizeMessage' => 'CSVファイルは'.$this->appConfig['csv_size'].'M以下でアップロードしてください。',
72 72
                     )),
73 73
                 ),
74 74
             ));
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Install/Step3Type.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -166,19 +166,19 @@
 block discarded – undo
166 166
                 'help' => 'メーラーバックエンドがSMTPかつSMTP-AUTH使用時のみ指定',
167 167
                 'required' => false,
168 168
             ))
169
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
169
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
170 170
                 $form = $event->getForm();
171 171
                 $data = $form->getData();
172 172
 
173 173
                 $ips = preg_split("/\R/", $data['admin_allow_hosts'], null, PREG_SPLIT_NO_EMPTY);
174 174
 
175
-                foreach($ips as $ip) {
175
+                foreach ($ips as $ip) {
176 176
                     $errors = $this->validator->validate($ip, array(
177 177
                             new Assert\Ip(),
178 178
                         )
179 179
                     );
180 180
                     if ($errors->count() != 0) {
181
-                        $form['admin_allow_hosts']->addError(new FormError($ip . 'はIPv4アドレスではありません。'));
181
+                        $form['admin_allow_hosts']->addError(new FormError($ip.'はIPv4アドレスではありません。'));
182 182
                     }
183 183
                 }
184 184
             })
Please login to merge, or discard this patch.