Failed Conditions
Pull Request — master (#1665)
by k-yamamura
38:49
created
src/Eccube/Controller/ProductController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
106 106
             ));
107 107
             $addCartForm = $builder->getForm();
108 108
 
109
-            if ($request->getMethod() === 'POST' && (string)$Product->getId() === $request->get('product_id')) {
109
+            if ($request->getMethod() === 'POST' && (string) $Product->getId() === $request->get('product_id')) {
110 110
                 $addCartForm->handleRequest($request);
111 111
 
112 112
                 if ($addCartForm->isValid()) {
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/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.
src/Eccube/Form/Type/Admin/ProductType.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -72,9 +72,9 @@
 block discarded – undo
72 72
                 'required' => false,
73 73
             ))
74 74
             ->add('Category', 'category', array(
75
-               'label' => '商品カテゴリ',
76
-               'multiple' => true,
77
-               'mapped' => false,
75
+                'label' => '商品カテゴリ',
76
+                'multiple' => true,
77
+                'mapped' => false,
78 78
             ))
79 79
 
80 80
             // 詳細な説明
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20160413151321.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,13 +21,13 @@
 block discarded – undo
21 21
 
22 22
         // path.ymlの更新
23 23
         $app = Application::getInstance();
24
-        $file = $app['config']['root_dir'] . '/app/config/eccube/path.yml';
24
+        $file = $app['config']['root_dir'].'/app/config/eccube/path.yml';
25 25
         $config = Yaml::parse(file_get_contents($file));
26 26
 
27 27
         $config['public_path'] = '/html';
28
-        $config['public_path_realdir'] = $config['root_dir'] . $config['public_path'];
29
-        $config['plugin_html_realdir'] = $config['root_dir'] . $config['public_path'] . '/plugin';
30
-        $config['plugin_urlpath'] = $config['root_urlpath'] . '/plugin';
28
+        $config['public_path_realdir'] = $config['root_dir'].$config['public_path'];
29
+        $config['plugin_html_realdir'] = $config['root_dir'].$config['public_path'].'/plugin';
30
+        $config['plugin_urlpath'] = $config['root_urlpath'].'/plugin';
31 31
 
32 32
         file_put_contents($file, Yaml::dump($config));
33 33
 
Please login to merge, or discard this patch.
src/Eccube/Service/CartService.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
     }
232 232
 
233 233
     /**
234
-     * @param  \Eccube\Entity\ProductClass|integer $ProductClass
234
+     * @param  string $ProductClass
235 235
      * @param  integer $quantity
236 236
      * @return \Eccube\Service\CartService
237 237
      * @throws CartException
@@ -644,7 +644,7 @@  discard block
 block discarded – undo
644 644
      * 在庫数と販売制限数ともに個数が超えていれば、少ない方を適用させてメッセージを表示する
645 645
      *
646 646
      * @param ProductClass $ProductClass
647
-     * @param $productName
647
+     * @param string $productName
648 648
      * @param $quantity
649 649
      * @return int|string
650 650
      */
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
      */
223 223
     public function getProductQuantity($productClassId)
224 224
     {
225
-        $CartItem = $this->cart->getCartItemByIdentifier('Eccube\Entity\ProductClass', (string)$productClassId);
225
+        $CartItem = $this->cart->getCartItemByIdentifier('Eccube\Entity\ProductClass', (string) $productClassId);
226 226
         if ($CartItem) {
227 227
             return $CartItem->getQuantity();
228 228
         } else {
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
         $CartItem = new CartItem();
306 306
         $CartItem
307 307
             ->setClassName('Eccube\Entity\ProductClass')
308
-            ->setClassId((string)$ProductClass->getId())
308
+            ->setClassId((string) $ProductClass->getId())
309 309
             ->setPrice($ProductClass->getPrice02IncTax())
310 310
             ->setQuantity($quantity);
311 311
 
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
      */
462 462
     public function removeProduct($productClassId)
463 463
     {
464
-        $this->cart->removeCartItemByIdentifier('Eccube\Entity\ProductClass', (string)$productClassId);
464
+        $this->cart->removeCartItemByIdentifier('Eccube\Entity\ProductClass', (string) $productClassId);
465 465
 
466 466
         // 支払方法の再設定
467 467
         if ($this->BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) {
Please login to merge, or discard this patch.