Completed
Pull Request — experimental/3.1 (#2483)
by Kentaro
44:50
created
src/Eccube/Repository/OrderRepository.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -274,7 +274,7 @@
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
src/Eccube/Repository/PluginEventHandlerRepository.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -73,17 +73,17 @@  discard block
 block discarded – undo
73 73
 
74 74
         $qb = $this->createQueryBuilder('e');
75 75
         $qb->andWhere("e.priority >= $range_end ")
76
-           ->andWhere("e.priority <= $range_start ")
77
-           ->andWhere('e.event = :event')
78
-           ->setParameter('event',$event)
79
-           ->setMaxResults(1)
80
-           ->orderBy('e.priority','ASC');
76
+            ->andWhere("e.priority <= $range_start ")
77
+            ->andWhere('e.event = :event')
78
+            ->setParameter('event',$event)
79
+            ->setMaxResults(1)
80
+            ->orderBy('e.priority','ASC');
81 81
 
82 82
         $result=$qb->getQuery()->getResult();
83 83
         if(count($result)){
84
-             return $result[0]->getPriority() -1;
84
+                return $result[0]->getPriority() -1;
85 85
         }else{
86
-             return $range_start;
86
+                return $range_start;
87 87
         }
88 88
 
89 89
     }
@@ -96,14 +96,14 @@  discard block
 block discarded – undo
96 96
         $qb = $this->createQueryBuilder('e');
97 97
 
98 98
         $qb->andWhere("e.priority >= $range_end ")
99
-           ->andWhere("e.priority <= $range_start ")
100
-           ->andWhere("e.del_flg = 0 ") 
101
-           ->andWhere('e.priority '.($up ?  '>' : '<' ).' :pri')
102
-           ->andWhere('e.event = :event')
103
-           ->setParameter('event',$pluginEventHandler->getEvent())
104
-           ->setParameter('pri',  $pluginEventHandler->getPriority()  )
105
-           ->setMaxResults(1)
106
-           ->orderBy('e.priority', ($up ? 'ASC':'DESC' )  );
99
+            ->andWhere("e.priority <= $range_start ")
100
+            ->andWhere("e.del_flg = 0 ") 
101
+            ->andWhere('e.priority '.($up ?  '>' : '<' ).' :pri')
102
+            ->andWhere('e.event = :event')
103
+            ->setParameter('event',$pluginEventHandler->getEvent())
104
+            ->setParameter('pri',  $pluginEventHandler->getPriority()  )
105
+            ->setMaxResults(1)
106
+            ->orderBy('e.priority', ($up ? 'ASC':'DESC' )  );
107 107
 
108 108
         $result=$qb->getQuery()->getResult();
109 109
 
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductClassController.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
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(
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,6 @@
 block discarded – undo
46 46
 use Eccube\Repository\TaxRuleRepository;
47 47
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
48 48
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
49
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
50 49
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
51 50
 use Symfony\Component\EventDispatcher\EventDispatcher;
52 51
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/CsvImportController.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1155,11 +1155,11 @@
 block discarded – undo
1155 1155
     }
1156 1156
     
1157 1157
         /**
1158
-     * ProductCategory作成
1159
-     * @param \Eccube\Entity\Product $Product
1160
-     * @param \Eccube\Entity\Category $Category
1161
-     * @return ProductCategory
1162
-     */
1158
+         * ProductCategory作成
1159
+         * @param \Eccube\Entity\Product $Product
1160
+         * @param \Eccube\Entity\Category $Category
1161
+         * @return ProductCategory
1162
+         */
1163 1163
     private function makeProductCategory($Product, $Category, $rank)
1164 1164
     {
1165 1165
         $ProductCategory = new ProductCategory();
Please login to merge, or discard this patch.
src/Eccube/Command/PluginCommand.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,6 @@
 block discarded – undo
33 33
 use Symfony\Component\Console\Input\InputOption;
34 34
 use Symfony\Component\Console\Output\OutputInterface;
35 35
 use Symfony\Component\Console\Question\Question;
36
-use Symfony\Component\Validator\Constraints as Assert;
37 36
 
38 37
 class PluginCommand extends \Knp\Command\Command
39 38
 {
Please login to merge, or discard this patch.
src/Eccube/Application/ApplicationTrait.php 1 patch
Unused Use Statements   -6 removed lines patch added patch discarded remove patch
@@ -2,15 +2,9 @@
 block discarded – undo
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
 {
Please login to merge, or discard this patch.
src/Eccube/Command/CacheClearCommand.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,6 @@
 block discarded – undo
24 24
 
25 25
 namespace Eccube\Command;
26 26
 
27
-use Symfony\Component\Console\Input\InputArgument;
28 27
 use Symfony\Component\Console\Input\InputInterface;
29 28
 use Symfony\Component\Console\Input\InputOption;
30 29
 use Symfony\Component\Console\Output\OutputInterface;
Please login to merge, or discard this patch.
src/Eccube/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php 1 patch
Unused Use Statements   -9 removed lines patch added patch discarded remove patch
@@ -18,19 +18,10 @@
 block discarded – undo
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
 /**
Please login to merge, or discard this patch.
src/Eccube/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,6 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.