Failed Conditions
Pull Request — master (#1440)
by k-yamamura
77:21 queued 70:56
created
src/Eccube/Controller/Admin/Content/PageController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 
90 90
                 // ファイル生成・更新
91 91
                 $templatePath = $app['eccube.repository.page_layout']->getWriteTemplatePath($editable);
92
-                $filePath = $templatePath . '/' . $PageLayout->getFileName() . '.twig';
92
+                $filePath = $templatePath.'/'.$PageLayout->getFileName().'.twig';
93 93
 
94 94
                 $fs = new Filesystem();
95 95
                 $fs->dumpFile($filePath, $form->get('tpl_data')->getData());
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
                 $app->addSuccess('admin.register.complete', 'admin');
98 98
 
99 99
                 // twig キャッシュの削除.
100
-                $finder = Finder::create()->in($app['config']['root_dir'] . '/app/cache/twig');
100
+                $finder = Finder::create()->in($app['config']['root_dir'].'/app/cache/twig');
101 101
                 $fs->remove($finder);
102 102
 
103 103
                 return $app->redirect($app->url('admin_content_page_edit', array('id' => $PageLayout->getId())));
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
         if ($PageLayout->getEditFlg() == PageLayout::EDIT_FLG_USER) {
137 137
             $templatePath = $app['eccube.repository.page_layout']
138 138
                 ->getWriteTemplatePath($DeviceType, true);
139
-            $file = $templatePath . '/' . $PageLayout->getFileName() . '.twig';
139
+            $file = $templatePath.'/'.$PageLayout->getFileName().'.twig';
140 140
             $fs = new Filesystem();
141 141
             if ($fs->exists($file)) {
142 142
                 $fs->remove($file);
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
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
         $em->getConfiguration()->setSQLLogger(null);
172 172
 
173 173
         $response = new StreamedResponse();
174
-        $response->setCallback(function () use ($app, $request) {
174
+        $response->setCallback(function() use ($app, $request) {
175 175
 
176 176
             // CSV種別を元に初期化.
177 177
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_CUSTOMER);
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 
186 186
             // データ行の出力.
187 187
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
188
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
188
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
189 189
 
190 190
                 $Csvs = $csvService->getCsvs();
191 191
 
@@ -207,9 +207,9 @@  discard block
 block discarded – undo
207 207
         });
208 208
 
209 209
         $now = new \DateTime();
210
-        $filename = 'customer_' . $now->format('YmdHis') . '.csv';
210
+        $filename = 'customer_'.$now->format('YmdHis').'.csv';
211 211
         $response->headers->set('Content-Type', 'application/octet-stream');
212
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
212
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
213 213
         $response->send();
214 214
 
215 215
         return $response;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Customer/CustomerEditController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
                     'id' => $Customer->getId(),
110 110
                 )));
111 111
             } else { 
112
-                $app->addError('admin.customer.save.failed','admin');
112
+                $app->addError('admin.customer.save.failed', 'admin');
113 113
             }
114 114
         }
115 115
 
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Order/MailController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -247,7 +247,7 @@
 block discarded – undo
247 247
             }
248 248
         } else {
249 249
             foreach ($_GET as $key => $value) {
250
-                $ids = str_replace('ids', '', $key) . ',' . $ids;
250
+                $ids = str_replace('ids', '', $key).','.$ids;
251 251
             }
252 252
             $ids = substr($ids, 0, -1);
253 253
         }
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Order/OrderController.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
         $em->getConfiguration()->setSQLLogger(null);
185 185
 
186 186
         $response = new StreamedResponse();
187
-        $response->setCallback(function () use ($app, $request) {
187
+        $response->setCallback(function() use ($app, $request) {
188 188
 
189 189
             // CSV種別を元に初期化.
190 190
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_ORDER);
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 
199 199
             // データ行の出力.
200 200
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
201
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
201
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
202 202
 
203 203
                 $Csvs = $csvService->getCsvs();
204 204
 
@@ -228,9 +228,9 @@  discard block
 block discarded – undo
228 228
         });
229 229
 
230 230
         $now = new \DateTime();
231
-        $filename = 'order_' . $now->format('YmdHis') . '.csv';
231
+        $filename = 'order_'.$now->format('YmdHis').'.csv';
232 232
         $response->headers->set('Content-Type', 'application/octet-stream');
233
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
233
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
234 234
         $response->send();
235 235
 
236 236
         return $response;
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
         $em->getConfiguration()->setSQLLogger(null);
254 254
 
255 255
         $response = new StreamedResponse();
256
-        $response->setCallback(function () use ($app, $request) {
256
+        $response->setCallback(function() use ($app, $request) {
257 257
 
258 258
             // CSV種別を元に初期化.
259 259
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_SHIPPING);
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 
268 268
             // データ行の出力.
269 269
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
270
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
270
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
271 271
 
272 272
                 $Csvs = $csvService->getCsvs();
273 273
 
@@ -305,9 +305,9 @@  discard block
 block discarded – undo
305 305
         });
306 306
 
307 307
         $now = new \DateTime();
308
-        $filename = 'shipping_' . $now->format('YmdHis') . '.csv';
308
+        $filename = 'shipping_'.$now->format('YmdHis').'.csv';
309 309
         $response->headers->set('Content-Type', 'application/octet-stream');
310
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
310
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
311 311
         $response->send();
312 312
 
313 313
         return $response;
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
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
         $em->getConfiguration()->setSQLLogger(null);
165 165
 
166 166
         $response = new StreamedResponse();
167
-        $response->setCallback(function () use ($app, $request) {
167
+        $response->setCallback(function() use ($app, $request) {
168 168
 
169 169
             // CSV種別を元に初期化.
170 170
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_CATEGORY);
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 
179 179
             // データ行の出力.
180 180
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
181
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
181
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
182 182
 
183 183
                 $Csvs = $csvService->getCsvs();
184 184
 
@@ -198,9 +198,9 @@  discard block
 block discarded – undo
198 198
         });
199 199
 
200 200
         $now = new \DateTime();
201
-        $filename = 'category_' . $now->format('YmdHis') . '.csv';
201
+        $filename = 'category_'.$now->format('YmdHis').'.csv';
202 202
         $response->headers->set('Content-Type', 'application/octet-stream');
203
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
203
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
204 204
         $response->send();
205 205
 
206 206
         return $response;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ClassCategoryController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
         $num = $app['eccube.repository.product_class']->createQueryBuilder('pc')
96 96
             ->select('count(pc.id)')
97 97
             ->where('pc.ClassCategory1 = :id OR pc.ClassCategory2 = :id')
98
-            ->setParameter('id',$id)
98
+            ->setParameter('id', $id)
99 99
             ->getQuery()
100 100
             ->getSingleScalarResult();
101 101
         if ($num > 0) {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductClassController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
                     $class2Valied = $this->isValiedCategory($ClassName2);
95 95
 
96 96
                     // 規格が選択されていないか、選択された状態で分類が保有されていれば、画面表示
97
-                    if($class1Valied && $class2Valied){
97
+                    if ($class1Valied && $class2Valied) {
98 98
                         $hasClassCategoryFlg = true;
99 99
                     }
100 100
 
@@ -582,7 +582,7 @@  discard block
 block discarded – undo
582 582
         // 個別消費税
583 583
         $BaseInfo = $app['eccube.repository.base_info']->get();
584 584
         if ($BaseInfo->getOptionProductTaxRule() == Constant::ENABLED) {
585
-            if($productClassOrig->getTaxRate()) {
585
+            if ($productClassOrig->getTaxRate()) {
586 586
                 $productClassDest->setTaxRate($productClassOrig->getTaxRate());
587 587
                 if ($productClassDest->getTaxRule() && !$productClassDest->getTaxRule()->getDelFlg()) {
588 588
                     $productClassDest->getTaxRule()->setTaxRate($productClassOrig->getTaxRate());
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductController.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
             foreach ($images as $img) {
152 152
                 foreach ($img as $image) {
153 153
                     $extension = $image->getClientOriginalExtension();
154
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
154
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
155 155
                     $image->move($app['config']['image_temp_realdir'], $filename);
156 156
                     $files[] = $filename;
157 157
                 }
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
                     $app['orm.em']->persist($ProductImage);
312 312
 
313 313
                     // 移動
314
-                    $file = new File($app['config']['image_temp_realdir'] . '/' . $add_image);
314
+                    $file = new File($app['config']['image_temp_realdir'].'/'.$add_image);
315 315
                     $file->move($app['config']['image_save_realdir']);
316 316
                 }
317 317
 
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 
332 332
                     // 削除
333 333
                     $fs = new Filesystem();
334
-                    $fs->remove($app['config']['image_save_realdir'] . '/' . $delete_image);
334
+                    $fs->remove($app['config']['image_save_realdir'].'/'.$delete_image);
335 335
                 }
336 336
                 $app['orm.em']->persist($Product);
337 337
                 $app['orm.em']->flush();
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
430 430
                 foreach ($deleteImages as $deleteImage) {
431 431
                     try {
432 432
                         $fs = new Filesystem();
433
-                        $fs->remove($app['config']['image_save_realdir'] . '/' . $deleteImage);
433
+                        $fs->remove($app['config']['image_save_realdir'].'/'.$deleteImage);
434 434
                     } catch (\Exception $e) {
435 435
                         // エラーが発生しても無視する
436 436
                     }
@@ -475,10 +475,10 @@  discard block
 block discarded – undo
475 475
 
476 476
                     // 画像ファイルを新規作成
477 477
                     $extension = pathinfo($Image->getFileName(), PATHINFO_EXTENSION);
478
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
478
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
479 479
                     try {
480 480
                         $fs = new Filesystem();
481
-                        $fs->copy($app['config']['image_save_realdir'] . '/' . $Image->getFileName(), $app['config']['image_save_realdir'] . '/' . $filename);
481
+                        $fs->copy($app['config']['image_save_realdir'].'/'.$Image->getFileName(), $app['config']['image_save_realdir'].'/'.$filename);
482 482
                     } catch (\Exception $e) {
483 483
                         // エラーが発生しても無視する
484 484
                     }
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
         $em->getConfiguration()->setSQLLogger(null);
534 534
 
535 535
         $response = new StreamedResponse();
536
-        $response->setCallback(function () use ($app, $request) {
536
+        $response->setCallback(function() use ($app, $request) {
537 537
 
538 538
             // CSV種別を元に初期化.
539 539
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_PRODUCT);
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
 
558 558
             // データ行の出力.
559 559
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
560
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
560
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
561 561
 
562 562
                 $Csvs = $csvService->getCsvs();
563 563
 
@@ -589,9 +589,9 @@  discard block
 block discarded – undo
589 589
         });
590 590
 
591 591
         $now = new \DateTime();
592
-        $filename = 'product_' . $now->format('YmdHis') . '.csv';
592
+        $filename = 'product_'.$now->format('YmdHis').'.csv';
593 593
         $response->headers->set('Content-Type', 'application/octet-stream');
594
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
594
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
595 595
         $response->send();
596 596
 
597 597
         return $response;
Please login to merge, or discard this patch.