Completed
Pull Request — experimental/3.1 (#2654)
by chihiro
15:03
created
src/Eccube/Resource/config/path.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php return [
2 2
   'root_dir' => '%ROOT_DIR%',
3 3
   'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null),
4
-  'template_code' => env('ECCUBE_TEMPLATE_CODE','default'),
5
-  'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'),
4
+  'template_code' => env('ECCUBE_TEMPLATE_CODE', 'default'),
5
+  'admin_route' => env('ECCUBE_ADMIN_ROUTE', 'admin'),
6 6
   'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'),
7 7
   'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/html',
8 8
   'public_path_realdir' => '%ROOT_DIR%/html',
Please login to merge, or discard this patch.
src/Eccube/Doctrine/Common/CsvDataFixtures/CsvFixture.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
         }
35 35
 
36 36
         // CSV Reader に設定
37
-        $this->file->setFlags(\SplFileObject::READ_CSV | \SplFileObject::READ_AHEAD | \SplFileObject::SKIP_EMPTY |\SplFileObject::DROP_NEW_LINE);
37
+        $this->file->setFlags(\SplFileObject::READ_CSV|\SplFileObject::READ_AHEAD|\SplFileObject::SKIP_EMPTY|\SplFileObject::DROP_NEW_LINE);
38 38
 
39 39
         // ヘッダ行を取得
40 40
         $headers = $this->file->current();
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductController.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
                     }
319 319
 
320 320
                     $extension = $image->getClientOriginalExtension();
321
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
321
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
322 322
                     $image->move($this->appConfig['image_temp_realdir'], $filename);
323 323
                     $files[] = $filename;
324 324
                 }
@@ -479,8 +479,8 @@  discard block
 block discarded – undo
479 479
                 $Categories = $form->get('Category')->getData();
480 480
                 $categoriesIdList = array();
481 481
                 foreach ($Categories as $Category) {
482
-                    foreach($Category->getPath() as $ParentCategory){
483
-                        if (!isset($categoriesIdList[$ParentCategory->getId()])){
482
+                    foreach ($Category->getPath() as $ParentCategory) {
483
+                        if (!isset($categoriesIdList[$ParentCategory->getId()])) {
484 484
                             $ProductCategory = $this->createProductCategory($Product, $ParentCategory, $count);
485 485
                             $this->entityManager->persist($ProductCategory);
486 486
                             $count++;
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
                             $categoriesIdList[$ParentCategory->getId()] = true;
490 490
                         }
491 491
                     }
492
-                    if (!isset($categoriesIdList[$Category->getId()])){
492
+                    if (!isset($categoriesIdList[$Category->getId()])) {
493 493
                         $ProductCategory = $this->createProductCategory($Product, $Category, $count);
494 494
                         $this->entityManager->persist($ProductCategory);
495 495
                         $count++;
@@ -511,7 +511,7 @@  discard block
 block discarded – undo
511 511
                     $this->entityManager->persist($ProductImage);
512 512
 
513 513
                     // 移動
514
-                    $file = new File($this->appConfig['image_temp_realdir'] . '/' . $add_image);
514
+                    $file = new File($this->appConfig['image_temp_realdir'].'/'.$add_image);
515 515
                     $file->move($this->appConfig['image_save_realdir']);
516 516
                 }
517 517
 
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
 
532 532
                     // 削除
533 533
                     $fs = new Filesystem();
534
-                    $fs->remove($this->appConfig['image_save_realdir'] . '/' . $delete_image);
534
+                    $fs->remove($this->appConfig['image_save_realdir'].'/'.$delete_image);
535 535
                 }
536 536
                 $this->entityManager->persist($Product);
537 537
                 $this->entityManager->flush();
@@ -666,7 +666,7 @@  discard block
 block discarded – undo
666 666
                     foreach ($deleteImages as $deleteImage) {
667 667
                         try {
668 668
                             $fs = new Filesystem();
669
-                            $fs->remove($this->appConfig['image_save_realdir'] . '/' . $deleteImage);
669
+                            $fs->remove($this->appConfig['image_save_realdir'].'/'.$deleteImage);
670 670
                         } catch (\Exception $e) {
671 671
                             // エラーが発生しても無視する
672 672
                         }
@@ -741,10 +741,10 @@  discard block
 block discarded – undo
741 741
 
742 742
                     // 画像ファイルを新規作成
743 743
                     $extension = pathinfo($Image->getFileName(), PATHINFO_EXTENSION);
744
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
744
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
745 745
                     try {
746 746
                         $fs = new Filesystem();
747
-                        $fs->copy($this->appConfig['image_save_realdir'] . '/' . $Image->getFileName(), $this->appConfig['image_save_realdir'] . '/' . $filename);
747
+                        $fs->copy($this->appConfig['image_save_realdir'].'/'.$Image->getFileName(), $this->appConfig['image_save_realdir'].'/'.$filename);
748 748
                     } catch (\Exception $e) {
749 749
                         // エラーが発生しても無視する
750 750
                     }
@@ -824,7 +824,7 @@  discard block
 block discarded – undo
824 824
         $em->getConfiguration()->setSQLLogger(null);
825 825
 
826 826
         $response = new StreamedResponse();
827
-        $response->setCallback(function () use ($app, $request) {
827
+        $response->setCallback(function() use ($app, $request) {
828 828
 
829 829
             // CSV種別を元に初期化.
830 830
             $this->csvExportService->initCsvType(CsvType::CSV_TYPE_PRODUCT);
@@ -864,7 +864,7 @@  discard block
 block discarded – undo
864 864
             // データ行の出力.
865 865
             $this->csvExportService->setExportQueryBuilder($qb);
866 866
 
867
-            $this->csvExportService->exportData(function ($entity, CsvExportService $csvService) use ($app, $request) {
867
+            $this->csvExportService->exportData(function($entity, CsvExportService $csvService) use ($app, $request) {
868 868
                 $Csvs = $csvService->getCsvs();
869 869
 
870 870
                 /** @var $Product \Eccube\Entity\Product */
@@ -907,9 +907,9 @@  discard block
 block discarded – undo
907 907
         });
908 908
 
909 909
         $now = new \DateTime();
910
-        $filename = 'product_' . $now->format('YmdHis') . '.csv';
910
+        $filename = 'product_'.$now->format('YmdHis').'.csv';
911 911
         $response->headers->set('Content-Type', 'application/octet-stream');
912
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
912
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
913 913
         $response->send();
914 914
 
915 915
         log_info('商品CSV出力ファイル名', array($filename));
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/PagenatorServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 {
12 12
     public function register(Container $app)
13 13
     {
14
-        $app['paginator'] = $app->protect(function () {
14
+        $app['paginator'] = $app->protect(function() {
15 15
             $paginator = new Paginator();
16 16
             $paginator->subscribe(new PaginatorListener());
17 17
 
Please login to merge, or discard this patch.
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.