@@ -274,7 +274,7 @@ |
||
274 | 274 | $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null; |
275 | 275 | $qb |
276 | 276 | ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' . |
277 | - 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti') |
|
277 | + 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti') |
|
278 | 278 | ->setParameter('multi', $multi) |
279 | 279 | ->setParameter('likemulti', '%' . $searchData['multi'] . '%'); |
280 | 280 | } |
@@ -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( |
@@ -2,15 +2,9 @@ |
||
2 | 2 | |
3 | 3 | namespace Eccube\Application; |
4 | 4 | |
5 | -use Eccube\Event\TemplateEvent; |
|
6 | -use Monolog\Logger; |
|
7 | -use Symfony\Component\Form\FormBuilder; |
|
8 | 5 | use Symfony\Component\HttpFoundation\Request; |
9 | 6 | use Symfony\Component\HttpFoundation\Response; |
10 | -use Symfony\Component\HttpFoundation\StreamedResponse; |
|
11 | 7 | use Symfony\Component\HttpKernel\HttpKernelInterface; |
12 | -use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
|
13 | -use Symfony\Component\Security\Core\User\UserInterface; |
|
14 | 8 | |
15 | 9 | trait ApplicationTrait |
16 | 10 | { |
@@ -18,19 +18,10 @@ |
||
18 | 18 | use Doctrine\DBAL\Platforms\PostgreSqlPlatform; |
19 | 19 | use Doctrine\DBAL\Platforms\SQLAnywherePlatform; |
20 | 20 | use Doctrine\DBAL\Platforms\SQLServerPlatform; |
21 | -use Doctrine\ORM\Query\AST\ArithmeticExpression; |
|
22 | -use Doctrine\ORM\Query\AST\ArithmeticFactor; |
|
23 | -use Doctrine\ORM\Query\AST\ArithmeticTerm; |
|
24 | -use Doctrine\ORM\Query\AST\Literal; |
|
25 | 21 | use Doctrine\ORM\Query\AST\OrderByClause; |
26 | -use Doctrine\ORM\Query\AST\OrderByItem; |
|
27 | 22 | use Doctrine\ORM\Query\AST\PartialObjectExpression; |
28 | -use Doctrine\ORM\Query\AST\PathExpression; |
|
29 | 23 | use Doctrine\ORM\Query\AST\SelectExpression; |
30 | 24 | use Doctrine\ORM\Query\AST\SelectStatement; |
31 | -use Doctrine\ORM\Query\AST\SimpleArithmeticExpression; |
|
32 | -use Doctrine\ORM\Query\Expr\OrderBy; |
|
33 | -use Doctrine\ORM\Query\Expr\Select; |
|
34 | 25 | use Doctrine\ORM\Query\SqlWalker; |
35 | 26 | |
36 | 27 | /** |
@@ -20,7 +20,6 @@ |
||
20 | 20 | |
21 | 21 | use Doctrine\DBAL\Types\Type; |
22 | 22 | use Doctrine\ORM\Mapping\ClassMetadataInfo; |
23 | -use Doctrine\ORM\ORMException; |
|
24 | 23 | use Doctrine\ORM\Query; |
25 | 24 | use Doctrine\ORM\Query\AST\Functions\IdentityFunction; |
26 | 25 | use Doctrine\ORM\Query\AST\PathExpression; |
@@ -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; |
@@ -38,21 +38,21 @@ |
||
38 | 38 | */ |
39 | 39 | public function buildForm(FormBuilderInterface $builder, array $options) |
40 | 40 | { |
41 | - $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
42 | - $options = $event->getForm()->getConfig()->getOptions(); |
|
43 | - if (!$event->getData()) { |
|
44 | - $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues())); |
|
45 | - $event->setData($data); |
|
46 | - } |
|
47 | - }); |
|
48 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
49 | - $options = $event->getForm()->getConfig()->getOptions(); |
|
50 | - $values = $options['choice_loader']->loadChoiceList()->getValues(); |
|
51 | - if (!in_array($event->getData(), $values)) { |
|
52 | - $data = current($values); |
|
53 | - $event->setData($data); |
|
54 | - } |
|
55 | - }); |
|
41 | + $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
42 | + $options = $event->getForm()->getConfig()->getOptions(); |
|
43 | + if (!$event->getData()) { |
|
44 | + $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues())); |
|
45 | + $event->setData($data); |
|
46 | + } |
|
47 | + }); |
|
48 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
49 | + $options = $event->getForm()->getConfig()->getOptions(); |
|
50 | + $values = $options['choice_loader']->loadChoiceList()->getValues(); |
|
51 | + if (!in_array($event->getData(), $values)) { |
|
52 | + $data = current($values); |
|
53 | + $event->setData($data); |
|
54 | + } |
|
55 | + }); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | /** |
@@ -24,18 +24,15 @@ |
||
24 | 24 | |
25 | 25 | namespace Eccube\ServiceProvider; |
26 | 26 | |
27 | -use Eccube\Common\Constant; |
|
28 | 27 | use Eccube\DataCollector\EccubeDataCollector; |
29 | 28 | use Pimple\Container; |
30 | 29 | use Pimple\ServiceProviderInterface; |
31 | 30 | use Silex\Api\BootableProviderInterface; |
32 | 31 | use Silex\Application; |
33 | 32 | use Symfony\Bridge\Twig\Extension\DumpExtension; |
34 | -use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
|
35 | 33 | use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector; |
36 | 34 | use Symfony\Component\HttpKernel\EventListener\DumpListener; |
37 | 35 | use Symfony\Component\VarDumper\Cloner\VarCloner; |
38 | -use Symfony\Component\VarDumper\Dumper\CliDumper; |
|
39 | 36 | use Symfony\Component\VarDumper\Dumper\HtmlDumper; |
40 | 37 | use Symfony\Component\VarDumper\VarDumper; |
41 | 38 |
@@ -2,14 +2,9 @@ |
||
2 | 2 | namespace Acme\Controller; |
3 | 3 | |
4 | 4 | use Eccube\Application; |
5 | -use Symfony\Component\HttpFoundation\Response; |
|
6 | 5 | use Symfony\Component\HttpFoundation\Request; |
7 | -use Symfony\Component\HttpFoundation\ParameterBag; |
|
8 | 6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
9 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
|
10 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; |
|
11 | 7 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
12 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; |
|
13 | 8 | |
14 | 9 | /** |
15 | 10 | * @Route("/test") |