@@ -29,7 +29,6 @@ |
||
29 | 29 | use Eccube\Controller\AbstractController; |
30 | 30 | use Eccube\Exception\PluginException; |
31 | 31 | use Eccube\Util\Str; |
32 | -use Monolog\Logger; |
|
33 | 32 | use Symfony\Component\Filesystem\Filesystem; |
34 | 33 | use Symfony\Component\Finder\Finder; |
35 | 34 | use Symfony\Component\HttpFoundation\Request; |
@@ -28,7 +28,6 @@ |
||
28 | 28 | use Eccube\Entity\Master\DeviceType; |
29 | 29 | use Eccube\Util\Str; |
30 | 30 | use Symfony\Component\Filesystem\Filesystem; |
31 | -use Symfony\Component\Finder\Finder; |
|
32 | 31 | use Symfony\Component\Form\FormError; |
33 | 32 | use Symfony\Component\HttpFoundation\Request; |
34 | 33 | use Symfony\Component\HttpFoundation\Response; |
@@ -347,6 +347,9 @@ |
||
347 | 347 | flush(); |
348 | 348 | } |
349 | 349 | |
350 | + /** |
|
351 | + * @param InstallApplication $app |
|
352 | + */ |
|
350 | 353 | private function checkModules($app) |
351 | 354 | { |
352 | 355 | foreach ($this->required_modules as $module) { |
@@ -1398,7 +1398,6 @@ |
||
1398 | 1398 | /** |
1399 | 1399 | * フォームの情報からお届け先のインデックスを返す |
1400 | 1400 | * |
1401 | - * @param Application $app |
|
1402 | 1401 | * @param mixed $CustomerAddressData |
1403 | 1402 | * @return int |
1404 | 1403 | */ |
@@ -18,18 +18,9 @@ |
||
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 | -use Doctrine\ORM\Query\AST\SimpleArithmeticExpression; |
|
31 | -use Doctrine\ORM\Query\Expr\OrderBy; |
|
32 | -use Doctrine\ORM\Query\Expr\Select; |
|
33 | 24 | use Doctrine\ORM\Query\SqlWalker; |
34 | 25 | use Doctrine\ORM\Query\AST\SelectStatement; |
35 | 26 |
@@ -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\TreeWalkerAdapter; |
26 | 25 | use Doctrine\ORM\Query\AST\Functions\IdentityFunction; |
@@ -57,7 +57,7 @@ |
||
57 | 57 | /** |
58 | 58 | * Constructor. |
59 | 59 | * |
60 | - * @param Query|QueryBuilder $query A Doctrine ORM query or query builder. |
|
60 | + * @param Query $query A Doctrine ORM query or query builder. |
|
61 | 61 | * @param boolean $fetchJoinCollection Whether the query joins a collection (true by default). |
62 | 62 | */ |
63 | 63 | public function __construct($query, $fetchJoinCollection = true) |
@@ -35,6 +35,9 @@ |
||
35 | 35 | { |
36 | 36 | private $app; |
37 | 37 | |
38 | + /** |
|
39 | + * @param \Silex\Application $app |
|
40 | + */ |
|
38 | 41 | public function __construct($app) |
39 | 42 | { |
40 | 43 | $this->app = $app; |
@@ -25,8 +25,6 @@ |
||
25 | 25 | |
26 | 26 | use Symfony\Component\Form\AbstractType; |
27 | 27 | use Symfony\Component\Form\FormBuilderInterface; |
28 | -use Symfony\Component\Form\FormError; |
|
29 | -use Symfony\Component\Form\FormEvents; |
|
30 | 28 | use Symfony\Component\OptionsResolver\OptionsResolverInterface; |
31 | 29 | use Symfony\Component\Security\Core\Validator\Constraints\UserPassword; |
32 | 30 | use Symfony\Component\Validator\Constraints as Assert; |
@@ -36,6 +36,9 @@ |
||
36 | 36 | { |
37 | 37 | protected $app; |
38 | 38 | |
39 | + /** |
|
40 | + * @param \Silex\Application $app |
|
41 | + */ |
|
39 | 42 | public function __construct($app) |
40 | 43 | { |
41 | 44 | $this->app = $app; |