@@ -32,7 +32,7 @@ |
||
| 32 | 32 | public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias) |
| 33 | 33 | { |
| 34 | 34 | if ($targetEntity->reflClass->getName() === 'Eccube\Entity\ProductClass') { |
| 35 | - return $targetTableAlias . '.stock >= 1 OR ' . $targetTableAlias . '.stock_unlimited = 1'; |
|
| 35 | + return $targetTableAlias.'.stock >= 1 OR '.$targetTableAlias.'.stock_unlimited = 1'; |
|
| 36 | 36 | } else { |
| 37 | 37 | return ""; |
| 38 | 38 | } |
@@ -33,12 +33,12 @@ |
||
| 33 | 33 | { |
| 34 | 34 | // 決済処理中/購入処理中を除く. |
| 35 | 35 | if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Order') { |
| 36 | - return $targetTableAlias . '.status <> 7 AND ' . $targetTableAlias . '.status <> 8'; |
|
| 36 | + return $targetTableAlias.'.status <> 7 AND '.$targetTableAlias.'.status <> 8'; |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | // 決済処理中/購入処理中を除く. |
| 40 | 40 | if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Master\OrderStatus') { |
| 41 | - return $targetTableAlias . '.id <> 7 AND ' . $targetTableAlias . '.id <> 8'; |
|
| 41 | + return $targetTableAlias.'.id <> 7 AND '.$targetTableAlias.'.id <> 8'; |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | return ''; |
@@ -148,7 +148,7 @@ |
||
| 148 | 148 | 'required' => false, |
| 149 | 149 | 'value' => 1, |
| 150 | 150 | )) |
| 151 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) { |
|
| 151 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) { |
|
| 152 | 152 | $form = $event->getForm(); |
| 153 | 153 | $data = $form->getData(); |
| 154 | 154 | |
@@ -62,10 +62,10 @@ |
||
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | if (empty($options['lastname_name'])) { |
| 65 | - $options['lastname_name'] = $builder->getName() . '01'; |
|
| 65 | + $options['lastname_name'] = $builder->getName().'01'; |
|
| 66 | 66 | } |
| 67 | 67 | if (empty($options['firstname_name'])) { |
| 68 | - $options['firstname_name'] = $builder->getName() . '02'; |
|
| 68 | + $options['firstname_name'] = $builder->getName().'02'; |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | $builder |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | if ($this->config['auth_type'] == 'PLAIN') { |
| 54 | 54 | $res = $raw; |
| 55 | 55 | } else { |
| 56 | - $res = hash_hmac($this->config['password_hash_algos'], $raw . ':' . $this->config['auth_magic'], $salt); |
|
| 56 | + $res = hash_hmac($this->config['password_hash_algos'], $raw.':'.$this->config['auth_magic'], $salt); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | return $res; |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | } else { |
| 82 | 82 | // 旧バージョン(2.11未満)からの移行を考慮 |
| 83 | 83 | if (empty($salt)) { |
| 84 | - $hash = sha1($raw . ':' . $this->config['auth_magic']); |
|
| 84 | + $hash = sha1($raw.':'.$this->config['auth_magic']); |
|
| 85 | 85 | } else { |
| 86 | 86 | $hash = $this->encodePassword($raw, $salt); |
| 87 | 87 | } |
@@ -59,7 +59,7 @@ |
||
| 59 | 59 | 'label' => '拒否URL', |
| 60 | 60 | 'required' => false, |
| 61 | 61 | )) |
| 62 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 62 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 63 | 63 | $form = $event->getForm(); |
| 64 | 64 | |
| 65 | 65 | $Authority = $form['Authority']->getData(); |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | |
| 37 | 37 | public function __construct(Application $app) |
| 38 | 38 | { |
| 39 | - $this->app = $app; |
|
| 39 | + $this->app = $app; |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | public function supportsAttribute($attribute) |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | { |
| 308 | 308 | $config = $this->config; |
| 309 | 309 | |
| 310 | - return function ($value) use ($config) { |
|
| 310 | + return function($value) use ($config) { |
|
| 311 | 311 | return mb_convert_encoding( |
| 312 | 312 | (string) $value, $config['csv_export_encoding'], 'UTF-8' |
| 313 | 313 | ); |
@@ -431,7 +431,7 @@ discard block |
||
| 431 | 431 | if ($Conditions instanceof ArrayCollection) { |
| 432 | 432 | $Conditions = new ArrayCollection( |
| 433 | 433 | array_map( |
| 434 | - function ($Entity) use ($em) { |
|
| 434 | + function($Entity) use ($em) { |
|
| 435 | 435 | return $em->getRepository(get_class($Entity))->find($Entity->getId()); |
| 436 | 436 | }, $Conditions->toArray() |
| 437 | 437 | ) |
@@ -88,7 +88,7 @@ |
||
| 88 | 88 | ->setCompanyName($Customer->getCompanyName()) |
| 89 | 89 | ->setZip01($Customer->getZip01()) |
| 90 | 90 | ->setZip02($Customer->getZip02()) |
| 91 | - ->setZipcode($Customer->getZip01() . $Customer->getZip02()) |
|
| 91 | + ->setZipcode($Customer->getZip01().$Customer->getZip02()) |
|
| 92 | 92 | ->setPref($Customer->getPref()) |
| 93 | 93 | ->setAddr01($Customer->getAddr01()) |
| 94 | 94 | ->setAddr02($Customer->getAddr02()) |
@@ -26,7 +26,6 @@ discard block |
||
| 26 | 26 | use Doctrine\ORM\EntityManager; |
| 27 | 27 | use Eccube\Annotation\Inject; |
| 28 | 28 | use Eccube\Application; |
| 29 | -use Eccube\Common\Constant; |
|
| 30 | 29 | use Eccube\Controller\AbstractController; |
| 31 | 30 | use Eccube\Entity\CustomerAddress; |
| 32 | 31 | use Eccube\Event\EccubeEvents; |
@@ -35,12 +34,10 @@ discard block |
||
| 35 | 34 | use Eccube\Repository\CustomerRepository; |
| 36 | 35 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 37 | 36 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 38 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
|
| 39 | 37 | use Symfony\Component\EventDispatcher\EventDispatcher; |
| 40 | 38 | use Symfony\Component\Form\FormFactory; |
| 41 | 39 | use Symfony\Component\HttpFoundation\Request; |
| 42 | 40 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
| 43 | -use Symfony\Component\Security\Core\Encoder\EncoderFactory; |
|
| 44 | 41 | use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; |
| 45 | 42 | |
| 46 | 43 | /** |