@@ -27,8 +27,6 @@ |
||
| 27 | 27 | use Symfony\Component\Form\Extension\Core\Type\PasswordType; |
| 28 | 28 | use Symfony\Component\Form\Extension\Core\Type\RepeatedType; |
| 29 | 29 | use Symfony\Component\Form\FormBuilderInterface; |
| 30 | -use Symfony\Component\Form\FormError; |
|
| 31 | -use Symfony\Component\Form\FormEvents; |
|
| 32 | 30 | use Symfony\Component\OptionsResolver\OptionsResolver; |
| 33 | 31 | use Symfony\Component\Security\Core\Validator\Constraints\UserPassword; |
| 34 | 32 | use Symfony\Component\Validator\Constraints as Assert; |
@@ -40,14 +40,14 @@ |
||
| 40 | 40 | $eventName = $view; |
| 41 | 41 | if ($this->isAdminRequest()) { |
| 42 | 42 | // 管理画面の場合、event名に「Admin/」を付ける |
| 43 | - $eventName = 'Admin/' . $view; |
|
| 43 | + $eventName = 'Admin/'.$view; |
|
| 44 | 44 | } |
| 45 | - $this['monolog']->debug('Template Event Name : ' . $eventName); |
|
| 45 | + $this['monolog']->debug('Template Event Name : '.$eventName); |
|
| 46 | 46 | |
| 47 | 47 | // $this['eccube.event.dispatcher']->dispatch($eventName, $event); |
| 48 | 48 | |
| 49 | 49 | if ($response instanceof StreamedResponse) { |
| 50 | - $response->setCallback(function () use ($twig, $view, $parameters) { |
|
| 50 | + $response->setCallback(function() use ($twig, $view, $parameters) { |
|
| 51 | 51 | $twig->display($view, $parameters); |
| 52 | 52 | }); |
| 53 | 53 | } else { |
@@ -22,17 +22,17 @@ discard block |
||
| 22 | 22 | $app->register(new \Silex\Provider\MonologServiceProvider()); |
| 23 | 23 | |
| 24 | 24 | // Log |
| 25 | - $app['eccube.logger'] = function ($app) { |
|
| 25 | + $app['eccube.logger'] = function($app) { |
|
| 26 | 26 | return new Logger($app); |
| 27 | 27 | }; |
| 28 | 28 | |
| 29 | 29 | // ヘルパー作成 |
| 30 | - $app['eccube.monolog.helper'] = function ($app) { |
|
| 30 | + $app['eccube.monolog.helper'] = function($app) { |
|
| 31 | 31 | return new LogHelper($app); |
| 32 | 32 | }; |
| 33 | 33 | |
| 34 | 34 | // ログクラス作成ファクトリー |
| 35 | - $app['eccube.monolog.factory'] = $app->protect(function (array $channelValues) use ($app) { |
|
| 35 | + $app['eccube.monolog.factory'] = $app->protect(function(array $channelValues) use ($app) { |
|
| 36 | 36 | |
| 37 | 37 | $log = new $app['monolog.logger.class']($channelValues['name']); |
| 38 | 38 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | // monologの設定は除外 |
| 48 | 48 | unset($channels['monolog']); |
| 49 | 49 | foreach ($channels as $channel => $channelValues) { |
| 50 | - $app['monolog.logger.'.$channel] = function ($app) use ($channelValues) { |
|
| 50 | + $app['monolog.logger.'.$channel] = function($app) use ($channelValues) { |
|
| 51 | 51 | return $app['eccube.monolog.factory']($channelValues); |
| 52 | 52 | }; |
| 53 | 53 | } |
@@ -55,15 +55,15 @@ discard block |
||
| 55 | 55 | // MonologServiceProviderで定義されているmonolog.handlerの置換 |
| 56 | 56 | $channelValues = $app['config']['log']['channel']['monolog']; |
| 57 | 57 | $app['monolog.name'] = $channelValues['name']; |
| 58 | - $app['monolog.handler'] = function ($app) use ($channelValues) { |
|
| 58 | + $app['monolog.handler'] = function($app) use ($channelValues) { |
|
| 59 | 59 | return $app['eccube.monolog.helper']->getHandler($channelValues); |
| 60 | 60 | }; |
| 61 | 61 | |
| 62 | - $app['eccube.monolog.listener'] = function () use ($app) { |
|
| 62 | + $app['eccube.monolog.listener'] = function() use ($app) { |
|
| 63 | 63 | return new LogListener($app['eccube.logger']); |
| 64 | 64 | }; |
| 65 | 65 | |
| 66 | - $app['listener.requestdump'] = function ($app) { |
|
| 66 | + $app['listener.requestdump'] = function($app) { |
|
| 67 | 67 | return new \Eccube\EventListener\RequestDumpListener($app); |
| 68 | 68 | }; |
| 69 | 69 | } |
@@ -42,13 +42,13 @@ |
||
| 42 | 42 | */ |
| 43 | 43 | public function register(Container $app) |
| 44 | 44 | { |
| 45 | - $app->extend('form.type.extensions', function ($extensions) use ($app) { |
|
| 45 | + $app->extend('form.type.extensions', function($extensions) use ($app) { |
|
| 46 | 46 | $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension(); |
| 47 | 47 | |
| 48 | 48 | return $extensions; |
| 49 | 49 | }); |
| 50 | 50 | |
| 51 | - $app->extend('form.types', function ($types) use ($app) { |
|
| 51 | + $app->extend('form.types', function($types) use ($app) { |
|
| 52 | 52 | $types[] = new \Eccube\Form\Type\Install\Step1Type($app); |
| 53 | 53 | $types[] = new \Eccube\Form\Type\Install\Step3Type($app); |
| 54 | 54 | $types[] = new \Eccube\Form\Type\Install\Step4Type($app); |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $app = $this->app; |
| 50 | 50 | |
| 51 | 51 | $builder |
| 52 | - ->addEventListener(FormEvents::PRE_SET_DATA, function ($event) use ($app) { |
|
| 52 | + ->addEventListener(FormEvents::PRE_SET_DATA, function($event) use ($app) { |
|
| 53 | 53 | /** @var \Eccube\Entity\Shipping $data */ |
| 54 | 54 | $data = $event->getData(); |
| 55 | 55 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | 'placeholder' => '指定なし', |
| 103 | 103 | )); |
| 104 | 104 | }) |
| 105 | - ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) { |
|
| 105 | + ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) { |
|
| 106 | 106 | /** @var \Eccube\Entity\Shipping $data */ |
| 107 | 107 | $data = $event->getData(); |
| 108 | 108 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | }) |
| 121 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 121 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 122 | 122 | /** @var \Eccube\Entity\Shipping $data */ |
| 123 | 123 | $data = $event->getData(); |
| 124 | 124 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -79,7 +79,7 @@ |
||
| 79 | 79 | $builder->setAttribute('tel02_name', $options['tel02_name']); |
| 80 | 80 | $builder->setAttribute('tel03_name', $options['tel03_name']); |
| 81 | 81 | // todo 変 |
| 82 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function ($event) use ($builder) { |
|
| 82 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function($event) use ($builder) { |
|
| 83 | 83 | $form = $event->getForm(); |
| 84 | 84 | $count = 0; |
| 85 | 85 | if ($form[$builder->getName().'01']->getData() != '') { |
@@ -59,7 +59,6 @@ |
||
| 59 | 59 | { |
| 60 | 60 | } |
| 61 | 61 | /** |
| 62 | - |
|
| 63 | 62 | * {@inheritdoc} |
| 64 | 63 | */ |
| 65 | 64 | public function buildForm(FormBuilderInterface $builder, array $options) |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | $app['db.migrations.table_name'] = null; |
| 26 | 26 | $app['db.migrations.name'] = null; |
| 27 | 27 | |
| 28 | - $app['dispatcher']->addListener(ConsoleEvents::INIT, function (ConsoleEvent $event) use ($app) { |
|
| 28 | + $app['dispatcher']->addListener(ConsoleEvents::INIT, function(ConsoleEvent $event) use ($app) { |
|
| 29 | 29 | $application = $event->getApplication(); |
| 30 | 30 | |
| 31 | 31 | if (isset($app['orm.em'])) { |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | new Assert\Regex(array('pattern' => '/^\d+$/')), |
| 67 | 67 | ), |
| 68 | 68 | )) |
| 69 | - ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($app) { |
|
| 69 | + ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($app) { |
|
| 70 | 70 | $form = $event->getForm(); |
| 71 | 71 | |
| 72 | 72 | if ($app->isGranted('IS_AUTHENTICATED_FULLY')) { |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | $form->add('customer_address', EntityType::class, array( |
| 76 | 76 | 'class' => 'Eccube\Entity\CustomerAddress', |
| 77 | 77 | 'choice_label' => 'shippingMultipleDefaultName', |
| 78 | - 'query_builder' => function (EntityRepository $er) use ($Customer) { |
|
| 78 | + 'query_builder' => function(EntityRepository $er) use ($Customer) { |
|
| 79 | 79 | return $er->createQueryBuilder('ca') |
| 80 | 80 | ->where('ca.Customer = :Customer') |
| 81 | 81 | ->orderBy("ca.id", "ASC") |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | } |
| 108 | 108 | } |
| 109 | 109 | }) |
| 110 | - ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) { |
|
| 110 | + ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) { |
|
| 111 | 111 | /** @var \Eccube\Entity\Shipping $data */ |
| 112 | 112 | $data = $event->getData(); |
| 113 | 113 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -38,14 +38,14 @@ |
||
| 38 | 38 | */ |
| 39 | 39 | public function buildForm(FormBuilderInterface $builder, array $options) |
| 40 | 40 | { |
| 41 | - $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
| 41 | + $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) { |
|
| 42 | 42 | $options = $event->getForm()->getConfig()->getOptions(); |
| 43 | 43 | if (!$event->getData()) { |
| 44 | 44 | $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues())); |
| 45 | 45 | $event->setData($data); |
| 46 | 46 | } |
| 47 | 47 | }); |
| 48 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
| 48 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) { |
|
| 49 | 49 | $options = $event->getForm()->getConfig()->getOptions(); |
| 50 | 50 | $values = $options['choice_loader']->loadChoiceList()->getValues(); |
| 51 | 51 | if (!in_array($event->getData(), $values)) { |