Completed
Pull Request — experimental/3.1 (#2168)
by Kentaro
93:49 queued 72:21
created
src/Eccube/Controller/Admin/Setting/System/SystemController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -58,13 +58,13 @@
 block discarded – undo
58 58
         $system = $app['eccube.service.system'];
59 59
 
60 60
         $arrSystemInfo = array(
61
-            array('title' => 'EC-CUBE',     'value' => Constant::VERSION),
62
-            array('title' => 'サーバーOS',    'value' => php_uname()),
63
-            array('title' => 'DBサーバー',    'value' => $system->getDbversion()),
64
-            array('title' => 'WEBサーバー',   'value' => $request->server->get("SERVER_SOFTWARE")),
61
+            array('title' => 'EC-CUBE', 'value' => Constant::VERSION),
62
+            array('title' => 'サーバーOS', 'value' => php_uname()),
63
+            array('title' => 'DBサーバー', 'value' => $system->getDbversion()),
64
+            array('title' => 'WEBサーバー', 'value' => $request->server->get("SERVER_SOFTWARE")),
65 65
         );
66 66
 
67
-        $value = phpversion() . ' (' . implode(', ', get_loaded_extensions()) . ')';
67
+        $value = phpversion().' ('.implode(', ', get_loaded_extensions()).')';
68 68
         $arrSystemInfo[] = array('title' => 'PHP', 'value' => $value);
69 69
         $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $request->headers->get('User-Agent'));
70 70
 
Please login to merge, or discard this patch.
src/Eccube/Controller/ShoppingController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1336,7 +1336,7 @@
 block discarded – undo
1336 1336
                 // ステータス履歴も保持しておく? 在庫引き当ての仕様もセットで。
1337 1337
                 if ($dispatcher instanceof Response
1338 1338
                     && ($dispatcher->isRedirection() || $dispatcher->getContent())) { // $paymentMethod->apply() が Response を返した場合は画面遷移
1339
-                    return $dispatcher;                // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御?
1339
+                    return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御?
1340 1340
                 }
1341 1341
                 $PaymentResult = $paymentService->doCheckout($paymentMethod); // 決済実行
1342 1342
                 if (!$PaymentResult->isSuccess()) {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ShipmentItemType.php 1 patch
Spacing   +5 added lines, -9 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
                 )));
97 97
 
98 98
         $app = $this->app;
99
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
99
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
100 100
             // モーダルからのPOST時に、金額等をセットする.
101 101
             if ('modal' === $app['request_stack']->getCurrentRequest()->get('modal')) {
102 102
                 $data = $event->getData();
@@ -111,17 +111,13 @@  discard block
 block discarded – undo
111 111
                     $data['product_name'] = $Product->getName();
112 112
                     $data['product_code'] = $ProductClass->getCode();
113 113
                     $data['class_name1'] = $ProductClass->hasClassCategory1() ?
114
-                        $ProductClass->getClassCategory1()->getClassName() :
115
-                        null;
114
+                        $ProductClass->getClassCategory1()->getClassName() : null;
116 115
                     $data['class_name2'] = $ProductClass->hasClassCategory2() ?
117
-                        $ProductClass->getClassCategory2()->getClassName() :
118
-                        null;
116
+                        $ProductClass->getClassCategory2()->getClassName() : null;
119 117
                     $data['class_category_name1'] = $ProductClass->hasClassCategory1() ?
120
-                        $ProductClass->getClassCategory1()->getName() :
121
-                        null;
118
+                        $ProductClass->getClassCategory1()->getName() : null;
122 119
                     $data['class_category_name2'] = $ProductClass->hasClassCategory2() ?
123
-                        $ProductClass->getClassCategory2()->getName() :
124
-                        null;
120
+                        $ProductClass->getClassCategory2()->getName() : null;
125 121
                     $data['price'] = $ProductClass->getPrice02();
126 122
                     $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity'];
127 123
                     $event->setData($data);
Please login to merge, or discard this patch.
src/Eccube/Form/Type/ShippingMultipleItemType.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
                     new Assert\Regex(array('pattern' => '/^\d+$/')),
67 67
                 ),
68 68
             ))
69
-            ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($app) {
69
+            ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($app) {
70 70
                 $form = $event->getForm();
71 71
 
72 72
                 if ($app->isGranted('IS_AUTHENTICATED_FULLY')) {
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
                     $form->add('customer_address', EntityType::class, array(
76 76
                         'class' => 'Eccube\Entity\CustomerAddress',
77 77
                         'choice_label' => 'shippingMultipleDefaultName',
78
-                        'query_builder' => function (EntityRepository $er) use ($Customer) {
78
+                        'query_builder' => function(EntityRepository $er) use ($Customer) {
79 79
                             return $er->createQueryBuilder('ca')
80 80
                                 ->where('ca.Customer = :Customer')
81 81
                                 ->orderBy("ca.id", "ASC")
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
                     }
108 108
                 }
109 109
             })
110
-            ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) {
110
+            ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) {
111 111
                 /** @var \Eccube\Entity\Shipping $data */
112 112
                 $data = $event->getData();
113 113
                 /** @var \Symfony\Component\Form\Form $form */
Please login to merge, or discard this patch.
src/Eccube/Controller/AbstractController.php 1 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_stack']->getCurrentRequest());
51 51
 
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Master/ProductListMaxType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,14 +38,14 @@
 block discarded – undo
38 38
      */
39 39
     public function buildForm(FormBuilderInterface $builder, array $options)
40 40
     {
41
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
41
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
42 42
             $options = $event->getForm()->getConfig()->getOptions();
43 43
             if (!$event->getData()) {
44 44
                 $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues()));
45 45
                 $event->setData($data);
46 46
             }
47 47
         });
48
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
48
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
49 49
             $options = $event->getForm()->getConfig()->getOptions();
50 50
             $values = $options['choice_loader']->loadChoiceList()->getValues();
51 51
             if (!in_array($event->getData(), $values)) {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Master/ProductListOrderByType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,14 +38,14 @@
 block discarded – undo
38 38
      */
39 39
     public function buildForm(FormBuilderInterface $builder, array $options)
40 40
     {
41
-         $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
41
+         $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
42 42
              $options = $event->getForm()->getConfig()->getOptions();
43 43
              if (!$event->getData()) {
44 44
                  $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues()));
45 45
                  $event->setData($data);
46 46
              }
47 47
          });
48
-         $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
48
+         $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
49 49
              $options = $event->getForm()->getConfig()->getOptions();
50 50
              $values = $options['choice_loader']->loadChoiceList()->getValues();
51 51
              if (!in_array($event->getData(), $values)) {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/MasterType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
             'expanded' => false,
43 43
             'required' => false,
44 44
             'placeholder' => false,
45
-            'query_builder' => function (EntityRepository $er) {
45
+            'query_builder' => function(EntityRepository $er) {
46 46
                 return $er->createQueryBuilder('m')
47 47
                     ->orderBy('m.rank', 'ASC');
48 48
             },
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Master/PageMaxType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,14 +38,14 @@
 block discarded – undo
38 38
      */
39 39
     public function buildForm(FormBuilderInterface $builder, array $options)
40 40
     {
41
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
41
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
42 42
             $options = $event->getForm()->getConfig()->getOptions();
43 43
             if (!$event->getData()) {
44 44
                 $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues()));
45 45
                 $event->setData($data);
46 46
             }
47 47
         });
48
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
48
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
49 49
             $options = $event->getForm()->getConfig()->getOptions();
50 50
             $values = $options['choice_loader']->loadChoiceList()->getValues();
51 51
             if (!in_array($event->getData(), $values)) {
Please login to merge, or discard this patch.