Completed
Pull Request — experimental/3.1 (#2561)
by k-yamamura
222:41 queued 215:24
created
src/Eccube/Controller/Admin/Setting/System/MasterdataController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -174,7 +174,7 @@
 block discarded – undo
174 174
                 $entity = new $entityName();
175 175
                 $rank = 0;
176 176
                 $ids = array_map(
177
-                    function ($v) {
177
+                    function($v) {
178 178
                         return $v['id'];
179 179
                     },
180 180
                     $data['data']
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Shopping/ShippingType.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
         // 配送業者のプルダウンを生成
76 76
         $builder->addEventListener(
77 77
             FormEvents::PRE_SET_DATA,
78
-            function (FormEvent $event) {
78
+            function(FormEvent $event) {
79 79
                 /* @var Shipping $Shipping */
80 80
                 $Shipping = $event->getData();
81 81
                 if (is_null($Shipping) || !$Shipping->getId()) {
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
         // お届け日のプルダウンを生成
118 118
         $builder->addEventListener(
119 119
             FormEvents::PRE_SET_DATA,
120
-            function (FormEvent $event) {
120
+            function(FormEvent $event) {
121 121
                 $Shipping = $event->getData();
122 122
                 if (is_null($Shipping) || !$Shipping->getId()) {
123 123
                     return;
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 
156 156
                 // 配送日数が設定されている
157 157
                 if ($deliveryDateFlag) {
158
-                    $period = new \DatePeriod (
158
+                    $period = new \DatePeriod(
159 159
                         new \DateTime($minDate.' day'),
160 160
                         new \DateInterval('P1D'),
161 161
                         new \DateTime($minDate + $this->appConfig['deliv_date_end_max'].' day')
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
         // お届け時間のプルダウンを生成
184 184
         $builder->addEventListener(
185 185
             FormEvents::PRE_SET_DATA,
186
-            function (FormEvent $event) {
186
+            function(FormEvent $event) {
187 187
                 $Shipping = $event->getData();
188 188
                 if (is_null($Shipping) || !$Shipping->getId()) {
189 189
                     return;
Please login to merge, or discard this patch.
src/Eccube/Form/Type/PriceType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
         $max = $this->appConfig['price_max'];
57 57
         $min = -$max;
58 58
 
59
-        $constraints = function (Options $options) use ($max, $min){
59
+        $constraints = function(Options $options) use ($max, $min){
60 60
             $constraints = [];
61 61
 
62 62
             // requiredがtrueに指定されている場合, NotBlankを追加
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/CsvImportType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,8 +67,8 @@
 block discarded – undo
67 67
                 'constraints' => array(
68 68
                     new Assert\NotBlank(array('message' => 'ファイルを選択してください。')),
69 69
                     new Assert\File(array(
70
-                        'maxSize' => $this->appConfig['csv_size'] . 'M',
71
-                        'maxSizeMessage' => 'CSVファイルは' . $this->appConfig['csv_size'] . 'M以下でアップロードしてください。',
70
+                        'maxSize' => $this->appConfig['csv_size'].'M',
71
+                        'maxSizeMessage' => 'CSVファイルは'.$this->appConfig['csv_size'].'M以下でアップロードしてください。',
72 72
                     )),
73 73
                 ),
74 74
             ));
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Install/Step3Type.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -166,19 +166,19 @@
 block discarded – undo
166 166
                 'help' => 'メーラーバックエンドがSMTPかつSMTP-AUTH使用時のみ指定',
167 167
                 'required' => false,
168 168
             ))
169
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
169
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
170 170
                 $form = $event->getForm();
171 171
                 $data = $form->getData();
172 172
 
173 173
                 $ips = preg_split("/\R/", $data['admin_allow_hosts'], null, PREG_SPLIT_NO_EMPTY);
174 174
 
175
-                foreach($ips as $ip) {
175
+                foreach ($ips as $ip) {
176 176
                     $errors = $this->validator->validate($ip, array(
177 177
                             new Assert\Ip(),
178 178
                         )
179 179
                     );
180 180
                     if ($errors->count() != 0) {
181
-                        $form['admin_allow_hosts']->addError(new FormError($ip . 'はIPv4アドレスではありません。'));
181
+                        $form['admin_allow_hosts']->addError(new FormError($ip.'はIPv4アドレスではありません。'));
182 182
                     }
183 183
                 }
184 184
             })
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Install/Step4Type.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
                 'label' => 'パスワード',
107 107
                 'required' => false,
108 108
             ))
109
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
109
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
110 110
                 $form = $event->getForm();
111 111
                 $data = $form->getData();
112 112
                 try {
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
                     $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
132 132
                     $conn->connect();
133 133
                 } catch (\Exception $e) {
134
-                    $form['database']->addError(new FormError('データベースに接続できませんでした。' . $e->getMessage()));
134
+                    $form['database']->addError(new FormError('データベースに接続できませんでした。'.$e->getMessage()));
135 135
                 }
136 136
             });
137 137
     }
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
     public function validate($data, ExecutionContext $context, $param = null)
148 148
     {
149 149
         $parameters = $this->requestStack->getCurrentRequest()->get('install_step4');
150
-        if ($parameters['database'] != 'pdo_sqlite'){
150
+        if ($parameters['database'] != 'pdo_sqlite') {
151 151
             $context->getValidator()->validate($data, array(
152 152
                 new Assert\NotBlank()
153 153
             ));
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Install/Step1Type.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 
27 27
 use Eccube\Annotation\FormType;
28 28
 use \Symfony\Component\Form\AbstractType;
29
-use \Symfony\Component\Form\Extension\Core\Type\CheckboxType;;
29
+use \Symfony\Component\Form\Extension\Core\Type\CheckboxType; ;
30 30
 use \Symfony\Component\Form\FormBuilderInterface;
31 31
 
32 32
 /**
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/CompatServiceProvider.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -20,34 +20,34 @@
 block discarded – undo
20 20
 
21 21
     public function register(Container $app)
22 22
     {
23
-        $app['eccube.service.cart'] = function () use ($app) {
23
+        $app['eccube.service.cart'] = function() use ($app) {
24 24
             return $app[CartService::class];
25 25
         };
26
-        $app['eccube.service.order'] = function () use ($app) {
26
+        $app['eccube.service.order'] = function() use ($app) {
27 27
             return $app[OrderService::class];
28 28
         };
29
-        $app['eccube.service.tax_rule'] = function () use ($app) {
29
+        $app['eccube.service.tax_rule'] = function() use ($app) {
30 30
             return $app[TaxRuleService::class];
31 31
         };
32
-        $app['eccube.service.plugin'] = function () use ($app) {
32
+        $app['eccube.service.plugin'] = function() use ($app) {
33 33
             return $app[PluginService::class];
34 34
         };
35
-        $app['eccube.service.mail'] = function () use ($app) {
35
+        $app['eccube.service.mail'] = function() use ($app) {
36 36
             return $app[MailService::class];
37 37
         };
38
-        $app['eccube.helper.order'] = function ($app) {
38
+        $app['eccube.helper.order'] = function($app) {
39 39
             return $app[OrderHelper::class];
40 40
         };
41
-        $app['eccube.service.csv.export'] = function () use ($app) {
41
+        $app['eccube.service.csv.export'] = function() use ($app) {
42 42
             return $app[CsvExportService::class];
43 43
         };
44
-        $app['eccube.service.shopping'] = function () use ($app) {
44
+        $app['eccube.service.shopping'] = function() use ($app) {
45 45
             return $app[ShoppingService::class];
46 46
         };
47
-        $app['eccube.service.payment'] = function () use ($app) {
47
+        $app['eccube.service.payment'] = function() use ($app) {
48 48
             return $app[PaymentService::class];
49 49
         };
50
-        $app['eccube.service.system'] = function () use ($app) {
50
+        $app['eccube.service.system'] = function() use ($app) {
51 51
             return $app[SystemService::class];
52 52
         };
53 53
 
Please login to merge, or discard this patch.
src/Eccube/Form/Type/SearchProductType.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,6 @@
 block discarded – undo
48 48
     /**
49 49
      * SearchProductType constructor.
50 50
      *
51
-     * @param Application $app
52 51
      */
53 52
     public function __construct()
54 53
     {
Please login to merge, or discard this patch.