Completed
Pull Request — master (#1504)
by Kentaro
60:07 queued 04:12
created
src/Eccube/Form/Type/SearchProductType.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
         $builder->add('category_id', 'entity', array(
43 43
             'class' => 'Eccube\Entity\Category',
44 44
             'property' => 'NameWithLevel',
45
-            'query_builder' => function (EntityRepository $er) {
45
+            'query_builder' => function(EntityRepository $er) {
46 46
                 return $er
47 47
                     ->createQueryBuilder('c')
48 48
                     ->orderBy('c.rank', 'DESC');
Please login to merge, or discard this patch.
src/Eccube/Form/Type/ShippingItemType.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
         $app = $this->app;
49 49
 
50 50
         $builder
51
-            ->addEventListener(FormEvents::PRE_SET_DATA, function ($event) use ($app) {
51
+            ->addEventListener(FormEvents::PRE_SET_DATA, function($event) use ($app) {
52 52
                 /** @var \Eccube\Entity\Shipping $data */
53 53
                 $data = $event->getData();
54 54
                 /** @var \Symfony\Component\Form\Form $form */
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
                         'empty_data' => null,
96 96
                     ));
97 97
             })
98
-            ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) {
98
+            ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) {
99 99
                 /** @var \Eccube\Entity\Shipping $data */
100 100
                 $data = $event->getData();
101 101
                 /** @var \Symfony\Component\Form\Form $form */
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
                 }
112 112
 
113 113
             })
114
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
114
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
115 115
                 /** @var \Eccube\Entity\Shipping $data */
116 116
                 $data = $event->getData();
117 117
                 /** @var \Symfony\Component\Form\Form $form */
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
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
                     new Assert\Regex(array('pattern' => '/^\d+$/')),
64 64
                 ),
65 65
             ))
66
-            ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($app) {
66
+            ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($app) {
67 67
                 $form = $event->getForm();
68 68
 
69 69
                 if ($app->isGranted('IS_AUTHENTICATED_FULLY')) {
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
                     $form->add('customer_address', 'entity', array(
73 73
                         'class' => 'Eccube\Entity\CustomerAddress',
74 74
                         'property' => 'shippingMultipleDefaultName',
75
-                        'query_builder' => function (EntityRepository $er) use ($Customer) {
75
+                        'query_builder' => function(EntityRepository $er) use ($Customer) {
76 76
                             return $er->createQueryBuilder('ca')
77 77
                                 ->where('ca.Customer = :Customer')
78 78
                                 ->orderBy("ca.id", "ASC")
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
                     }
105 105
                 }
106 106
             })
107
-            ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) {
107
+            ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) {
108 108
                 /** @var \Eccube\Entity\Shipping $data */
109 109
                 $data = $event->getData();
110 110
                 /** @var \Symfony\Component\Form\Form $form */
Please login to merge, or discard this patch.
src/Eccube/Form/Type/ShippingMultipleType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
         $app = $this->app;
48 48
 
49 49
         $builder
50
-            ->addEventListener(FormEvents::POST_SET_DATA, function ($event) use ($app) {
50
+            ->addEventListener(FormEvents::POST_SET_DATA, function($event) use ($app) {
51 51
                 /** @var \Eccube\Entity\ShipmentItem $data */
52 52
                 $data = $event->getData();
53 53
                 /** @var \Symfony\Component\Form\Form $form */
Please login to merge, or discard this patch.
src/Eccube/Form/Type/TelType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@
 block discarded – undo
76 76
         $builder->setAttribute('tel02_name', $options['tel02_name']);
77 77
         $builder->setAttribute('tel03_name', $options['tel03_name']);
78 78
         // todo 変
79
-        $builder->addEventListener(FormEvents::POST_BIND, function ($event) use ($builder) {
79
+        $builder->addEventListener(FormEvents::POST_BIND, function($event) use ($builder) {
80 80
             $form = $event->getForm();
81 81
             $count = 0;
82 82
             if ($form[$builder->getName().'01']->getData() != '') {
Please login to merge, or discard this patch.
src/Eccube/Plugin/AbstractPluginManager.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,8 @@
 block discarded – undo
17 17
         $config->registerMigrationsFromDirectory($migrationFilePath );
18 18
         $config->setMigrationsTableName(self::MIGRATION_TABLE_PREFIX.$pluginCode);
19 19
         $migration = new Migration($config);
20
-                                  // null 又は 'last' を渡すと最新バージョンまでマイグレートする
21
-                                  // 0か'first'を渡すと最初に戻る
20
+                                    // null 又は 'last' を渡すと最新バージョンまでマイグレートする
21
+                                    // 0か'first'を渡すと最初に戻る
22 22
         $migration->migrate($version, false); 
23 23
 
24 24
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,12 +9,12 @@
 block discarded – undo
9 9
 {
10 10
     CONST MIGRATION_TABLE_PREFIX = 'migration_';
11 11
 
12
-    public function migrationSchema($app,$migrationFilePath,$pluginCode,$version = null)
12
+    public function migrationSchema($app, $migrationFilePath, $pluginCode, $version = null)
13 13
     {
14 14
         $config = new Configuration($app['db']);
15 15
         $config->setMigrationsNamespace('DoctrineMigrations');
16 16
         $config->setMigrationsDirectory($migrationFilePath);
17
-        $config->registerMigrationsFromDirectory($migrationFilePath );
17
+        $config->registerMigrationsFromDirectory($migrationFilePath);
18 18
         $config->setMigrationsTableName(self::MIGRATION_TABLE_PREFIX.$pluginCode);
19 19
         $migration = new Migration($config);
20 20
                                   // null 又は 'last' を渡すと最新バージョンまでマイグレートする
Please login to merge, or discard this patch.
src/Eccube/Repository/OrderRepository.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -274,7 +274,7 @@
 block discarded – undo
274 274
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
275 275
             $qb
276 276
                 ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' .
277
-                           'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti')
277
+                            'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti')
278 278
                 ->setParameter('multi', $multi)
279 279
                 ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
280 280
         }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -270,7 +270,7 @@
 block discarded – undo
270 270
                 ->setParameter('order_id_start', $searchData['order_id_start']);
271 271
         }
272 272
         // multi
273
-        if (isset( $searchData['multi']) && Str::isNotBlank($searchData['multi'])) {
273
+        if (isset($searchData['multi']) && Str::isNotBlank($searchData['multi'])) {
274 274
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
275 275
             $qb
276 276
                 ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR '.
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20151023102323.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 
30 30
         $PageLayout = new PageLayout();
31 31
         $PageLayout->setDeviceType($DeviceType);
32
-        $PageLayout->setName( '商品購入/お届け先の追加');
32
+        $PageLayout->setName('商品購入/お届け先の追加');
33 33
         $PageLayout->setUrl('shopping_shipping_edit');
34 34
         $PageLayout->setFileName('Shopping/shipping_edit');
35 35
         $PageLayout->setEditFlg(2);
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
         $PageLayout = new PageLayout();
40 40
         $PageLayout->setDeviceType($DeviceType);
41
-        $PageLayout->setName( '商品購入/お届け先の複数指定(お届け先の追加)');
41
+        $PageLayout->setName('商品購入/お届け先の複数指定(お届け先の追加)');
42 42
         $PageLayout->setUrl('shopping_shipping_multiple_edit');
43 43
         $PageLayout->setFileName('Shopping/shipping_multiple_edit');
44 44
         $PageLayout->setEditFlg(2);
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 
48 48
         $PageLayout = new PageLayout();
49 49
         $PageLayout->setDeviceType($DeviceType);
50
-        $PageLayout->setName( '商品購入/購入エラー');
50
+        $PageLayout->setName('商品購入/購入エラー');
51 51
         $PageLayout->setUrl('shopping_error');
52 52
         $PageLayout->setFileName('Shopping/shopping_error');
53 53
         $PageLayout->setEditFlg(2);
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
         $PageLayout = new PageLayout();
58 58
         $PageLayout->setDeviceType($DeviceType);
59
-        $PageLayout->setName( 'ご利用ガイド');
59
+        $PageLayout->setName('ご利用ガイド');
60 60
         $PageLayout->setUrl('help_guide');
61 61
         $PageLayout->setFileName('Help/guide');
62 62
         $PageLayout->setEditFlg(2);
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
         $PageLayout = new PageLayout();
66 66
         $PageLayout->setDeviceType($DeviceType);
67
-        $PageLayout->setName( 'パスワード再発行(入力ページ)');
67
+        $PageLayout->setName('パスワード再発行(入力ページ)');
68 68
         $PageLayout->setUrl('forgot');
69 69
         $PageLayout->setFileName('Forgot/index');
70 70
         $PageLayout->setEditFlg(2);
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 
73 73
         $PageLayout = new PageLayout();
74 74
         $PageLayout->setDeviceType($DeviceType);
75
-        $PageLayout->setName( 'パスワード再発行(完了ページ)');
75
+        $PageLayout->setName('パスワード再発行(完了ページ)');
76 76
         $PageLayout->setUrl('forgot_complete');
77 77
         $PageLayout->setFileName('Forgot/complete');
78 78
         $PageLayout->setEditFlg(2);
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
         $PageLayout = new PageLayout();
83 83
         $PageLayout->setDeviceType($DeviceType);
84
-        $PageLayout->setName( 'パスワード変更((完了ページ)');
84
+        $PageLayout->setName('パスワード変更((完了ページ)');
85 85
         $PageLayout->setUrl('forgot_reset');
86 86
         $PageLayout->setFileName('Forgot/reset');
87 87
         $PageLayout->setEditFlg(2);
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20151116142354.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
         $PageLayout = new PageLayout();
30 30
         $PageLayout->setDeviceType($DeviceType);
31
-        $PageLayout->setName( '商品購入/配送方法選択');
31
+        $PageLayout->setName('商品購入/配送方法選択');
32 32
         $PageLayout->setUrl('shopping_delivery');
33 33
         $PageLayout->setFileName('Shopping/index');
34 34
         $PageLayout->setEditFlg(2);
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
         $PageLayout = new PageLayout();
39 39
         $PageLayout->setDeviceType($DeviceType);
40
-        $PageLayout->setName( '商品購入/支払方法選択');
40
+        $PageLayout->setName('商品購入/支払方法選択');
41 41
         $PageLayout->setUrl('shopping_payment');
42 42
         $PageLayout->setFileName('Shopping/index');
43 43
         $PageLayout->setEditFlg(2);
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 
47 47
         $PageLayout = new PageLayout();
48 48
         $PageLayout->setDeviceType($DeviceType);
49
-        $PageLayout->setName( '商品購入/お届け先変更');
49
+        $PageLayout->setName('商品購入/お届け先変更');
50 50
         $PageLayout->setUrl('shopping_shipping_change');
51 51
         $PageLayout->setFileName('Shopping/index');
52 52
         $PageLayout->setEditFlg(2);
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
         $PageLayout = new PageLayout();
57 57
         $PageLayout->setDeviceType($DeviceType);
58
-        $PageLayout->setName( '商品購入/お届け先変更');
58
+        $PageLayout->setName('商品購入/お届け先変更');
59 59
         $PageLayout->setUrl('shopping_shipping_edit_change');
60 60
         $PageLayout->setFileName('Shopping/index');
61 61
         $PageLayout->setEditFlg(2);
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
         $PageLayout = new PageLayout();
66 66
         $PageLayout->setDeviceType($DeviceType);
67
-        $PageLayout->setName( '商品購入/お届け先の複数指定');
67
+        $PageLayout->setName('商品購入/お届け先の複数指定');
68 68
         $PageLayout->setUrl('shopping_shipping_multiple_change');
69 69
         $PageLayout->setFileName('Shopping/index');
70 70
         $PageLayout->setEditFlg(2);
Please login to merge, or discard this patch.