Failed Conditions
Pull Request — experimental/3.1 (#2641)
by Kiyotaka
105:29 queued 74:48
created
src/Eccube/Controller/Admin/AdminController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -122,12 +122,12 @@  discard block
 block discarded – undo
122 122
     {
123 123
         // install.phpのチェック.
124 124
         if (isset($this->appConfig['eccube_install']) && $this->appConfig['eccube_install'] == 1) {
125
-            $file = $this->appConfig['root_dir'] . '/html/install.php';
125
+            $file = $this->appConfig['root_dir'].'/html/install.php';
126 126
             if (file_exists($file)) {
127 127
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'html/install.php'));
128 128
                 $app->addWarning($message, 'admin');
129 129
             }
130
-            $fileOnRoot = $this->appConfig['root_dir'] . '/install.php';
130
+            $fileOnRoot = $this->appConfig['root_dir'].'/install.php';
131 131
             if (file_exists($fileOnRoot)) {
132 132
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'install.php'));
133 133
                 $app->addWarning($message, 'admin');
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
                     t1.status
376 376
                 ORDER BY
377 377
                     t1.status';
378
-        $rsm = new ResultSetMapping();;
378
+        $rsm = new ResultSetMapping(); ;
379 379
         $rsm->addScalarResult('status', 'status');
380 380
         $rsm->addScalarResult('count', 'count');
381 381
         $query = $em->createNativeQuery($sql, $rsm);
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Customer/CustomerController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
         $em->getConfiguration()->setSQLLogger(null);
328 328
 
329 329
         $response = new StreamedResponse();
330
-        $response->setCallback(function () use ($app, $request) {
330
+        $response->setCallback(function() use ($app, $request) {
331 331
 
332 332
             // CSV種別を元に初期化.
333 333
             $this->csvExportService->initCsvType(CsvType::CSV_TYPE_CUSTOMER);
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
 
342 342
             // データ行の出力.
343 343
             $this->csvExportService->setExportQueryBuilder($qb);
344
-            $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) {
344
+            $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) {
345 345
 
346 346
                 $Csvs = $csvService->getCsvs();
347 347
 
@@ -376,9 +376,9 @@  discard block
 block discarded – undo
376 376
         });
377 377
 
378 378
         $now = new \DateTime();
379
-        $filename = 'customer_' . $now->format('YmdHis') . '.csv';
379
+        $filename = 'customer_'.$now->format('YmdHis').'.csv';
380 380
         $response->headers->set('Content-Type', 'application/octet-stream');
381
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
381
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
382 382
 
383 383
         $response->send();
384 384
 
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/CategoryController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
         $em->getConfiguration()->setSQLLogger(null);
273 273
 
274 274
         $response = new StreamedResponse();
275
-        $response->setCallback(function () use ($app, $request) {
275
+        $response->setCallback(function() use ($app, $request) {
276 276
 
277 277
             // CSV種別を元に初期化.
278 278
             $this->csvExportService->initCsvType(CsvType::CSV_TYPE_CATEGORY);
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 
287 287
             // データ行の出力.
288 288
             $this->csvExportService->setExportQueryBuilder($qb);
289
-            $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) {
289
+            $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) {
290 290
 
291 291
                 $Csvs = $csvService->getCsvs();
292 292
 
@@ -319,9 +319,9 @@  discard block
 block discarded – undo
319 319
         });
320 320
 
321 321
         $now = new \DateTime();
322
-        $filename = 'category_' . $now->format('YmdHis') . '.csv';
322
+        $filename = 'category_'.$now->format('YmdHis').'.csv';
323 323
         $response->headers->set('Content-Type', 'application/octet-stream');
324
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
324
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
325 325
         $response->send();
326 326
 
327 327
         log_info('カテゴリCSV出力ファイル名', array($filename));
Please login to merge, or discard this patch.
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/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/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.