@@ -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') |
@@ -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) { |
@@ -92,19 +92,19 @@ |
||
| 92 | 92 | 'label' => 'SSLを強制', |
| 93 | 93 | 'required' => false, |
| 94 | 94 | )) |
| 95 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use($app) { |
|
| 95 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) use($app) { |
|
| 96 | 96 | $form = $event->getForm(); |
| 97 | 97 | $data = $form->getData(); |
| 98 | 98 | |
| 99 | 99 | $ips = preg_split("/\R/", $data['admin_allow_hosts'], null, PREG_SPLIT_NO_EMPTY); |
| 100 | 100 | |
| 101 | - foreach($ips as $ip) { |
|
| 101 | + foreach ($ips as $ip) { |
|
| 102 | 102 | $errors = $this->recursiveValidator->validate($ip, array( |
| 103 | 103 | new Assert\Ip(), |
| 104 | 104 | ) |
| 105 | 105 | ); |
| 106 | 106 | if ($errors->count() != 0) { |
| 107 | - $form['admin_allow_hosts']->addError(new FormError($ip . 'はIPv4アドレスではありません。')); |
|
| 107 | + $form['admin_allow_hosts']->addError(new FormError($ip.'はIPv4アドレスではありません。')); |
|
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | }) |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | apc_clear_cache(); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | -require __DIR__ . '/autoload.php'; |
|
| 29 | +require __DIR__.'/autoload.php'; |
|
| 30 | 30 | |
| 31 | 31 | set_time_limit(0); |
| 32 | 32 | ini_set('memory_limit', -1); |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | $loader = require __DIR__.'/autoload.php'; |
| 26 | 26 | |
| 27 | 27 | ini_set('display_errors', 'Off'); |
| 28 | -error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT); |
|
| 28 | +error_reporting(E_ALL&~E_DEPRECATED&~E_STRICT); |
|
| 29 | 29 | |
| 30 | 30 | // see http://silex.sensiolabs.org/doc/web_servers.html#php-5-4 |
| 31 | 31 | $filename = __DIR__.preg_replace('#(\?.*)$#', '', $_SERVER['REQUEST_URI']); |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | 'allow_delete' => true, |
| 208 | 208 | 'prototype' => true, |
| 209 | 209 | )) |
| 210 | - ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) { |
|
| 210 | + ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) { |
|
| 211 | 211 | /** @var \Eccube\Entity\Shipping $data */ |
| 212 | 212 | $data = $event->getData(); |
| 213 | 213 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | 'placeholder' => '指定なし', |
| 229 | 229 | 'required' => false, |
| 230 | 230 | 'data' => $DeliveryTime, |
| 231 | - 'query_builder' => function (EntityRepository $er) use ($Delivery) { |
|
| 231 | + 'query_builder' => function(EntityRepository $er) use ($Delivery) { |
|
| 232 | 232 | $qb = $er->createQueryBuilder('dt'); |
| 233 | 233 | if ($Delivery) { |
| 234 | 234 | $qb |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | 'mapped' => false, |
| 241 | 241 | )); |
| 242 | 242 | }) |
| 243 | - ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
| 243 | + ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) { |
|
| 244 | 244 | $data = $event->getData(); |
| 245 | 245 | $form = $event->getForm(); |
| 246 | 246 | |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | 'choice_label' => 'delivery_time', |
| 262 | 262 | 'placeholder' => '指定なし', |
| 263 | 263 | 'required' => false, |
| 264 | - 'query_builder' => function (EntityRepository $er) use ($Delivery) { |
|
| 264 | + 'query_builder' => function(EntityRepository $er) use ($Delivery) { |
|
| 265 | 265 | $qb = $er->createQueryBuilder('dt'); |
| 266 | 266 | if ($Delivery) { |
| 267 | 267 | $qb |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | 'mapped' => false, |
| 274 | 274 | )); |
| 275 | 275 | }) |
| 276 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 276 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 277 | 277 | $form = $event->getForm(); |
| 278 | 278 | $OrderItems = $form['OrderItems']->getData(); |
| 279 | 279 | |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | $form['shipping_delivery_date']->addError(new FormError('商品が追加されていません。')); |
| 283 | 283 | } |
| 284 | 284 | }) |
| 285 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 285 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 286 | 286 | $form = $event->getForm(); |
| 287 | 287 | $Shipping = $event->getData(); |
| 288 | 288 | $Delivery = $Shipping->getDelivery(); |