@@ -63,7 +63,7 @@ |
||
| 63 | 63 | public function hasProductByName($productName) |
| 64 | 64 | { |
| 65 | 65 | $OrderItems = $this->filter( |
| 66 | - function (ItemInterface $OrderItem) use ($productName) { |
|
| 66 | + function(ItemInterface $OrderItem) use ($productName) { |
|
| 67 | 67 | /* @var OrderItem $OrderItem */ |
| 68 | 68 | return $OrderItem->getProductName() == $productName; |
| 69 | 69 | }); |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | public function getProductClasses() |
| 32 | 32 | { |
| 33 | 33 | return $this->filter( |
| 34 | - function (ItemInterface $OrderItem) { |
|
| 34 | + function(ItemInterface $OrderItem) { |
|
| 35 | 35 | return $OrderItem->isProduct(); |
| 36 | 36 | }); |
| 37 | 37 | } |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | public function getDeliveryFees() |
| 40 | 40 | { |
| 41 | 41 | return $this->filter( |
| 42 | - function (ItemInterface $OrderItem) { |
|
| 42 | + function(ItemInterface $OrderItem) { |
|
| 43 | 43 | return $OrderItem->isDeliveryFee(); |
| 44 | 44 | }); |
| 45 | 45 | } |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | public function getCharges() |
| 48 | 48 | { |
| 49 | 49 | return $this->filter( |
| 50 | - function (ItemInterface $OrderItem) { |
|
| 50 | + function(ItemInterface $OrderItem) { |
|
| 51 | 51 | return $OrderItem->isCharge(); |
| 52 | 52 | }); |
| 53 | 53 | } |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | public function getDiscounts() |
| 56 | 56 | { |
| 57 | 57 | return $this->filter( |
| 58 | - function (ItemInterface $OrderItem) { |
|
| 58 | + function(ItemInterface $OrderItem) { |
|
| 59 | 59 | return $OrderItem->isDiscount(); |
| 60 | 60 | }); |
| 61 | 61 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | public function hasProductByName($productName) |
| 69 | 69 | { |
| 70 | 70 | $OrderItems = $this->filter( |
| 71 | - function (ItemInterface $OrderItem) use ($productName) { |
|
| 71 | + function(ItemInterface $OrderItem) use ($productName) { |
|
| 72 | 72 | /* @var OrderItem $OrderItem */ |
| 73 | 73 | return $OrderItem->getProductName() == $productName; |
| 74 | 74 | }); |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | */ |
| 86 | 86 | public function hasItemByOrderItemType($OrderItemType) |
| 87 | 87 | { |
| 88 | - $filteredItems = $this->filter(function (ItemInterface $OrderItem) use ($OrderItemType) { |
|
| 88 | + $filteredItems = $this->filter(function(ItemInterface $OrderItem) use ($OrderItemType) { |
|
| 89 | 89 | /* @var OrderItem $OrderItem */ |
| 90 | 90 | return $OrderItem->getOrderItemType() && $OrderItem->getOrderItemType()->getId() == $OrderItemType->getId(); |
| 91 | 91 | }); |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | public function sort() |
| 102 | 102 | { |
| 103 | 103 | $Items = $this->toArray(); |
| 104 | - usort($Items, function (ItemInterface $a, ItemInterface $b) { |
|
| 104 | + usort($Items, function(ItemInterface $a, ItemInterface $b) { |
|
| 105 | 105 | if ($a->getOrderItemType() === $b->getOrderItemType()) { |
| 106 | 106 | return ($a->getId() < $b->getId()) ? -1 : 1; |
| 107 | 107 | } elseif ($a->isProduct()) { |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | $app = $this->app; |
| 62 | 62 | |
| 63 | 63 | $builder |
| 64 | - ->addEventListener(FormEvents::POST_SET_DATA, function ($event) use ($app) { |
|
| 64 | + ->addEventListener(FormEvents::POST_SET_DATA, function($event) use ($app) { |
|
| 65 | 65 | /** @var \Eccube\Entity\OrderItem $data */ |
| 66 | 66 | $data = $event->getData(); |
| 67 | 67 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | $app = $this->app; |
| 179 | 179 | // XXX price を priceIncTax にセットし直す |
| 180 | 180 | // OrderItem::getTotalPrice でもやっているので、どこか一箇所にまとめたい |
| 181 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($app) { |
|
| 181 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($app) { |
|
| 182 | 182 | /** @var \Eccube\Entity\OrderItem $OrderItem */ |
| 183 | 183 | $OrderItem = $event->getData(); |
| 184 | 184 | $TaxDisplayType = $OrderItem->getTaxDisplayType(); |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | |
| 197 | 197 | $event->setData($OrderItem); |
| 198 | 198 | }); |
| 199 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) { |
|
| 199 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) { |
|
| 200 | 200 | // モーダルからのPOST時に、金額等をセットする. |
| 201 | 201 | if ('modal' === $this->requestStack->getCurrentRequest()->get('modal')) { |
| 202 | 202 | $data = $event->getData(); |
@@ -266,17 +266,13 @@ discard block |
||
| 266 | 266 | $data['product_name'] = $Product->getName(); |
| 267 | 267 | $data['product_code'] = $ProductClass->getCode(); |
| 268 | 268 | $data['class_name1'] = $ProductClass->hasClassCategory1() ? |
| 269 | - $ProductClass->getClassCategory1()->getClassName() : |
|
| 270 | - null; |
|
| 269 | + $ProductClass->getClassCategory1()->getClassName() : null; |
|
| 271 | 270 | $data['class_name2'] = $ProductClass->hasClassCategory2() ? |
| 272 | - $ProductClass->getClassCategory2()->getClassName() : |
|
| 273 | - null; |
|
| 271 | + $ProductClass->getClassCategory2()->getClassName() : null; |
|
| 274 | 272 | $data['class_category_name1'] = $ProductClass->hasClassCategory1() ? |
| 275 | - $ProductClass->getClassCategory1()->getName() : |
|
| 276 | - null; |
|
| 273 | + $ProductClass->getClassCategory1()->getName() : null; |
|
| 277 | 274 | $data['class_category_name2'] = $ProductClass->hasClassCategory2() ? |
| 278 | - $ProductClass->getClassCategory2()->getName() : |
|
| 279 | - null; |
|
| 275 | + $ProductClass->getClassCategory2()->getName() : null; |
|
| 280 | 276 | $data['price'] = $ProductClass->getPrice02(); |
| 281 | 277 | $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity']; |
| 282 | 278 | $data['tax_type'] = TaxType::TAXATION; |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | 'label' => false, |
| 47 | 47 | 'class' => 'Eccube\Entity\Page', |
| 48 | 48 | 'choice_label' => 'name', |
| 49 | - 'query_builder' => function (EntityRepository $er) { |
|
| 49 | + 'query_builder' => function(EntityRepository $er) { |
|
| 50 | 50 | return $er |
| 51 | 51 | ->createQueryBuilder('l') |
| 52 | 52 | ->where('l.id <> 0') |
@@ -109,14 +109,14 @@ discard block |
||
| 109 | 109 | if (isset($searchData['name']) && Str::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']) && Str::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 | |
@@ -247,7 +247,7 @@ discard block |
||
| 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,13 +273,13 @@ discard block |
||
| 273 | 273 | ->setParameter('order_id_start', $searchData['order_id_start']); |
| 274 | 274 | } |
| 275 | 275 | // multi |
| 276 | - if (isset( $searchData['multi']) && Str::isNotBlank($searchData['multi'])) { |
|
| 276 | + if (isset($searchData['multi']) && Str::isNotBlank($searchData['multi'])) { |
|
| 277 | 277 | $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null; |
| 278 | 278 | $qb |
| 279 | - ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' . |
|
| 279 | + ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR '. |
|
| 280 | 280 | 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti') |
| 281 | 281 | ->setParameter('multi', $multi) |
| 282 | - ->setParameter('likemulti', '%' . $searchData['multi'] . '%'); |
|
| 282 | + ->setParameter('likemulti', '%'.$searchData['multi'].'%'); |
|
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | // order_id_end |
@@ -316,28 +316,28 @@ discard block |
||
| 316 | 316 | if (isset($searchData['name']) && Str::isNotBlank($searchData['name'])) { |
| 317 | 317 | $qb |
| 318 | 318 | ->andWhere('CONCAT(o.name01, o.name02) LIKE :name') |
| 319 | - ->setParameter('name', '%' . $searchData['name'] . '%'); |
|
| 319 | + ->setParameter('name', '%'.$searchData['name'].'%'); |
|
| 320 | 320 | } |
| 321 | 321 | |
| 322 | 322 | // kana |
| 323 | 323 | if (isset($searchData['kana']) && Str::isNotBlank($searchData['kana'])) { |
| 324 | 324 | $qb |
| 325 | 325 | ->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana') |
| 326 | - ->setParameter('kana', '%' . $searchData['kana'] . '%'); |
|
| 326 | + ->setParameter('kana', '%'.$searchData['kana'].'%'); |
|
| 327 | 327 | } |
| 328 | 328 | |
| 329 | 329 | |
| 330 | 330 | if (isset($searchData['email']) && Str::isNotBlank($searchData['email'])) { |
| 331 | 331 | $qb |
| 332 | 332 | ->andWhere('o.email like :email') |
| 333 | - ->setParameter('email', '%' . $searchData['email'] . '%'); |
|
| 333 | + ->setParameter('email', '%'.$searchData['email'].'%'); |
|
| 334 | 334 | } |
| 335 | 335 | |
| 336 | 336 | // tel |
| 337 | 337 | if (isset($searchData['tel']) && Str::isNotBlank($searchData['tel'])) { |
| 338 | 338 | $qb |
| 339 | 339 | ->andWhere('CONCAT(o.tel01, o.tel02, o.tel03) LIKE :tel') |
| 340 | - ->setParameter('tel', '%' . $searchData['tel'] . '%'); |
|
| 340 | + ->setParameter('tel', '%'.$searchData['tel'].'%'); |
|
| 341 | 341 | } |
| 342 | 342 | |
| 343 | 343 | // sex |
@@ -441,7 +441,7 @@ discard block |
||
| 441 | 441 | $qb |
| 442 | 442 | ->leftJoin('o.OrderItems', 'oi') |
| 443 | 443 | ->andWhere('oi.product_name LIKE :buy_product_name') |
| 444 | - ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%'); |
|
| 444 | + ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%'); |
|
| 445 | 445 | } |
| 446 | 446 | |
| 447 | 447 | // Order By |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | ))); |
| 257 | 257 | |
| 258 | 258 | // 選択された支払い方法の名称をエンティティにコピーする |
| 259 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 259 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 260 | 260 | $Order = $event->getData(); |
| 261 | 261 | $Payment = $Order->getPayment(); |
| 262 | 262 | if (!is_null($Payment)) { |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | } |
| 265 | 265 | }); |
| 266 | 266 | // 会員受注の場合、会員の性別/職業/誕生日をエンティティにコピーする |
| 267 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 267 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 268 | 268 | $Order = $event->getData(); |
| 269 | 269 | $Customer = $Order->getCustomer(); |
| 270 | 270 | if (!is_null($Customer)) { |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | foreach ($this->paths as $path) { |
| 75 | - if ( ! is_dir($path)) { |
|
| 75 | + if (!is_dir($path)) { |
|
| 76 | 76 | throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path); |
| 77 | 77 | } |
| 78 | 78 | |
@@ -81,14 +81,14 @@ discard block |
||
| 81 | 81 | new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS), |
| 82 | 82 | \RecursiveIteratorIterator::LEAVES_ONLY |
| 83 | 83 | ), |
| 84 | - '/^.+' . preg_quote($this->fileExtension) . '$/i', |
|
| 84 | + '/^.+'.preg_quote($this->fileExtension).'$/i', |
|
| 85 | 85 | \RecursiveRegexIterator::GET_MATCH |
| 86 | 86 | ); |
| 87 | 87 | |
| 88 | 88 | foreach ($iterator as $file) { |
| 89 | 89 | $sourceFile = $file[0]; |
| 90 | 90 | |
| 91 | - if ( ! preg_match('(^phar:)i', $sourceFile)) { |
|
| 91 | + if (!preg_match('(^phar:)i', $sourceFile)) { |
|
| 92 | 92 | $sourceFile = realpath($sourceFile); |
| 93 | 93 | } |
| 94 | 94 | |
@@ -133,15 +133,15 @@ discard block |
||
| 133 | 133 | $namespaceEndIndex = $tokens->getNextTokenOfKind($namespaceIndex, [';']); |
| 134 | 134 | $namespace = $tokens->generatePartialCode($tokens->getNextMeaningfulToken($namespaceIndex), $tokens->getPrevMeaningfulToken($namespaceEndIndex)); |
| 135 | 135 | $className = $tokens[$classNameTokenIndex]->getContent(); |
| 136 | - $fqcn = $namespace . '\\' . $className; |
|
| 137 | - if (class_exists($fqcn) && ! $this->isTransient($fqcn)) { |
|
| 136 | + $fqcn = $namespace.'\\'.$className; |
|
| 137 | + if (class_exists($fqcn) && !$this->isTransient($fqcn)) { |
|
| 138 | 138 | if (in_array($sourceFile, $this->newProxyFiles)) { |
| 139 | - $newClassName = $className . Str::random(12); |
|
| 139 | + $newClassName = $className.Str::random(12); |
|
| 140 | 140 | $tokens[$classNameTokenIndex] = new Token([T_STRING, $newClassName]); |
| 141 | 141 | $newFilePath = $this->outputDir."${newClassName}.php"; |
| 142 | 142 | file_put_contents($newFilePath, $tokens->generateCode()); |
| 143 | 143 | require_once $newFilePath; |
| 144 | - $results[] = $namespace . "\\${newClassName}"; |
|
| 144 | + $results[] = $namespace."\\${newClassName}"; |
|
| 145 | 145 | } else { |
| 146 | 146 | $results[] = $fqcn; |
| 147 | 147 | } |
@@ -400,15 +400,15 @@ |
||
| 400 | 400 | foreach ($finder as $content) { |
| 401 | 401 | $permission = $content->getPerms(); |
| 402 | 402 | // see also http://www.php.net/fileperms |
| 403 | - if (!($permission & 0x0010) || !($permission & 0x0002)) { |
|
| 403 | + if (!($permission&0x0010) || !($permission&0x0002)) { |
|
| 404 | 404 | $realPath = $content->getRealPath(); |
| 405 | 405 | if ($verbose) { |
| 406 | 406 | out(sprintf('%s %s to ', $realPath, substr(sprintf('%o', $permission), -4)), 'info', false); |
| 407 | 407 | } |
| 408 | - $permission = !($permission & 0x0020) ? $permission += 040 : $permission; // g+r |
|
| 409 | - $permission = !($permission & 0x0010) ? $permission += 020 : $permission; // g+w |
|
| 410 | - $permission = !($permission & 0x0004) ? $permission += 04 : $permission; // o+r |
|
| 411 | - $permission = !($permission & 0x0002) ? $permission += 02 : $permission; // o+w |
|
| 408 | + $permission = !($permission&0x0020) ? $permission += 040 : $permission; // g+r |
|
| 409 | + $permission = !($permission&0x0010) ? $permission += 020 : $permission; // g+w |
|
| 410 | + $permission = !($permission&0x0004) ? $permission += 04 : $permission; // o+r |
|
| 411 | + $permission = !($permission&0x0002) ? $permission += 02 : $permission; // o+w |
|
| 412 | 412 | $result = chmod($realPath, $permission); |
| 413 | 413 | if ($verbose) { |
| 414 | 414 | if ($result) { |