Inspection of "Merge pull request #2689 from oywc410/admin_search..." - EC-CUBE/ec-cube - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — experimental/3.1 ( 323c18...10e424 )

unknown

created 2017-12-15 08:56 UTC

Status

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -55,13 +55,13 @@  discard block
 block discarded – undo
                 ->setParameter('shipping_id_start', $searchData['shipping_id_start']);
         }
         // multi
-        if (isset( $searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) {
+        if (isset($searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) {
             $multi = preg_match('/^\d{0,10}$/', $searchData['multi']) ? $searchData['multi'] : null;
             $qb
-                ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR ' .
+                ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR '.
                            's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti')
                 ->setParameter('multi', $multi)
-                ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
+                ->setParameter('likemulti', '%'.$searchData['multi'].'%');
         }
 
         // shipping_id_end
@@ -95,35 +95,35 @@  discard block
 block discarded – undo
         if (isset($searchData['name']) && StringUtil::isNotBlank($searchData['name'])) {
             $qb
                 ->andWhere('CONCAT(s.name01, s.name02) LIKE :name')
-                ->setParameter('name', '%' . $searchData['name'] . '%');
+                ->setParameter('name', '%'.$searchData['name'].'%');
         }
 
         // kana
         if (isset($searchData['kana']) && StringUtil::isNotBlank($searchData['kana'])) {
             $qb
                 ->andWhere('CONCAT(s.kana01, s.kana02) LIKE :kana')
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
         }
 
         // order_name
         if (isset($searchData['order_name']) && StringUtil::isNotBlank($searchData['order_name'])) {
             $qb
                 ->andWhere('CONCAT(o.name01, o.name02) LIKE :order_name')
-                ->setParameter('order_name', '%' . $searchData['order_name'] . '%');
+                ->setParameter('order_name', '%'.$searchData['order_name'].'%');
         }
 
         // order_kana
         if (isset($searchData['order_kana']) && StringUtil::isNotBlank($searchData['order_kana'])) {
             $qb
                 ->andWhere('CONCAT(o.kana01, s.kana02) LIKE :order_kana')
-                ->setParameter('kana', '%' . $searchData['order_kana'] . '%');
+                ->setParameter('kana', '%'.$searchData['order_kana'].'%');
         }
 
         // order_email
         if (isset($searchData['email']) && StringUtil::isNotBlank($searchData['email'])) {
             $qb
                 ->andWhere('o.email like :email')
-                ->setParameter('email', '%' . $searchData['email'] . '%');
+                ->setParameter('email', '%'.$searchData['email'].'%');
         }
 
         // tel
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
             $tel = preg_replace('/[^0-9]/ ', '', $searchData['tel']);
             $qb
                 ->andWhere('CONCAT(s.tel01, s.tel02, s.tel03) LIKE :tel')
-                ->setParameter('tel', '%' . $tel . '%');
+                ->setParameter('tel', '%'.$tel.'%');
         }
 
         // payment
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
         if (isset($searchData['buy_product_name']) && StringUtil::isNotBlank($searchData['buy_product_name'])) {
             $qb
                 ->andWhere('si.product_name LIKE :buy_product_name')
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
         }
 
         // Order By

Please login to merge, or discard this patch.

src/Eccube/Repository/OrderRepository.php 1 patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -109,14 +109,14 @@  discard block
 block discarded – undo
         if (isset($searchData['name']) && StringUtil::isNotBlank($searchData['name'])) {
             $qb
                 ->andWhere('CONCAT(o.name01, o.name02) LIKE :name')
-                ->setParameter('name', '%' . $searchData['name'] . '%');
+                ->setParameter('name', '%'.$searchData['name'].'%');
         }
 
         // kana
         if (isset($searchData['kana']) && StringUtil::isNotBlank($searchData['kana'])) {
             $qb
                 ->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana')
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
         }
 
         // email
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
             $qb
                 ->leftJoin('o.OrderItems', 'oi')
                 ->andWhere('oi.product_name LIKE :buy_product_name')
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
         }
 
         // Order By
@@ -273,14 +273,14 @@  discard block
 block discarded – undo
                 ->setParameter('order_id_start', $searchData['order_id_start']);
         }
         // multi
-        if (isset( $searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) {
+        if (isset($searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) {
             $multi = preg_match('/^\d{0,10}$/', $searchData['multi']) ? $searchData['multi'] : null;
             $qb
-                ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' .
-                           'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR ' .
+                ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR '.
+                           'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR '.
                            'o.code LIKE :likemulti')
                 ->setParameter('multi', $multi)
-                ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
+                ->setParameter('likemulti', '%'.$searchData['multi'].'%');
         }
 
         // order_id_end
@@ -317,21 +317,21 @@  discard block
 block discarded – undo
         if (isset($searchData['name']) && StringUtil::isNotBlank($searchData['name'])) {
             $qb
                 ->andWhere('CONCAT(o.name01, o.name02) LIKE :name')
-                ->setParameter('name', '%' . $searchData['name'] . '%');
+                ->setParameter('name', '%'.$searchData['name'].'%');
         }
 
         // kana
         if (isset($searchData['kana']) && StringUtil::isNotBlank($searchData['kana'])) {
             $qb
                 ->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana')
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
         }
 
         // email
         if (isset($searchData['email']) && StringUtil::isNotBlank($searchData['email'])) {
             $qb
                 ->andWhere('o.email like :email')
-                ->setParameter('email', '%' . $searchData['email'] . '%');
+                ->setParameter('email', '%'.$searchData['email'].'%');
         }
 
         // tel
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
             $tel = preg_replace('/[^0-9]/ ', '', $searchData['tel']);
             $qb
                 ->andWhere('CONCAT(o.tel01, o.tel02, o.tel03) LIKE :tel')
-                ->setParameter('tel', '%' . $tel . '%');
+                ->setParameter('tel', '%'.$tel.'%');
         }
 
         // sex
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
             $qb
                 ->leftJoin('o.OrderItems', 'oi')
                 ->andWhere('oi.product_name LIKE :buy_product_name')
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
         }
 
         // Order By

Please login to merge, or discard this 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{0,10}$/', $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

		@@ -109,14 +109,14 @@ discard block
		block discarded – undo
109	109	if (isset($searchData['name']) && StringUtil::isNotBlank($searchData['name'])) {
110	110	$qb
111	111	->andWhere('CONCAT(o.name01, o.name02) LIKE :name')
112		- ->setParameter('name', '%' . $searchData['name'] . '%');
	112	+ ->setParameter('name', '%'.$searchData['name'].'%');
113	113	}
114	114
115	115	// kana
116	116	if (isset($searchData['kana']) && StringUtil::isNotBlank($searchData['kana'])) {
117	117	$qb
118	118	->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana')
119		- ->setParameter('kana', '%' . $searchData['kana'] . '%');
	119	+ ->setParameter('kana', '%'.$searchData['kana'].'%');
120	120	}
121	121
122	122	// email
		@@ -247,7 +247,7 @@ discard block
		block discarded – undo
247	247	$qb
248	248	->leftJoin('o.OrderItems', 'oi')
249	249	->andWhere('oi.product_name LIKE :buy_product_name')
250		- ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
	250	+ ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
251	251	}
252	252
253	253	// Order By
		@@ -273,14 +273,14 @@ discard block
		block discarded – undo
273	273	->setParameter('order_id_start', $searchData['order_id_start']);
274	274	}
275	275	// multi
276		- if (isset( $searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) {
	276	+ if (isset($searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) {
277	277	$multi = preg_match('/^\d{0,10}$/', $searchData['multi']) ? $searchData['multi'] : null;
278	278	$qb
279		- ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' .
280		- 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR ' .
	279	+ ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR '.
	280	+ 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR '.
281	281	'o.code LIKE :likemulti')
282	282	->setParameter('multi', $multi)
283		- ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
	283	+ ->setParameter('likemulti', '%'.$searchData['multi'].'%');
284	284	}
285	285
286	286	// order_id_end
		@@ -317,21 +317,21 @@ discard block
		block discarded – undo
317	317	if (isset($searchData['name']) && StringUtil::isNotBlank($searchData['name'])) {
318	318	$qb
319	319	->andWhere('CONCAT(o.name01, o.name02) LIKE :name')
320		- ->setParameter('name', '%' . $searchData['name'] . '%');
	320	+ ->setParameter('name', '%'.$searchData['name'].'%');
321	321	}
322	322
323	323	// kana
324	324	if (isset($searchData['kana']) && StringUtil::isNotBlank($searchData['kana'])) {
325	325	$qb
326	326	->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana')
327		- ->setParameter('kana', '%' . $searchData['kana'] . '%');
	327	+ ->setParameter('kana', '%'.$searchData['kana'].'%');
328	328	}
329	329
330	330	// email
331	331	if (isset($searchData['email']) && StringUtil::isNotBlank($searchData['email'])) {
332	332	$qb
333	333	->andWhere('o.email like :email')
334		- ->setParameter('email', '%' . $searchData['email'] . '%');
	334	+ ->setParameter('email', '%'.$searchData['email'].'%');
335	335	}
336	336
337	337	// tel
		@@ -339,7 +339,7 @@ discard block
		block discarded – undo
339	339	$tel = preg_replace('/[^0-9]/ ', '', $searchData['tel']);
340	340	$qb
341	341	->andWhere('CONCAT(o.tel01, o.tel02, o.tel03) LIKE :tel')
342		- ->setParameter('tel', '%' . $tel . '%');
	342	+ ->setParameter('tel', '%'.$tel.'%');
343	343	}
344	344
345	345	// sex
		@@ -443,7 +443,7 @@ discard block
		block discarded – undo
443	443	$qb
444	444	->leftJoin('o.OrderItems', 'oi')
445	445	->andWhere('oi.product_name LIKE :buy_product_name')
446		- ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
	446	+ ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
447	447	}
448	448
449	449	// Order By

EC-CUBE / ec-cube

Push — experimental/3.1 ( 323c18...10e424 )

Status

Category

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch