Completed
Pull Request — experimental/3.1 (#2561)
by k-yamamura
222:41 queued 215:24
created
src/Eccube/Repository/OrderRepository.php 1 patch
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.
src/Eccube/Controller/Admin/Product/ProductClassController.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
                                 'allow_add' => true,
139 139
                                 'allow_delete' => true,
140 140
                                 'data' => $ProductClasses,
141
-                             ));
141
+                                ));
142 142
 
143 143
                         $event = new EventArgs(
144 144
                             array(
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/CsvImportController.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1155,11 +1155,11 @@
 block discarded – undo
1155 1155
     }
1156 1156
     
1157 1157
         /**
1158
-     * ProductCategory作成
1159
-     * @param \Eccube\Entity\Product $Product
1160
-     * @param \Eccube\Entity\Category $Category
1161
-     * @return ProductCategory
1162
-     */
1158
+         * ProductCategory作成
1159
+         * @param \Eccube\Entity\Product $Product
1160
+         * @param \Eccube\Entity\Category $Category
1161
+         * @return ProductCategory
1162
+         */
1163 1163
     private function makeProductCategory($Product, $Category, $rank)
1164 1164
     {
1165 1165
         $ProductCategory = new ProductCategory();
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Master/ProductListOrderByType.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -38,21 +38,21 @@
 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) {
42
-             $options = $event->getForm()->getConfig()->getOptions();
43
-             if (!$event->getData()) {
44
-                 $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues()));
45
-                 $event->setData($data);
46
-             }
47
-         });
48
-         $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
49
-             $options = $event->getForm()->getConfig()->getOptions();
50
-             $values = $options['choice_loader']->loadChoiceList()->getValues();
51
-             if (!in_array($event->getData(), $values)) {
52
-                 $data = current($values);
53
-                 $event->setData($data);
54
-             }
55
-         });
41
+            $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
42
+                $options = $event->getForm()->getConfig()->getOptions();
43
+                if (!$event->getData()) {
44
+                    $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues()));
45
+                    $event->setData($data);
46
+                }
47
+            });
48
+            $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
49
+                $options = $event->getForm()->getConfig()->getOptions();
50
+                $values = $options['choice_loader']->loadChoiceList()->getValues();
51
+                if (!in_array($event->getData(), $values)) {
52
+                    $data = current($values);
53
+                    $event->setData($data);
54
+                }
55
+            });
56 56
     }
57 57
 
58 58
     /**
Please login to merge, or discard this patch.
src/Eccube/Plugin/AbstractPluginManager.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,8 +18,8 @@
 block discarded – undo
18 18
         $config->setMigrationsTableName(self::MIGRATION_TABLE_PREFIX.$pluginCode);
19 19
         $migration = new Migration($config);
20 20
         $migration->setNoMigrationException(true);
21
-                                  // null 又は 'last' を渡すと最新バージョンまでマイグレートする
22
-                                  // 0か'first'を渡すと最初に戻る
21
+                                    // null 又は 'last' を渡すと最新バージョンまでマイグレートする
22
+                                    // 0か'first'を渡すと最初に戻る
23 23
         $migration->migrate($version, false); 
24 24
 
25 25
 
Please login to merge, or discard this patch.
src/Eccube/Repository/ShippingRepository.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
57 57
             $qb
58 58
                 ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR ' .
59
-                           's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti')
59
+                            's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti')
60 60
                 ->setParameter('multi', $multi)
61 61
                 ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
62 62
         }
Please login to merge, or discard this patch.
src/Eccube/Form/Type/TelType.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,6 @@
 block discarded – undo
59 59
     {
60 60
     }
61 61
     /**
62
-
63 62
      * {@inheritdoc}
64 63
      */
65 64
     public function buildForm(FormBuilderInterface $builder, array $options)
Please login to merge, or discard this patch.
src/Eccube/Resource/config/http_cache.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php return [
2
-  'http_cache' => 
3
-  [
2
+    'http_cache' => 
3
+    [
4 4
     'enabled' => false,
5 5
     'age' => 10,
6 6
     // フロントでキャッシュを適用させる画面のrouteを設定
@@ -17,5 +17,5 @@  discard block
 block discarded – undo
17 17
 //      'help_tradelaw',
18 18
 //      'help_agreement',
19 19
     ],
20
-  ],
20
+    ],
21 21
 ];
Please login to merge, or discard this patch.
src/Eccube/Resource/config/session_handler.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php return [
2
-  'session_handler' =>
3
-  [
2
+    'session_handler' =>
3
+    [
4 4
     // PHP/PHP拡張のセッションハンドラを利用する場合, trueに設定します。
5 5
     'enabled' => false,
6 6
 
@@ -15,5 +15,5 @@  discard block
 block discarded – undo
15 15
     // memcachedの設定例
16 16
     //'save_handler' => 'redis',
17 17
     //'save_path' => '127.0.0.1:6379',
18
-  ],
18
+    ],
19 19
 ];
Please login to merge, or discard this patch.