@@ -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') |
@@ -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 | } |
@@ -27,14 +27,12 @@ |
||
27 | 27 | use Doctrine\ORM\EntityManager; |
28 | 28 | use Eccube\Annotation\Inject; |
29 | 29 | use Eccube\Application; |
30 | -use Eccube\Common\Constant; |
|
31 | 30 | use Eccube\Controller\AbstractController; |
32 | 31 | use Eccube\Entity\Master\CustomerStatus; |
33 | 32 | use Eccube\Event\EccubeEvents; |
34 | 33 | use Eccube\Event\EventArgs; |
35 | 34 | use Eccube\Repository\Master\CustomerStatusRepository; |
36 | 35 | use Eccube\Service\MailService; |
37 | -use Eccube\Util\Str; |
|
38 | 36 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
39 | 37 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
40 | 38 | use Symfony\Component\EventDispatcher\EventDispatcher; |
@@ -420,6 +420,9 @@ |
||
420 | 420 | $session->set('eccube.session.install', $data); |
421 | 421 | } |
422 | 422 | |
423 | + /** |
|
424 | + * @param InstallApplication $app |
|
425 | + */ |
|
423 | 426 | private function checkModules($app) |
424 | 427 | { |
425 | 428 | foreach ($this->requiredModules as $module) { |
@@ -214,7 +214,7 @@ |
||
214 | 214 | |
215 | 215 | // ロードバランサ, プロキシサーバ |
216 | 216 | if (!empty($config['trusted_proxies_connection_only'])) { |
217 | - $sessionData['trusted_proxies_connection_only'] = (bool)$config['trusted_proxies_connection_only']; |
|
217 | + $sessionData['trusted_proxies_connection_only'] = (bool) $config['trusted_proxies_connection_only']; |
|
218 | 218 | } |
219 | 219 | if (!empty($config['trusted_proxies'])) { |
220 | 220 | $sessionData['trusted_proxies'] = Str::convertLineFeed(implode("\n", |
@@ -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) { |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | } else { |
96 | 96 | // httpから変更されたらfalseのまま |
97 | 97 | $config['force_ssl'] = Constant::DISABLED; |
98 | - $data['force_ssl'] = (bool)Constant::DISABLED; |
|
98 | + $data['force_ssl'] = (bool) Constant::DISABLED; |
|
99 | 99 | } |
100 | 100 | } else { |
101 | 101 | $config['force_ssl'] = Constant::DISABLED; |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | if (count($allowHost) > 0) { |
141 | 141 | $form->get('admin_allow_hosts')->setData(Str::convertLineFeed(implode("\n", $allowHost))); |
142 | 142 | } |
143 | - $form->get('force_ssl')->setData((bool)$this->appConfig['force_ssl']); |
|
143 | + $form->get('force_ssl')->setData((bool) $this->appConfig['force_ssl']); |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | return [ |