Failed Conditions
Pull Request — 3.0.9-dev (#1439)
by
unknown
49:48 queued 48s
created
src/Eccube/Controller/Admin/Product/ProductClassController.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -428,6 +428,9 @@  discard block
 block discarded – undo
428 428
     /**
429 429
      * 登録、更新時のエラー画面表示
430 430
      *
431
+     * @param Application $app
432
+     * @param boolean $not_product_class
433
+     * @param \Symfony\Component\Form\Form $classForm
431 434
      */
432 435
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
433 436
     {
@@ -477,6 +480,7 @@  discard block
 block discarded – undo
477 480
 
478 481
     /**
479 482
      * 規格1と規格2を組み合わせた商品規格を作成
483
+     * @param Application $app
480 484
      */
481 485
     private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null)
482 486
     {
@@ -564,6 +568,7 @@  discard block
 block discarded – undo
564 568
      *
565 569
      * @param $productClassDest コピー先となる商品規格
566 570
      * @param $productClassOrig コピー元となる商品規格
571
+     * @param Application $app
567 572
      */
568 573
     private function setDefualtProductClass($app, $productClassDest, $productClassOrig) {
569 574
         $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate());
@@ -605,6 +610,7 @@  discard block
 block discarded – undo
605 610
      * 商品規格を登録
606 611
      *
607 612
      * @param $ProductClasses 登録される商品規格
613
+     * @param Application $app
608 614
      */
609 615
     private function insertProductClass($app, $Product, $ProductClasses) {
610 616
 
Please login to merge, or discard this patch.
src/Eccube/Controller/EntryController.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
      * Complete
137 137
      *
138 138
      * @param  Application $app
139
-     * @return mixed
139
+     * @return \Symfony\Component\HttpFoundation\Response
140 140
      */
141 141
     public function complete(Application $app)
142 142
     {
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
      * 会員のアクティベート(本会員化)を行う
149 149
      *
150 150
      * @param  Application $app
151
-     * @return mixed
151
+     * @return \Symfony\Component\HttpFoundation\Response
152 152
      */
153 153
     public function activate(Application $app, Request $request, $secret_key)
154 154
     {
Please login to merge, or discard this patch.
src/Eccube/Application/ApplicationTrait.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -20,32 +20,32 @@  discard block
 block discarded – undo
20 20
      */
21 21
     public function addSuccess($message, $namespace = 'front')
22 22
     {
23
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.success', $message);
23
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.success', $message);
24 24
     }
25 25
 
26 26
     public function addError($message, $namespace = 'front')
27 27
     {
28
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.error', $message);
28
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.error', $message);
29 29
     }
30 30
 
31 31
     public function addDanger($message, $namespace = 'front')
32 32
     {
33
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message);
33
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.danger', $message);
34 34
     }
35 35
 
36 36
     public function addWarning($message, $namespace = 'front')
37 37
     {
38
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message);
38
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.warning', $message);
39 39
     }
40 40
 
41 41
     public function addInfo($message, $namespace = 'front')
42 42
     {
43
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message);
43
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.info', $message);
44 44
     }
45 45
 
46 46
     public function addRequestError($message, $namespace = 'front')
47 47
     {
48
-        $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message);
48
+        $this['session']->getFlashBag()->set('eccube.'.$namespace.'.request.error', $message);
49 49
     }
50 50
 
51 51
     public function clearMessage()
@@ -230,14 +230,14 @@  discard block
 block discarded – undo
230 230
         $eventName = $view;
231 231
         if ($this->isAdminRequest()) {
232 232
             // 管理画面の場合、event名に「admin.」を付ける
233
-            $eventName = 'admin.' . $view;
233
+            $eventName = 'admin.'.$view;
234 234
         }
235
-        $this['monolog']->debug('Template Event Name : ' . $eventName);
235
+        $this['monolog']->debug('Template Event Name : '.$eventName);
236 236
 
237 237
         $this['eccube.event.dispatcher']->dispatch($eventName, $event);
238 238
 
239 239
         if ($response instanceof StreamedResponse) {
240
-            $response->setCallback(function () use ($twig, $view, $parameters) {
240
+            $response->setCallback(function() use ($twig, $view, $parameters) {
241 241
                 $twig->display($view, $parameters);
242 242
             });
243 243
         } else {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductController.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
             foreach ($images as $img) {
178 178
                 foreach ($img as $image) {
179 179
                     $extension = $image->getClientOriginalExtension();
180
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
180
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
181 181
                     $image->move($app['config']['image_temp_realdir'], $filename);
182 182
                     $files[] = $filename;
183 183
                 }
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
         $app['eccube.event.dispatcher']->dispatch(EccubeEvents::ADMIN_PRODUCT_EDIT_INITIALIZE, $event);
240 240
 
241 241
         if (!$has_class) {
242
-            $ProductClass->setStockUnlimited((boolean)$ProductClass->getStockUnlimited());
242
+            $ProductClass->setStockUnlimited((boolean) $ProductClass->getStockUnlimited());
243 243
             $form['class']->setData($ProductClass);
244 244
         }
245 245
 
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
                     $app['orm.em']->persist($ProductImage);
338 338
 
339 339
                     // 移動
340
-                    $file = new File($app['config']['image_temp_realdir'] . '/' . $add_image);
340
+                    $file = new File($app['config']['image_temp_realdir'].'/'.$add_image);
341 341
                     $file->move($app['config']['image_save_realdir']);
342 342
                 }
343 343
 
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
 
358 358
                     // 削除
359 359
                     $fs = new Filesystem();
360
-                    $fs->remove($app['config']['image_save_realdir'] . '/' . $delete_image);
360
+                    $fs->remove($app['config']['image_save_realdir'].'/'.$delete_image);
361 361
                 }
362 362
                 $app['orm.em']->persist($Product);
363 363
                 $app['orm.em']->flush();
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
                 foreach ($deleteImages as $deleteImage) {
464 464
                     try {
465 465
                         $fs = new Filesystem();
466
-                        $fs->remove($app['config']['image_save_realdir'] . '/' . $deleteImage);
466
+                        $fs->remove($app['config']['image_save_realdir'].'/'.$deleteImage);
467 467
                     } catch (\Exception $e) {
468 468
                         // エラーが発生しても無視する
469 469
                     }
@@ -527,10 +527,10 @@  discard block
 block discarded – undo
527 527
 
528 528
                     // 画像ファイルを新規作成
529 529
                     $extension = pathinfo($Image->getFileName(), PATHINFO_EXTENSION);
530
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
530
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
531 531
                     try {
532 532
                         $fs = new Filesystem();
533
-                        $fs->copy($app['config']['image_save_realdir'] . '/' . $Image->getFileName(), $app['config']['image_save_realdir'] . '/' . $filename);
533
+                        $fs->copy($app['config']['image_save_realdir'].'/'.$Image->getFileName(), $app['config']['image_save_realdir'].'/'.$filename);
534 534
                     } catch (\Exception $e) {
535 535
                         // エラーが発生しても無視する
536 536
                     }
@@ -585,7 +585,7 @@  discard block
 block discarded – undo
585 585
         $em->getConfiguration()->setSQLLogger(null);
586 586
 
587 587
         $response = new StreamedResponse();
588
-        $response->setCallback(function () use ($app, $request) {
588
+        $response->setCallback(function() use ($app, $request) {
589 589
 
590 590
             // CSV種別を元に初期化.
591 591
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_PRODUCT);
@@ -609,7 +609,7 @@  discard block
 block discarded – undo
609 609
 
610 610
             // データ行の出力.
611 611
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
612
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
612
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
613 613
 
614 614
                 $Csvs = $csvService->getCsvs();
615 615
 
@@ -641,9 +641,9 @@  discard block
 block discarded – undo
641 641
         });
642 642
 
643 643
         $now = new \DateTime();
644
-        $filename = 'product_' . $now->format('YmdHis') . '.csv';
644
+        $filename = 'product_'.$now->format('YmdHis').'.csv';
645 645
         $response->headers->set('Content-Type', 'application/octet-stream');
646
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
646
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
647 647
         $response->send();
648 648
 
649 649
         return $response;
Please login to merge, or discard this patch.