Completed
Pull Request — experimental/3.1 (#2669)
by
unknown
34:00 queued 06:13
created
src/Eccube/ServiceProvider/QueriesServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
      */
21 21
     public function register(Container $app)
22 22
     {
23
-        $app['eccube.queries'] = function () {
23
+        $app['eccube.queries'] = function() {
24 24
             return new \Eccube\Doctrine\Query\Queries();
25 25
         };
26 26
     }
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/TransactionServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
     {
16 16
         $app['eccube.listener.transaction.enabled'] = true;
17 17
 
18
-        $app['eccube.listener.transaction'] = function (Container $app) {
18
+        $app['eccube.listener.transaction'] = function(Container $app) {
19 19
             $listener = new TransactionListener(
20 20
                 $app['orm.em'],
21 21
                 $app['logger'],
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/EccubeServiceProvider.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -46,16 +46,16 @@
 block discarded – undo
46 46
      */
47 47
     public function register(Container $app)
48 48
     {
49
-        $app[BaseInfo::class] = function () use ($app) {
49
+        $app[BaseInfo::class] = function() use ($app) {
50 50
             return $app[BaseInfoRepository::class]->get();
51 51
         };
52 52
 
53
-        $app['request_scope'] = function () {
53
+        $app['request_scope'] = function() {
54 54
             return new ParameterBag();
55 55
         };
56 56
 
57 57
         // Application::initRenderingと一緒に修正
58
-        $app['eccube.twig.block.templates'] = function () {
58
+        $app['eccube.twig.block.templates'] = function() {
59 59
             $templates = new ArrayCollection();
60 60
             $templates[] = 'render_block.twig';
61 61
 
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/PaymentServiceProvider.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,14 +14,14 @@  discard block
 block discarded – undo
14 14
 {
15 15
     public function register(Container $app)
16 16
     {
17
-        $app['payment.method'] = $app->protect(function ($clazz, $form) use ($app) {
17
+        $app['payment.method'] = $app->protect(function($clazz, $form) use ($app) {
18 18
             $PaymentMethod = new $clazz;
19 19
             $PaymentMethod->setApplication($app);
20 20
             $PaymentMethod->setFormType($form);
21 21
             return $PaymentMethod;
22 22
         });
23 23
 
24
-        $app['payment.method.request'] = $app->protect(function ($clazz, $form, $request) use ($app) {
24
+        $app['payment.method.request'] = $app->protect(function($clazz, $form, $request) use ($app) {
25 25
             $PaymentMethod = new $clazz;
26 26
             $PaymentMethod->setApplication($app);
27 27
             $PaymentMethod->setFormType($form);
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
             return $PaymentMethod;
30 30
         });
31 31
 
32
-        $app['eccube.service.payment'] = $app->protect(function ($clazz) use ($app) {
32
+        $app['eccube.service.payment'] = $app->protect(function($clazz) use ($app) {
33 33
             $Service = new $clazz($app['request_stack']);
34 34
 
35 35
             return $Service;
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/ForwardOnlyServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
 {
14 14
     public function register(Container $app)
15 15
     {
16
-        $app['eccube.listener.forward_only'] = function (Container $app) {
16
+        $app['eccube.listener.forward_only'] = function(Container $app) {
17 17
             return new ForwardOnlyListener();
18 18
         };
19 19
     }
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductClassController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
                     $class2Valied = $this->isValiedCategory($ClassName2);
193 193
 
194 194
                     // 規格が選択されていないか、選択された状態で分類が保有されていれば、画面表示
195
-                    if($class1Valied && $class2Valied){
195
+                    if ($class1Valied && $class2Valied) {
196 196
                         $hasClassCategoryFlg = true;
197 197
                     }
198 198
 
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
             $mergeProductClasses = array();
270 270
 
271 271
             // 商品税率が設定されている場合、商品税率を項目に設定
272
-            if ($this->BaseInfo->isOptionProductTaxRule())  {
272
+            if ($this->BaseInfo->isOptionProductTaxRule()) {
273 273
                 foreach ($ProductClasses as $class) {
274 274
                     if ($class->getTaxRule()) {
275 275
                         $class->setTaxRate($class->getTaxRule()->getTaxRate());
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/PaymentRegisterType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@
 block discarded – undo
87 87
                 'label' => '手数料',
88 88
             ))
89 89
             ->add('fixed', HiddenType::class)
90
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
90
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
91 91
                 $form = $event->getForm();
92 92
                 $ruleMax = $form['rule_max']->getData();
93 93
                 $ruleMin = $form['rule_min']->getData();
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Content/BlockController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
                 // ファイル生成・更新
172 172
                 $tplDir = $this->appConfig['block_realdir'];
173 173
 
174
-                $filePath = $tplDir . '/' . $Block->getFileName() . '.twig';
174
+                $filePath = $tplDir.'/'.$Block->getFileName().'.twig';
175 175
 
176 176
                 $fs = new Filesystem();
177 177
                 $blockData = $form->get('block_html')->getData();
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
                 $fs->dumpFile($filePath, $blockData);
180 180
                 // 更新でファイル名を変更した場合、以前のファイルを削除
181 181
                 if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) {
182
-                    $oldFilePath = $tplDir . '/' . $previous_filename . '.twig';
182
+                    $oldFilePath = $tplDir.'/'.$previous_filename.'.twig';
183 183
                     if ($fs->exists($oldFilePath)) {
184 184
                         $fs->remove($oldFilePath);
185 185
                     }
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
         // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る
237 237
         if ($Block->isDeletable()) {
238 238
             $tplDir = $this->appConfig['block_realdir'];
239
-            $file = $tplDir . '/' . $Block->getFileName() . '.twig';
239
+            $file = $tplDir.'/'.$Block->getFileName().'.twig';
240 240
             $fs = new Filesystem();
241 241
             if ($fs->exists($file)) {
242 242
                 $fs->remove($file);
Please login to merge, or discard this patch.
src/Eccube/DI/AutoWiring/RepositoryDefinition.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -58,9 +58,9 @@
 block discarded – undo
58 58
 
59 59
         // 同じパッケージのEntityがあれば返す
60 60
         if (count($partsOfFqcn) > 2) {
61
-            $parentNamespace = implode('\\', array_slice($partsOfFqcn, 0, count($partsOfFqcn)-2));
62
-            $entityName = preg_replace('/(.*)Repository/', '$1', $partsOfFqcn[count($partsOfFqcn) -1]);
63
-            $result = $parentNamespace . '\\Entity\\' . $entityName;
61
+            $parentNamespace = implode('\\', array_slice($partsOfFqcn, 0, count($partsOfFqcn) - 2));
62
+            $entityName = preg_replace('/(.*)Repository/', '$1', $partsOfFqcn[count($partsOfFqcn) - 1]);
63
+            $result = $parentNamespace.'\\Entity\\'.$entityName;
64 64
             if (class_exists($result)) {
65 65
                 return $result;
66 66
             }
Please login to merge, or discard this patch.