Failed Conditions
Pull Request — 3.0.9-dev (#1468)
by chihiro
59:35 queued 23:18
created
src/Eccube/Controller/Admin/Product/ProductClassController.php 2 patches
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -510,6 +510,8 @@  discard block
 block discarded – undo
510 510
     /**
511 511
      * 登録、更新時のエラー画面表示
512 512
      *
513
+     * @param Application $app
514
+     * @param boolean $not_product_class
513 515
      */
514 516
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
515 517
     {
@@ -559,6 +561,7 @@  discard block
 block discarded – undo
559 561
 
560 562
     /**
561 563
      * 規格1と規格2を組み合わせた商品規格を作成
564
+     * @param Application $app
562 565
      */
563 566
     private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null)
564 567
     {
@@ -646,6 +649,7 @@  discard block
 block discarded – undo
646 649
      *
647 650
      * @param $productClassDest コピー先となる商品規格
648 651
      * @param $productClassOrig コピー元となる商品規格
652
+     * @param Application $app
649 653
      */
650 654
     private function setDefualtProductClass($app, $productClassDest, $productClassOrig) {
651 655
         $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate());
@@ -687,6 +691,7 @@  discard block
 block discarded – undo
687 691
      * 商品規格を登録
688 692
      *
689 693
      * @param $ProductClasses 登録される商品規格
694
+     * @param Application $app
690 695
      */
691 696
     private function insertProductClass($app, $Product, $ProductClasses) {
692 697
 
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
                                 'allow_add' => true,
139 139
                                 'allow_delete' => true,
140 140
                                 'data' => $ProductClasses,
141
-                             ));
141
+                                ));
142 142
 
143 143
                         $event = new EventArgs(
144 144
                             array(
Please login to merge, or discard this patch.
src/Eccube/Application/ApplicationTrait.php 1 patch
Spacing   +10 added lines, -10 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()
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
         if (is_null($namespace)) {
65 65
             $this['session']->getFlashBag()->set('eccube.login.target.path', $targetPath);
66 66
         } else {
67
-            $this['session']->getFlashBag()->set('eccube.' . $namespace . '.login.target.path', $targetPath);
67
+            $this['session']->getFlashBag()->set('eccube.'.$namespace.'.login.target.path', $targetPath);
68 68
         }
69 69
     }
70 70
 
@@ -234,14 +234,14 @@  discard block
 block discarded – undo
234 234
         $eventName = $view;
235 235
         if ($this->isAdminRequest()) {
236 236
             // 管理画面の場合、event名に「Admin/」を付ける
237
-            $eventName = 'Admin/' . $view;
237
+            $eventName = 'Admin/'.$view;
238 238
         }
239
-        $this['monolog']->debug('Template Event Name : ' . $eventName);
239
+        $this['monolog']->debug('Template Event Name : '.$eventName);
240 240
 
241 241
         $this['eccube.event.dispatcher']->dispatch($eventName, $event);
242 242
 
243 243
         if ($response instanceof StreamedResponse) {
244
-            $response->setCallback(function () use ($twig, $view, $parameters) {
244
+            $response->setCallback(function() use ($twig, $view, $parameters) {
245 245
                 $twig->display($view, $parameters);
246 246
             });
247 247
         } else {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Content/BlockController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -113,13 +113,13 @@  discard block
 block discarded – undo
113 113
                 // ファイル生成・更新
114 114
                 $tplDir = $app['config']['block_realdir'];
115 115
 
116
-                $filePath = $tplDir . '/' . $Block->getFileName() . '.twig';
116
+                $filePath = $tplDir.'/'.$Block->getFileName().'.twig';
117 117
 
118 118
                 $fs = new Filesystem();
119 119
                 $fs->dumpFile($filePath, $form->get('block_html')->getData());
120 120
                 // 更新でファイル名を変更した場合、以前のファイルを削除
121 121
                 if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) {
122
-                    $oldFilePath = $tplDir . $previous_filename;
122
+                    $oldFilePath = $tplDir.$previous_filename;
123 123
                     if ($fs->exists($oldFilePath)) {
124 124
                         $fs->remove($oldFilePath);
125 125
                     }
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
         // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る
172 172
         if ($Block->getDeletableFlg() > 0) {
173 173
             $tplDir = $app['config']['block_realdir'];
174
-            $file = $tplDir . '/' . $Block->getFileName() . '.twig';
174
+            $file = $tplDir.'/'.$Block->getFileName().'.twig';
175 175
             $fs = new Filesystem();
176 176
             if ($fs->exists($file)) {
177 177
                 $fs->remove($file);
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
@@ -88,7 +88,7 @@
 block discarded – undo
88 88
                         ->setCompanyName($Customer->getCompanyName())
89 89
                         ->setZip01($Customer->getZip01())
90 90
                         ->setZip02($Customer->getZip02())
91
-                        ->setZipcode($Customer->getZip01() . $Customer->getZip02())
91
+                        ->setZipcode($Customer->getZip01().$Customer->getZip02())
92 92
                         ->setPref($Customer->getPref())
93 93
                         ->setAddr01($Customer->getAddr01())
94 94
                         ->setAddr02($Customer->getAddr02())
Please login to merge, or discard this patch.