Completed
Pull Request — master (#1181)
by NOBU
18:05
created
src/Eccube/Form/DataTransformer/EntityToIdTransformer.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
 
43 43
     /**
44 44
      * @param ObjectManager $om
45
-     * @param stging $className
45
+     * @param string $className
46 46
      */
47 47
     public function __construct(ObjectManager $om, $className)
48 48
     {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/OrderType.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -38,6 +38,9 @@
 block discarded – undo
38 38
 
39 39
     protected $app;
40 40
 
41
+    /**
42
+     * @param \Silex\Application $app
43
+     */
41 44
     public function __construct($app)
42 45
     {
43 46
         $this->app = $app;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
                 )));
226 226
 
227 227
         $app = $this->app;
228
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
228
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
229 229
 
230 230
             if ('calc' === $app['request']->get('mode')) {
231 231
 
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
             }
266 266
 
267 267
         });
268
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
268
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
269 269
             $form = $event->getForm();
270 270
             $orderDetails = $form['OrderDetails']->getData();
271 271
             if (empty($orderDetails) || count($orderDetails) < 1) {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ShipmentItemType.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -36,6 +36,9 @@
 block discarded – undo
36 36
 {
37 37
     protected $app;
38 38
 
39
+    /**
40
+     * @param \Silex\Application $app
41
+     */
39 42
     public function __construct($app)
40 43
     {
41 44
         $this->app = $app;
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
                 )));
92 92
 
93 93
         $app = $this->app;
94
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
94
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
95 95
             // モーダルからのPOST時に、金額等をセットする.
96 96
             if ('modal' === $app['request']->get('modal')) {
97 97
                 $data = $event->getData();
Please login to merge, or discard this patch.
src/Eccube/Form/Type/KanaType.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -25,9 +25,7 @@
 block discarded – undo
25 25
 
26 26
 use Symfony\Component\Form\AbstractType;
27 27
 use Symfony\Component\Form\FormBuilderInterface;
28
-use Symfony\Component\Form\FormEvents;
29 28
 use Symfony\Component\Validator\Constraints as Assert;
30
-use Symfony\Component\OptionsResolver\Options;
31 29
 use Symfony\Component\OptionsResolver\OptionsResolver;
32 30
 
33 31
 /**
Please login to merge, or discard this patch.
src/Eccube/Repository/MemberRepository.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@
 block discarded – undo
130 130
     /**
131 131
      * @param  \Eccube\Entity\Member $Member
132 132
      *
133
-     * @return void
133
+     * @return boolean
134 134
      */
135 135
     public function up(\Eccube\Entity\Member $Member)
136 136
     {
Please login to merge, or discard this patch.
src/Eccube/Repository/TaxRuleRepository.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
      * @param  int|null|\Eccube\Entity\ProductClass   $ProductClass 商品規格
66 66
      * @param  int|null|\Eccube\Entity\Master\Pref    $Pref         都道府県
67 67
      * @param  int|null|\Eccube\Entity\Master\Country $Country      国
68
-     * @return \Eccube\Entity\TaxRule                 税設定情報
68
+     * @return integer                 税設定情報
69 69
      *
70 70
      * @throws NoResultException
71 71
      */
Please login to merge, or discard this patch.
src/Eccube/Service/CartService.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -201,7 +201,7 @@
 block discarded – undo
201 201
     }
202 202
 
203 203
     /**
204
-     * @param  \Eccube\Entity\ProductClass|integer $ProductClass
204
+     * @param  string $ProductClass
205 205
      * @param  integer $quantity
206 206
      * @return \Eccube\Service\CartService
207 207
      * @throws CartException
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -274,7 +274,7 @@
 block discarded – undo
274 274
                 $this->addError('cart.over.sale_limit', $product_str);
275 275
             } else {
276 276
                 $tmp_quantity = $ProductClass->getStock();
277
-                $this->addError('cart.over.stock',  $product_str);
277
+                $this->addError('cart.over.stock', $product_str);
278 278
             }
279 279
         }
280 280
         if ($ProductClass->getSaleLimit() && $quantity > $ProductClass->getSaleLimit()) {
Please login to merge, or discard this patch.
src/Eccube/Service/CsvExportService.php 3 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -326,7 +326,6 @@
 block discarded – undo
326 326
 
327 327
     /**
328 328
      * @param $row
329
-     * @param null $callback
330 329
      */
331 330
     public function fputcsv($row)
332 331
     {
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,6 @@
 block discarded – undo
26 26
 
27 27
 use Eccube\Common\Constant;
28 28
 use Eccube\Util\EntityUtil;
29
-use Symfony\Component\Form\FormFactory;
30 29
 use Symfony\Component\HttpFoundation\Request;
31 30
 
32 31
 class CsvExportService
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -307,7 +307,7 @@
 block discarded – undo
307 307
     {
308 308
         $config = $this->config;
309 309
 
310
-        return function ($value) use ($config) {
310
+        return function($value) use ($config) {
311 311
             return mb_convert_encoding(
312 312
                 (string) $value, $config['csv_export_encoding'], 'UTF-8'
313 313
             );
Please login to merge, or discard this patch.
src/Eccube/Service/CsvImportService.php 2 patches
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,6 @@
 block discarded – undo
23 23
 
24 24
 namespace Eccube\Service;
25 25
 
26
-use Eccube\Application;
27
-
28 26
 
29 27
 /**
30 28
  * Copyright (C) 2012-2014 David de Boer <[email protected]>
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -117,9 +117,9 @@  discard block
 block discarded – undo
117 117
 
118 118
         $this->file = $file;
119 119
         $this->file->setFlags(
120
-            \SplFileObject::READ_CSV |
121
-            \SplFileObject::SKIP_EMPTY |
122
-            \SplFileObject::READ_AHEAD |
120
+            \SplFileObject::READ_CSV|
121
+            \SplFileObject::SKIP_EMPTY|
122
+            \SplFileObject::READ_AHEAD|
123 123
             \SplFileObject::DROP_NEW_LINE
124 124
         );
125 125
         $this->file->setCsvControl(
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
             if ($count > 1) {
359 359
                 $incrementedHeaders[] = $header;
360 360
                 for ($i = 1; $i < $count; $i++) {
361
-                    $incrementedHeaders[] = $header . $i;
361
+                    $incrementedHeaders[] = $header.$i;
362 362
                 }
363 363
             } else {
364 364
                 $incrementedHeaders[] = $header;
Please login to merge, or discard this patch.