Completed
Pull Request — master (#2152)
by NOBU
82:06 queued 38:49
created
src/Eccube/Form/Type/Admin/AuthorityRoleType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
                 'label' => '拒否URL',
60 60
                 'required' => false,
61 61
             ))
62
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
62
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
63 63
                 $form = $event->getForm();
64 64
 
65 65
                 $Authority = $form['Authority']->getData();
Please login to merge, or discard this patch.
src/Eccube/Security/Voter/AuthorityVoter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 
37 37
     public function __construct(Application $app)
38 38
     {
39
-        $this->app     = $app;
39
+        $this->app = $app;
40 40
     }
41 41
 
42 42
     public function supportsAttribute($attribute)
Please login to merge, or discard this patch.
src/Eccube/Controller/AbstractController.php 2 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -52,11 +52,17 @@
 block discarded – undo
52 52
         return $form;
53 53
     }
54 54
 
55
+    /**
56
+     * @param Application $app
57
+     */
55 58
     protected function getSecurity($app)
56 59
     {
57 60
         return $app['security.token_storage'];
58 61
     }
59 62
 
63
+    /**
64
+     * @param Application $app
65
+     */
60 66
     protected function isTokenValid($app)
61 67
     {
62 68
         $csrf = $app['form.csrf_provider'];
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
         @trigger_error('The '.__METHOD__.' method is deprecated.', E_USER_DEPRECATED);
46 46
 
47 47
         $form = $app['form.factory']
48
-            ->createBuilder($app['eccube.form.type.' . $type], $app['eccube.entity.' . $type])
48
+            ->createBuilder($app['eccube.form.type.'.$type], $app['eccube.entity.'.$type])
49 49
             ->getForm();
50 50
         $form->handleRequest($app['request']);
51 51
 
Please login to merge, or discard this patch.
src/Eccube/Controller/Mypage/WithdrawController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
                     // 会員削除
61 61
                     $email = $Customer->getEmail();
62 62
                     // メールアドレスにダミーをセット
63
-                    $Customer->setEmail(Str::random(60) . '@dummy.dummy');
63
+                    $Customer->setEmail(Str::random(60).'@dummy.dummy');
64 64
                     $Customer->setDelFlg(Constant::ENABLED);
65 65
 
66 66
                     $app['orm.em']->flush();
Please login to merge, or discard this patch.
src/Eccube/Service/CsvExportService.php 3 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -307,7 +307,7 @@  discard block
 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
             );
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
             if ($Conditions instanceof ArrayCollection) {
432 432
                 $Conditions = new ArrayCollection(
433 433
                     array_map(
434
-                        function ($Entity) use ($em) {
434
+                        function($Entity) use ($em) {
435 435
                             return $em->getRepository(get_class($Entity))->find($Entity->getId());
436 436
                         }, $Conditions->toArray()
437 437
                     )
Please login to merge, or discard this patch.
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -325,7 +325,6 @@  discard block
 block discarded – undo
325 325
 
326 326
     /**
327 327
      * @param $row
328
-     * @param null $callback
329 328
      */
330 329
     public function fputcsv($row)
331 330
     {
@@ -424,7 +423,6 @@  discard block
 block discarded – undo
424 423
      * XXX self::setExportQueryBuilder() をコールする前に EntityManager を取得したいので、引数で渡している
425 424
      *
426 425
      * @param array $searchData セッションから取得した検索条件の配列
427
-     * @param EntityManager $em
428 426
      */
429 427
     protected function findDeserializeObjects(array &$searchData)
430 428
     {
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
 use Doctrine\Common\Collections\ArrayCollection;
32 31
 
Please login to merge, or discard this patch.
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/Controller/Admin/Product/ProductClassController.php 3 patches
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.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
106 106
                     $class2Valied = $this->isValiedCategory($ClassName2);
107 107
 
108 108
                     // 規格が選択されていないか、選択された状態で分類が保有されていれば、画面表示
109
-                    if($class1Valied && $class2Valied){
109
+                    if ($class1Valied && $class2Valied) {
110 110
                         $hasClassCategoryFlg = true;
111 111
                     }
112 112
 
Please login to merge, or discard this patch.
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -529,6 +529,9 @@  discard block
 block discarded – undo
529 529
     /**
530 530
      * 登録、更新時のエラー画面表示
531 531
      *
532
+     * @param Application $app
533
+     * @param boolean $not_product_class
534
+     * @param \Symfony\Component\Form\FormInterface $classForm
532 535
      */
533 536
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
534 537
     {
@@ -580,6 +583,7 @@  discard block
 block discarded – undo
580 583
 
581 584
     /**
582 585
      * 規格1と規格2を組み合わせた商品規格を作成
586
+     * @param Application $app
583 587
      */
584 588
     private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null)
585 589
     {
@@ -667,6 +671,7 @@  discard block
 block discarded – undo
667 671
      *
668 672
      * @param $productClassDest コピー先となる商品規格
669 673
      * @param $productClassOrig コピー元となる商品規格
674
+     * @param Application $app
670 675
      */
671 676
     private function setDefualtProductClass($app, $productClassDest, $productClassOrig) {
672 677
         $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate());
Please login to merge, or discard this patch.