Completed
Push — experimental/3.1 ( a10ce1...874d3d )
by Kiyotaka
28:39
created
src/Eccube/Doctrine/Query/WhereClause.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -53,6 +53,9 @@
 block discarded – undo
53 53
         $this->params = $params;
54 54
     }
55 55
 
56
+    /**
57
+     * @param Expr\Comparison $expr
58
+     */
56 59
     private static function newWhereClause($expr, $x, $y)
57 60
     {
58 61
         if ($y) {
Please login to merge, or discard this patch.
src/Eccube/Repository/QueryKey.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 {
29 29
     const PRODUCT_SEARCH = 'Product.getQueryBuilderBySearchData';
30 30
     const PRODUCT_SEARCH_ADMIN = 'Product.getQueryBuilderBySearchDataForAdmin';
31
-    const PRODUCT_GET_FAVORITE  = 'Product.getFavoriteProductQueryBuilderByCustomer';
31
+    const PRODUCT_GET_FAVORITE = 'Product.getFavoriteProductQueryBuilderByCustomer';
32 32
 
33 33
     const CUSTOMER_SEARCH = 'Customer.getQueryBuilderBySearchData';
34 34
 
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Shipping/EditController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -446,7 +446,7 @@
 block discarded – undo
446 446
                 $session->set('eccube.admin.order.product.search', $searchData);
447 447
                 $session->set('eccube.admin.order.product.search.page_no', $page_no);
448 448
             } else {
449
-                $searchData = (array)$session->get('eccube.admin.order.product.search');
449
+                $searchData = (array) $session->get('eccube.admin.order.product.search');
450 450
                 if (is_null($page_no)) {
451 451
                     $page_no = intval($session->get('eccube.admin.order.product.search.page_no'));
452 452
                 } else {
Please login to merge, or discard this patch.
src/Eccube/Repository/ShippingRepository.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
     /**
38 38
      *
39 39
      * @param  array        $searchData
40
-     * @return QueryBuilder
40
+     * @return \Doctrine\ORM\QueryBuilder
41 41
      */
42 42
     public function getQueryBuilderBySearchDataForAdmin($searchData)
43 43
     {
Please login to merge, or discard this 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.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -55,13 +55,13 @@  discard block
 block discarded – undo
55 55
                 ->setParameter('shipping_id_start', $searchData['shipping_id_start']);
56 56
         }
57 57
         // multi
58
-        if (isset( $searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) {
58
+        if (isset($searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) {
59 59
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
60 60
             $qb
61
-                ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR ' .
61
+                ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR '.
62 62
                            's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti')
63 63
                 ->setParameter('multi', $multi)
64
-                ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
64
+                ->setParameter('likemulti', '%'.$searchData['multi'].'%');
65 65
         }
66 66
 
67 67
         // shipping_id_end
@@ -95,35 +95,35 @@  discard block
 block discarded – undo
95 95
         if (isset($searchData['name']) && StringUtil::isNotBlank($searchData['name'])) {
96 96
             $qb
97 97
                 ->andWhere('CONCAT(s.name01, s.name02) LIKE :name')
98
-                ->setParameter('name', '%' . $searchData['name'] . '%');
98
+                ->setParameter('name', '%'.$searchData['name'].'%');
99 99
         }
100 100
 
101 101
         // kana
102 102
         if (isset($searchData['kana']) && StringUtil::isNotBlank($searchData['kana'])) {
103 103
             $qb
104 104
                 ->andWhere('CONCAT(s.kana01, s.kana02) LIKE :kana')
105
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
105
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
106 106
         }
107 107
 
108 108
         // order_name
109 109
         if (isset($searchData['order_name']) && StringUtil::isNotBlank($searchData['order_name'])) {
110 110
             $qb
111 111
                 ->andWhere('CONCAT(o.name01, o.name02) LIKE :order_name')
112
-                ->setParameter('order_name', '%' . $searchData['order_name'] . '%');
112
+                ->setParameter('order_name', '%'.$searchData['order_name'].'%');
113 113
         }
114 114
 
115 115
         // order_kana
116 116
         if (isset($searchData['order_kana']) && StringUtil::isNotBlank($searchData['order_kana'])) {
117 117
             $qb
118 118
                 ->andWhere('CONCAT(o.kana01, s.kana02) LIKE :order_kana')
119
-                ->setParameter('kana', '%' . $searchData['order_kana'] . '%');
119
+                ->setParameter('kana', '%'.$searchData['order_kana'].'%');
120 120
         }
121 121
 
122 122
         // order_email
123 123
         if (isset($searchData['email']) && StringUtil::isNotBlank($searchData['email'])) {
124 124
             $qb
125 125
                 ->andWhere('o.email like :email')
126
-                ->setParameter('email', '%' . $searchData['email'] . '%');
126
+                ->setParameter('email', '%'.$searchData['email'].'%');
127 127
         }
128 128
 
129 129
         // tel
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
             $tel = preg_replace('/[^0-9]/ ', '', $searchData['tel']);
132 132
             $qb
133 133
                 ->andWhere('CONCAT(s.tel01, s.tel02, s.tel03) LIKE :tel')
134
-                ->setParameter('tel', '%' . $tel . '%');
134
+                ->setParameter('tel', '%'.$tel.'%');
135 135
         }
136 136
 
137 137
         // payment
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
         if (isset($searchData['buy_product_name']) && StringUtil::isNotBlank($searchData['buy_product_name'])) {
228 228
             $qb
229 229
                 ->andWhere('si.product_name LIKE :buy_product_name')
230
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
230
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
231 231
         }
232 232
 
233 233
         // Order By
Please login to merge, or discard this patch.
app/Plugin/EntityEvent/ServiceProvider/EntityEventServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 {
13 13
     public function register(Container $app)
14 14
     {
15
-        $app['plugin.entity_event.base_info_listener'] = function (Container $container) {
15
+        $app['plugin.entity_event.base_info_listener'] = function(Container $container) {
16 16
             return new BaseInfoListener();
17 17
         };
18 18
     }
Please login to merge, or discard this patch.
app/Plugin/QueryCustomize/ServiceProvider/QueryCustomizeServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 {
13 13
     public function register(Container $app)
14 14
     {
15
-        $app['plugin.query_customize.customer_search'] = function (Container $container) {
15
+        $app['plugin.query_customize.customer_search'] = function(Container $container) {
16 16
             return new AdminCustomerCustomizer();
17 17
         };
18 18
     }
Please login to merge, or discard this patch.
src/Eccube/Command/RouterCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
94 94
             if (strtoupper($orderby) === "PATH") {
95 95
                 uasort(
96 96
                     $routes,
97
-                    function ($a, $b) {
97
+                    function($a, $b) {
98 98
                         return strcmp($a->getPath(), $b->getPath());
99 99
                     }
100 100
                 );
Please login to merge, or discard this patch.
app/Plugin/Strategy/ServiceProvider/StrategyServiceProvider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,14 +12,14 @@
 block discarded – undo
12 12
     public function register(Container $app)
13 13
     {
14 14
         // サンプルの空Strategyをコンテナに登録
15
-        $app['eccube.calculate.strategy.empty'] = function () {
15
+        $app['eccube.calculate.strategy.empty'] = function() {
16 16
             return new EmptyStrategy();
17 17
         };
18 18
 
19 19
         // 空Strategyを追加.
20 20
         $app->extend(
21 21
             'eccube.calculate.strategies',
22
-            function (CalculateStrategyCollection $Collection, Container $app) {
22
+            function(CalculateStrategyCollection $Collection, Container $app) {
23 23
                 $Collection->add($app['eccube.calculate.strategy.empty']);
24 24
 
25 25
                 return $Collection;
Please login to merge, or discard this patch.
PurchaseProcessors/ServiceProvider/PurchaseProcessorsServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
     {
15 15
         $app->extend(
16 16
             'eccube.purchase.flow.cart.item_processors',
17
-            function (ArrayCollection $processors, Container $app) {
17
+            function(ArrayCollection $processors, Container $app) {
18 18
                 $processors[] = new EmptyProcessor();
19 19
                 $processors[] = new ValidatableEmptyProcessor();
20 20
                 return $processors;
Please login to merge, or discard this patch.