| @@ -55,10 +55,10 @@ discard block | ||
| 55 | 55 |          if(PluginEventHandler::EVENT_HANDLER_TYPE_FIRST==$type){ | 
| 56 | 56 | $range_start=PluginEventHandler::EVENT_PRIORITY_FIRST_START; | 
| 57 | 57 | $range_end=PluginEventHandler::EVENT_PRIORITY_FIRST_END; | 
| 58 | -        }elseif(PluginEventHandler::EVENT_HANDLER_TYPE_LAST==$type){ | |
| 58 | +        } elseif(PluginEventHandler::EVENT_HANDLER_TYPE_LAST==$type){ | |
| 59 | 59 | $range_start=PluginEventHandler::EVENT_PRIORITY_LAST_START; | 
| 60 | 60 | $range_end=PluginEventHandler::EVENT_PRIORITY_LAST_END; | 
| 61 | -        }else{ | |
| 61 | +        } else{ | |
| 62 | 62 | $range_start=PluginEventHandler::EVENT_PRIORITY_NORMAL_START; | 
| 63 | 63 | $range_end=PluginEventHandler::EVENT_PRIORITY_NORMAL_END; | 
| 64 | 64 | } | 
| @@ -82,7 +82,7 @@ discard block | ||
| 82 | 82 | $result=$qb->getQuery()->getResult(); | 
| 83 | 83 |          if(count($result)){ | 
| 84 | 84 | return $result[0]->getPriority() -1; | 
| 85 | -        }else{ | |
| 85 | +        } else{ | |
| 86 | 86 | return $range_start; | 
| 87 | 87 | } | 
| 88 | 88 | |
| @@ -119,7 +119,7 @@ discard block | ||
| 119 | 119 | $em->flush(); | 
| 120 | 120 | $em->getConnection()->commit(); | 
| 121 | 121 | # 移動する | 
| 122 | -        }else{ | |
| 122 | +        } else{ | |
| 123 | 123 | # 移動しない | 
| 124 | 124 |              throw new PluginException("Can't swap"); | 
| 125 | 125 | } | 
| @@ -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; | 
| @@ -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") | 
| @@ -3,7 +3,6 @@ | ||
| 3 | 3 | namespace Acme\Controller; | 
| 4 | 4 | |
| 5 | 5 | use Eccube\Application; | 
| 6 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; | |
| 7 | 6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | 
| 8 | 7 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; | 
| 9 | 8 | |
| @@ -4,13 +4,10 @@ | ||
| 4 | 4 | use Eccube\Application; | 
| 5 | 5 | use Symfony\Component\HttpFoundation\Response; | 
| 6 | 6 | use Symfony\Component\HttpFoundation\Request; | 
| 7 | -use Symfony\Component\HttpFoundation\ParameterBag; | |
| 8 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; | |
| 9 | 7 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | 
| 10 | 8 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; | 
| 11 | 9 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; | 
| 12 | 10 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; | 
| 13 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; | |
| 14 | 11 | |
| 15 | 12 | /** | 
| 16 | 13 |   * @Route("/test") |