@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | new Assert\Callback(array($this, 'validate')), |
97 | 97 | ), |
98 | 98 | )) |
99 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) { |
|
99 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) { |
|
100 | 100 | $form = $event->getForm(); |
101 | 101 | $data = $form->getData(); |
102 | 102 | try { |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config); |
122 | 122 | $conn->connect(); |
123 | 123 | } catch (\Exception $e) { |
124 | - $form['database']->addError(new FormError('データベースに接続できませんでした。' . $e->getMessage())); |
|
124 | + $form['database']->addError(new FormError('データベースに接続できませんでした。'.$e->getMessage())); |
|
125 | 125 | } |
126 | 126 | }); |
127 | 127 | } |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | public function validate($data, ExecutionContext $context, $param = null) |
138 | 138 | { |
139 | 139 | $parameters = $this->app['request']->get('install_step4'); |
140 | - if ($parameters['database'] != 'pdo_sqlite'){ |
|
140 | + if ($parameters['database'] != 'pdo_sqlite') { |
|
141 | 141 | $context->validateValue($data, array( |
142 | 142 | new Assert\NotBlank() |
143 | 143 | )); |
@@ -725,7 +725,7 @@ |
||
725 | 725 | * 成功 : trueを返却 |
726 | 726 | * 失敗 : \Doctrine\DBAL\DBALExceptionエラーが発生( 接続に失敗した場合 )、エラー画面を表示しdie() |
727 | 727 | * 備考 : app['debug']がtrueの際は処理を行わない |
728 | - * @return boolean true |
|
728 | + * @return null|boolean true |
|
729 | 729 | * |
730 | 730 | */ |
731 | 731 | protected function checkDatabaseConnection() |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | $this->register(new \Eccube\ServiceProvider\ValidatorServiceProvider()); |
134 | 134 | |
135 | 135 | $app = $this; |
136 | - $this->error(function (\Exception $e, $code) use ($app) { |
|
136 | + $this->error(function(\Exception $e, $code) use ($app) { |
|
137 | 137 | if ($app['debug']) { |
138 | 138 | return; |
139 | 139 | } |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | $this->register(new \Silex\Provider\TranslationServiceProvider(), array( |
198 | 198 | 'locale' => $this['config']['locale'], |
199 | 199 | )); |
200 | - $this['translator'] = $this->share($this->extend('translator', function ($translator, \Silex\Application $app) { |
|
200 | + $this['translator'] = $this->share($this->extend('translator', function($translator, \Silex\Application $app) { |
|
201 | 201 | $translator->addLoader('yaml', new \Symfony\Component\Translation\Loader\YamlFileLoader()); |
202 | 202 | |
203 | 203 | $r = new \ReflectionClass('Symfony\Component\Validator\Validator'); |
@@ -241,16 +241,16 @@ discard block |
||
241 | 241 | $this->register(new \Silex\Provider\TwigServiceProvider(), array( |
242 | 242 | 'twig.form.templates' => array('Form/form_layout.twig'), |
243 | 243 | )); |
244 | - $this['twig'] = $this->share($this->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) { |
|
244 | + $this['twig'] = $this->share($this->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) { |
|
245 | 245 | $twig->addExtension(new \Eccube\Twig\Extension\EccubeExtension($app)); |
246 | 246 | $twig->addExtension(new \Twig_Extension_StringLoader()); |
247 | 247 | |
248 | 248 | return $twig; |
249 | 249 | })); |
250 | 250 | |
251 | - $this->before(function (Request $request, \Silex\Application $app) { |
|
251 | + $this->before(function(Request $request, \Silex\Application $app) { |
|
252 | 252 | // フロント or 管理画面ごとにtwigの探索パスを切り替える. |
253 | - $app['twig'] = $app->share($app->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) { |
|
253 | + $app['twig'] = $app->share($app->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) { |
|
254 | 254 | $paths = array(); |
255 | 255 | |
256 | 256 | // 互換性がないのでprofiler とproduction 時のcacheを分離する |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | |
303 | 303 | // twigのグローバル変数を定義. |
304 | 304 | $app = $this; |
305 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) { |
|
305 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) { |
|
306 | 306 | // ショップ基本情報 |
307 | 307 | $BaseInfo = $app['eccube.repository.base_info']->get(); |
308 | 308 | $app['twig']->addGlobal('BaseInfo', $BaseInfo); |
@@ -362,7 +362,7 @@ discard block |
||
362 | 362 | // メール送信時の文字エンコード指定(デフォルトはUTF-8) |
363 | 363 | if (isset($this['config']['mail']['charset_iso_2022_jp']) && is_bool($this['config']['mail']['charset_iso_2022_jp'])) { |
364 | 364 | if ($this['config']['mail']['charset_iso_2022_jp'] === true) { |
365 | - \Swift::init(function () { |
|
365 | + \Swift::init(function() { |
|
366 | 366 | \Swift_DependencyContainer::getInstance() |
367 | 367 | ->register('mime.qpheaderencoder') |
368 | 368 | ->asAliasOf('mime.base64headerencoder'); |
@@ -529,19 +529,19 @@ discard block |
||
529 | 529 | array('^/mypage', 'ROLE_USER'), |
530 | 530 | ); |
531 | 531 | |
532 | - $this['eccube.password_encoder'] = $this->share(function ($app) { |
|
532 | + $this['eccube.password_encoder'] = $this->share(function($app) { |
|
533 | 533 | return new \Eccube\Security\Core\Encoder\PasswordEncoder($app['config']); |
534 | 534 | }); |
535 | - $this['security.encoder_factory'] = $this->share(function ($app) { |
|
535 | + $this['security.encoder_factory'] = $this->share(function($app) { |
|
536 | 536 | return new \Symfony\Component\Security\Core\Encoder\EncoderFactory(array( |
537 | 537 | 'Eccube\Entity\Customer' => $app['eccube.password_encoder'], |
538 | 538 | 'Eccube\Entity\Member' => $app['eccube.password_encoder'], |
539 | 539 | )); |
540 | 540 | }); |
541 | - $this['eccube.event_listner.security'] = $this->share(function ($app) { |
|
541 | + $this['eccube.event_listner.security'] = $this->share(function($app) { |
|
542 | 542 | return new \Eccube\EventListener\SecurityEventListener($app['orm.em']); |
543 | 543 | }); |
544 | - $this['user'] = function ($app) { |
|
544 | + $this['user'] = function($app) { |
|
545 | 545 | $token = $app['security']->getToken(); |
546 | 546 | |
547 | 547 | return ($token !== null) ? $token->getUser() : null; |
@@ -552,17 +552,17 @@ discard block |
||
552 | 552 | |
553 | 553 | // Voterの設定 |
554 | 554 | $app = $this; |
555 | - $this['authority_voter'] = $this->share(function ($app) { |
|
555 | + $this['authority_voter'] = $this->share(function($app) { |
|
556 | 556 | return new \Eccube\Security\Voter\AuthorityVoter($app); |
557 | 557 | }); |
558 | 558 | |
559 | - $app['security.voters'] = $app->extend('security.voters', function ($voters) use ($app) { |
|
559 | + $app['security.voters'] = $app->extend('security.voters', function($voters) use ($app) { |
|
560 | 560 | $voters[] = $app['authority_voter']; |
561 | 561 | |
562 | 562 | return $voters; |
563 | 563 | }); |
564 | 564 | |
565 | - $this['security.access_manager'] = $this->share(function ($app) { |
|
565 | + $this['security.access_manager'] = $this->share(function($app) { |
|
566 | 566 | return new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager($app['security.voters'], 'unanimous'); |
567 | 567 | }); |
568 | 568 | |
@@ -586,14 +586,14 @@ discard block |
||
586 | 586 | public function initPluginEventDispatcher() |
587 | 587 | { |
588 | 588 | // EventDispatcher |
589 | - $this['eccube.event.dispatcher'] = $this->share(function () { |
|
589 | + $this['eccube.event.dispatcher'] = $this->share(function() { |
|
590 | 590 | return new EventDispatcher(); |
591 | 591 | }); |
592 | 592 | |
593 | 593 | $app = $this; |
594 | 594 | |
595 | 595 | // hook point |
596 | - $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) { |
|
596 | + $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) { |
|
597 | 597 | if (!$event->isMasterRequest()) { |
598 | 598 | return; |
599 | 599 | } |
@@ -601,7 +601,7 @@ discard block |
||
601 | 601 | $app['eccube.event.dispatcher']->dispatch($hookpoint, $event); |
602 | 602 | }, self::EARLY_EVENT); |
603 | 603 | |
604 | - $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) { |
|
604 | + $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) { |
|
605 | 605 | if (!$event->isMasterRequest()) { |
606 | 606 | return; |
607 | 607 | } |
@@ -610,7 +610,7 @@ discard block |
||
610 | 610 | $app['eccube.event.dispatcher']->dispatch($hookpoint, $event); |
611 | 611 | }); |
612 | 612 | |
613 | - $this->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) { |
|
613 | + $this->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) { |
|
614 | 614 | if (!$event->isMasterRequest()) { |
615 | 615 | return; |
616 | 616 | } |
@@ -619,7 +619,7 @@ discard block |
||
619 | 619 | $app['eccube.event.dispatcher']->dispatch($hookpoint, $event); |
620 | 620 | }); |
621 | 621 | |
622 | - $this->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) { |
|
622 | + $this->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) { |
|
623 | 623 | if (!$event->isMasterRequest()) { |
624 | 624 | return; |
625 | 625 | } |
@@ -627,19 +627,19 @@ discard block |
||
627 | 627 | $app['eccube.event.dispatcher']->dispatch($hookpoint, $event); |
628 | 628 | }, self::LATE_EVENT); |
629 | 629 | |
630 | - $this->on(KernelEvents::TERMINATE, function (PostResponseEvent $event) use ($app) { |
|
630 | + $this->on(KernelEvents::TERMINATE, function(PostResponseEvent $event) use ($app) { |
|
631 | 631 | $route = $event->getRequest()->attributes->get('_route'); |
632 | 632 | $hookpoint = "eccube.event.controller.$route.finish"; |
633 | 633 | $app['eccube.event.dispatcher']->dispatch($hookpoint, $event); |
634 | 634 | }); |
635 | 635 | |
636 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
636 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
637 | 637 | $route = $event->getRequest()->attributes->get('_route'); |
638 | 638 | $app['eccube.event.dispatcher']->dispatch('eccube.event.render.'.$route.'.before', $event); |
639 | 639 | }); |
640 | 640 | |
641 | 641 | // Request Event |
642 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function (\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) { |
|
642 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function(\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) { |
|
643 | 643 | |
644 | 644 | if (\Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) { |
645 | 645 | return; |
@@ -670,7 +670,7 @@ discard block |
||
670 | 670 | }, 30); // Routing(32)が解決しし, 認証判定(8)が実行される前のタイミング. |
671 | 671 | |
672 | 672 | // Controller Event |
673 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) { |
|
673 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) { |
|
674 | 674 | |
675 | 675 | if (\Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) { |
676 | 676 | return; |
@@ -701,7 +701,7 @@ discard block |
||
701 | 701 | }); |
702 | 702 | |
703 | 703 | // Response Event |
704 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
704 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
705 | 705 | |
706 | 706 | if (\Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) { |
707 | 707 | return; |
@@ -731,7 +731,7 @@ discard block |
||
731 | 731 | }); |
732 | 732 | |
733 | 733 | // Exception Event |
734 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function (\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) { |
|
734 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function(\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) { |
|
735 | 735 | |
736 | 736 | if (\Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) { |
737 | 737 | return; |
@@ -761,7 +761,7 @@ discard block |
||
761 | 761 | }); |
762 | 762 | |
763 | 763 | // Terminate Event |
764 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function (\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) { |
|
764 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function(\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) { |
|
765 | 765 | |
766 | 766 | $route = $event->getRequest()->attributes->get('_route'); |
767 | 767 | |
@@ -840,7 +840,7 @@ discard block |
||
840 | 840 | |
841 | 841 | // const |
842 | 842 | if (isset($config['const'])) { |
843 | - $this['config'] = $this->share($this->extend('config', function ($eccubeConfig) use ($config) { |
|
843 | + $this['config'] = $this->share($this->extend('config', function($eccubeConfig) use ($config) { |
|
844 | 844 | $eccubeConfig[$config['code']] = array( |
845 | 845 | 'const' => $config['const'], |
846 | 846 | ); |
@@ -982,7 +982,7 @@ discard block |
||
982 | 982 | $app = $this; |
983 | 983 | |
984 | 984 | // Response Event(http cache対応、event実行は一番遅く設定) |
985 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
985 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
986 | 986 | |
987 | 987 | if ($app['config']['http_cache']['enabled']) { |
988 | 988 | // httpキャッシュが有効の場合 |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | foreach ($images as $img) { |
178 | 178 | foreach ($img as $image) { |
179 | 179 | $extension = $image->getClientOriginalExtension(); |
180 | - $filename = date('mdHis') . uniqid('_') . '.' . $extension; |
|
180 | + $filename = date('mdHis').uniqid('_').'.'.$extension; |
|
181 | 181 | $image->move($app['config']['image_temp_realdir'], $filename); |
182 | 182 | $files[] = $filename; |
183 | 183 | } |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | $app['eccube.event.dispatcher']->dispatch(EccubeEvents::ADMIN_PRODUCT_EDIT_INITIALIZE, $event); |
240 | 240 | |
241 | 241 | if (!$has_class) { |
242 | - $ProductClass->setStockUnlimited((boolean)$ProductClass->getStockUnlimited()); |
|
242 | + $ProductClass->setStockUnlimited((boolean) $ProductClass->getStockUnlimited()); |
|
243 | 243 | $form['class']->setData($ProductClass); |
244 | 244 | } |
245 | 245 | |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | $app['orm.em']->persist($ProductImage); |
338 | 338 | |
339 | 339 | // 移動 |
340 | - $file = new File($app['config']['image_temp_realdir'] . '/' . $add_image); |
|
340 | + $file = new File($app['config']['image_temp_realdir'].'/'.$add_image); |
|
341 | 341 | $file->move($app['config']['image_save_realdir']); |
342 | 342 | } |
343 | 343 | |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | |
358 | 358 | // 削除 |
359 | 359 | $fs = new Filesystem(); |
360 | - $fs->remove($app['config']['image_save_realdir'] . '/' . $delete_image); |
|
360 | + $fs->remove($app['config']['image_save_realdir'].'/'.$delete_image); |
|
361 | 361 | } |
362 | 362 | $app['orm.em']->persist($Product); |
363 | 363 | $app['orm.em']->flush(); |
@@ -463,7 +463,7 @@ discard block |
||
463 | 463 | foreach ($deleteImages as $deleteImage) { |
464 | 464 | try { |
465 | 465 | $fs = new Filesystem(); |
466 | - $fs->remove($app['config']['image_save_realdir'] . '/' . $deleteImage); |
|
466 | + $fs->remove($app['config']['image_save_realdir'].'/'.$deleteImage); |
|
467 | 467 | } catch (\Exception $e) { |
468 | 468 | // エラーが発生しても無視する |
469 | 469 | } |
@@ -527,10 +527,10 @@ discard block |
||
527 | 527 | |
528 | 528 | // 画像ファイルを新規作成 |
529 | 529 | $extension = pathinfo($Image->getFileName(), PATHINFO_EXTENSION); |
530 | - $filename = date('mdHis') . uniqid('_') . '.' . $extension; |
|
530 | + $filename = date('mdHis').uniqid('_').'.'.$extension; |
|
531 | 531 | try { |
532 | 532 | $fs = new Filesystem(); |
533 | - $fs->copy($app['config']['image_save_realdir'] . '/' . $Image->getFileName(), $app['config']['image_save_realdir'] . '/' . $filename); |
|
533 | + $fs->copy($app['config']['image_save_realdir'].'/'.$Image->getFileName(), $app['config']['image_save_realdir'].'/'.$filename); |
|
534 | 534 | } catch (\Exception $e) { |
535 | 535 | // エラーが発生しても無視する |
536 | 536 | } |
@@ -585,7 +585,7 @@ discard block |
||
585 | 585 | $em->getConfiguration()->setSQLLogger(null); |
586 | 586 | |
587 | 587 | $response = new StreamedResponse(); |
588 | - $response->setCallback(function () use ($app, $request) { |
|
588 | + $response->setCallback(function() use ($app, $request) { |
|
589 | 589 | |
590 | 590 | // CSV種別を元に初期化. |
591 | 591 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_PRODUCT); |
@@ -609,7 +609,7 @@ discard block |
||
609 | 609 | |
610 | 610 | // データ行の出力. |
611 | 611 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
612 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
612 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
613 | 613 | |
614 | 614 | $Csvs = $csvService->getCsvs(); |
615 | 615 | |
@@ -641,9 +641,9 @@ discard block |
||
641 | 641 | }); |
642 | 642 | |
643 | 643 | $now = new \DateTime(); |
644 | - $filename = 'product_' . $now->format('YmdHis') . '.csv'; |
|
644 | + $filename = 'product_'.$now->format('YmdHis').'.csv'; |
|
645 | 645 | $response->headers->set('Content-Type', 'application/octet-stream'); |
646 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
646 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
647 | 647 | $response->send(); |
648 | 648 | |
649 | 649 | return $response; |
@@ -106,7 +106,7 @@ |
||
106 | 106 | )); |
107 | 107 | $addCartForm = $builder->getForm(); |
108 | 108 | |
109 | - if ($request->getMethod() === 'POST' && (string)$Product->getId() === $request->get('product_id')) { |
|
109 | + if ($request->getMethod() === 'POST' && (string) $Product->getId() === $request->get('product_id')) { |
|
110 | 110 | $addCartForm->handleRequest($request); |
111 | 111 | |
112 | 112 | if ($addCartForm->isValid()) { |
@@ -510,6 +510,8 @@ discard block |
||
510 | 510 | /** |
511 | 511 | * 登録、更新時のエラー画面表示 |
512 | 512 | * |
513 | + * @param Application $app |
|
514 | + * @param boolean $not_product_class |
|
513 | 515 | */ |
514 | 516 | protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null) |
515 | 517 | { |
@@ -559,6 +561,7 @@ discard block |
||
559 | 561 | |
560 | 562 | /** |
561 | 563 | * 規格1と規格2を組み合わせた商品規格を作成 |
564 | + * @param Application $app |
|
562 | 565 | */ |
563 | 566 | private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null) |
564 | 567 | { |
@@ -646,6 +649,7 @@ discard block |
||
646 | 649 | * |
647 | 650 | * @param $productClassDest コピー先となる商品規格 |
648 | 651 | * @param $productClassOrig コピー元となる商品規格 |
652 | + * @param Application $app |
|
649 | 653 | */ |
650 | 654 | private function setDefualtProductClass($app, $productClassDest, $productClassOrig) { |
651 | 655 | $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate()); |
@@ -687,6 +691,7 @@ discard block |
||
687 | 691 | * 商品規格を登録 |
688 | 692 | * |
689 | 693 | * @param $ProductClasses 登録される商品規格 |
694 | + * @param Application $app |
|
690 | 695 | */ |
691 | 696 | private function insertProductClass($app, $Product, $ProductClasses) { |
692 | 697 |
@@ -138,7 +138,7 @@ |
||
138 | 138 | 'allow_add' => true, |
139 | 139 | 'allow_delete' => true, |
140 | 140 | 'data' => $ProductClasses, |
141 | - )); |
|
141 | + )); |
|
142 | 142 | |
143 | 143 | $event = new EventArgs( |
144 | 144 | array( |
@@ -106,7 +106,7 @@ |
||
106 | 106 | $class2Valied = $this->isValiedCategory($ClassName2); |
107 | 107 | |
108 | 108 | // 規格が選択されていないか、選択された状態で分類が保有されていれば、画面表示 |
109 | - if($class1Valied && $class2Valied){ |
|
109 | + if ($class1Valied && $class2Valied) { |
|
110 | 110 | $hasClassCategoryFlg = true; |
111 | 111 | } |
112 | 112 |
@@ -20,32 +20,32 @@ discard block |
||
20 | 20 | */ |
21 | 21 | public function addSuccess($message, $namespace = 'front') |
22 | 22 | { |
23 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.success', $message); |
|
23 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.success', $message); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | public function addError($message, $namespace = 'front') |
27 | 27 | { |
28 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.error', $message); |
|
28 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.error', $message); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | public function addDanger($message, $namespace = 'front') |
32 | 32 | { |
33 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message); |
|
33 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.danger', $message); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | public function addWarning($message, $namespace = 'front') |
37 | 37 | { |
38 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message); |
|
38 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.warning', $message); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | public function addInfo($message, $namespace = 'front') |
42 | 42 | { |
43 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message); |
|
43 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.info', $message); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | public function addRequestError($message, $namespace = 'front') |
47 | 47 | { |
48 | - $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message); |
|
48 | + $this['session']->getFlashBag()->set('eccube.'.$namespace.'.request.error', $message); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | public function clearMessage() |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | if (is_null($namespace)) { |
65 | 65 | $this['session']->getFlashBag()->set('eccube.login.target.path', $targetPath); |
66 | 66 | } else { |
67 | - $this['session']->getFlashBag()->set('eccube.' . $namespace . '.login.target.path', $targetPath); |
|
67 | + $this['session']->getFlashBag()->set('eccube.'.$namespace.'.login.target.path', $targetPath); |
|
68 | 68 | } |
69 | 69 | } |
70 | 70 | |
@@ -234,14 +234,14 @@ discard block |
||
234 | 234 | $eventName = $view; |
235 | 235 | if ($this->isAdminRequest()) { |
236 | 236 | // 管理画面の場合、event名に「Admin/」を付ける |
237 | - $eventName = 'Admin/' . $view; |
|
237 | + $eventName = 'Admin/'.$view; |
|
238 | 238 | } |
239 | - $this['monolog']->debug('Template Event Name : ' . $eventName); |
|
239 | + $this['monolog']->debug('Template Event Name : '.$eventName); |
|
240 | 240 | |
241 | 241 | $this['eccube.event.dispatcher']->dispatch($eventName, $event); |
242 | 242 | |
243 | 243 | if ($response instanceof StreamedResponse) { |
244 | - $response->setCallback(function () use ($twig, $view, $parameters) { |
|
244 | + $response->setCallback(function() use ($twig, $view, $parameters) { |
|
245 | 245 | $twig->display($view, $parameters); |
246 | 246 | }); |
247 | 247 | } else { |
@@ -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()) |
@@ -113,13 +113,13 @@ discard block |
||
113 | 113 | // ファイル生成・更新 |
114 | 114 | $tplDir = $app['config']['block_realdir']; |
115 | 115 | |
116 | - $filePath = $tplDir . '/' . $Block->getFileName() . '.twig'; |
|
116 | + $filePath = $tplDir.'/'.$Block->getFileName().'.twig'; |
|
117 | 117 | |
118 | 118 | $fs = new Filesystem(); |
119 | 119 | $fs->dumpFile($filePath, $form->get('block_html')->getData()); |
120 | 120 | // 更新でファイル名を変更した場合、以前のファイルを削除 |
121 | 121 | if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) { |
122 | - $oldFilePath = $tplDir . '/' . $previous_filename . '.twig'; |
|
122 | + $oldFilePath = $tplDir.'/'.$previous_filename.'.twig'; |
|
123 | 123 | if ($fs->exists($oldFilePath)) { |
124 | 124 | $fs->remove($oldFilePath); |
125 | 125 | } |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る |
172 | 172 | if ($Block->getDeletableFlg() > 0) { |
173 | 173 | $tplDir = $app['config']['block_realdir']; |
174 | - $file = $tplDir . '/' . $Block->getFileName() . '.twig'; |
|
174 | + $file = $tplDir.'/'.$Block->getFileName().'.twig'; |
|
175 | 175 | $fs = new Filesystem(); |
176 | 176 | if ($fs->exists($file)) { |
177 | 177 | $fs->remove($file); |
@@ -102,7 +102,7 @@ |
||
102 | 102 | if (count($allowHost) > 0) { |
103 | 103 | $form->get('admin_allow_host')->setData(Str::convertLineFeed(implode("\n", $allowHost))); |
104 | 104 | } |
105 | - $form->get('force_ssl')->setData((bool)$app['config']['force_ssl']); |
|
105 | + $form->get('force_ssl')->setData((bool) $app['config']['force_ssl']); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | return $app->render('Setting/System/security.twig', array( |