Completed
Pull Request — master (#1504)
by Kentaro
60:07 queued 04:12
created
src/Eccube/Form/Type/Admin/ProductType.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -72,10 +72,10 @@
 block discarded – undo
72 72
                 'required' => false,
73 73
             ))
74 74
             ->add('Category', 'category', array(
75
-               'label' => '商品カテゴリ',
76
-               'multiple' => true,
77
-               'expanded' => true,
78
-               'mapped' => false,
75
+                'label' => '商品カテゴリ',
76
+                'multiple' => true,
77
+                'expanded' => true,
78
+                'mapped' => false,
79 79
             ))
80 80
 
81 81
             // 詳細な説明
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/SecurityType.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,8 +55,8 @@
 block discarded – undo
55 55
                     new Assert\NotBlank(),
56 56
                     new Assert\Length(array('max' => $this->config['stext_len'])),
57 57
                     new Assert\Regex(array(
58
-                       'pattern' => "/^[0-9a-zA-Z]+$/",
59
-                   )),
58
+                        'pattern' => "/^[0-9a-zA-Z]+$/",
59
+                    )),
60 60
                 ),
61 61
             ))
62 62
             ->add('admin_allow_host', 'textarea', array(
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
@@ -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.
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/Setting/System/SystemController.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
 
49 49
                 return $phpinfo;
50 50
 
51
-               break;
51
+                break;
52 52
             default:
53 53
                 break;
54 54
         }
Please login to merge, or discard this patch.
src/Eccube/Repository/PluginEventHandlerRepository.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -69,11 +69,11 @@  discard block
 block discarded – undo
69 69
 
70 70
         $qb = $this->createQueryBuilder('e');
71 71
         $qb->andWhere("e.priority >= $range_end ")
72
-           ->andWhere("e.priority <= $range_start ")
73
-           ->andWhere('e.event = :event')
74
-           ->setParameter('event',$event)
75
-           ->setMaxResults(1)
76
-           ->orderBy('e.priority','ASC');
72
+            ->andWhere("e.priority <= $range_start ")
73
+            ->andWhere('e.event = :event')
74
+            ->setParameter('event',$event)
75
+            ->setMaxResults(1)
76
+            ->orderBy('e.priority','ASC');
77 77
 
78 78
         $result=$qb->getQuery()->getResult();
79 79
         if (count($result)) {
@@ -90,14 +90,14 @@  discard block
 block discarded – undo
90 90
         $qb = $this->createQueryBuilder('e');
91 91
 
92 92
         $qb->andWhere("e.priority >= $range_end ")
93
-           ->andWhere("e.priority <= $range_start ")
94
-           ->andWhere("e.del_flg = 0 ")
95
-           ->andWhere('e.priority '.($up ?  '>' : '<' ).' :pri')
96
-           ->andWhere('e.event = :event')
97
-           ->setParameter('event',$pluginEventHandler->getEvent())
98
-           ->setParameter('pri',  $pluginEventHandler->getPriority()  )
99
-           ->setMaxResults(1)
100
-           ->orderBy('e.priority', ($up ? 'ASC':'DESC' )  );
93
+            ->andWhere("e.priority <= $range_start ")
94
+            ->andWhere("e.del_flg = 0 ")
95
+            ->andWhere('e.priority '.($up ?  '>' : '<' ).' :pri')
96
+            ->andWhere('e.event = :event')
97
+            ->setParameter('event',$pluginEventHandler->getEvent())
98
+            ->setParameter('pri',  $pluginEventHandler->getPriority()  )
99
+            ->setMaxResults(1)
100
+            ->orderBy('e.priority', ($up ? 'ASC':'DESC' )  );
101 101
 
102 102
         $result=$qb->getQuery()->getResult();
103 103
 
Please login to merge, or discard this patch.