@@ -38,7 +38,7 @@ |
||
38 | 38 | { |
39 | 39 | $builder->addEventListener( |
40 | 40 | FormEvents::PRE_SET_DATA, |
41 | - function (FormEvent $event) { |
|
41 | + function(FormEvent $event) { |
|
42 | 42 | $form = $event->getForm(); |
43 | 43 | $config = $form->getConfig(); |
44 | 44 | // data_classオプションが必要 |
@@ -16,7 +16,7 @@ |
||
16 | 16 | return new \Mobile_Detect(); |
17 | 17 | }; |
18 | 18 | |
19 | - $app['mobile_detect.device_type'] = function ($app) { |
|
19 | + $app['mobile_detect.device_type'] = function($app) { |
|
20 | 20 | if ($app['mobile_detect']->isMobile()) { |
21 | 21 | return \Eccube\Entity\Master\DeviceType::DEVICE_TYPE_SP; |
22 | 22 | } else { |
@@ -56,7 +56,7 @@ |
||
56 | 56 | |
57 | 57 | /** |
58 | 58 | * JoinClause constructor. |
59 | - * @param $leftJoin |
|
59 | + * @param boolean $leftJoin |
|
60 | 60 | * @param $join |
61 | 61 | * @param $alias |
62 | 62 | * @param $conditionType |
@@ -37,7 +37,7 @@ |
||
37 | 37 | |
38 | 38 | /** |
39 | 39 | * OrderByClause constructor. |
40 | - * @param $sort |
|
40 | + * @param string $sort |
|
41 | 41 | * @param string $order |
42 | 42 | */ |
43 | 43 | function __construct($sort, $order = 'asc') |
@@ -53,6 +53,9 @@ |
||
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) { |
@@ -28,7 +28,7 @@ |
||
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 |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | // 支払い方法のプルダウンを生成 |
86 | 86 | $builder->addEventListener( |
87 | 87 | FormEvents::PRE_SET_DATA, |
88 | - function (FormEvent $event) { |
|
88 | + function(FormEvent $event) { |
|
89 | 89 | /** @var Order $Order */ |
90 | 90 | $Order = $event->getData(); |
91 | 91 | if (is_null($Order) || !$Order->getId()) { |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | // TODO Calculatorで行うのが適切. |
134 | 134 | $builder->addEventListener( |
135 | 135 | FormEvents::POST_SUBMIT, |
136 | - function (FormEvent $event) { |
|
136 | + function(FormEvent $event) { |
|
137 | 137 | /** @var Order $Order */ |
138 | 138 | $Order = $event->getData(); |
139 | 139 | $Payment = $Order->getPayment(); |
@@ -446,7 +446,7 @@ |
||
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 { |
@@ -37,7 +37,7 @@ |
||
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 | { |
@@ -56,7 +56,7 @@ |
||
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 | } |
@@ -55,13 +55,13 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |