Completed
Pull Request — experimental/3.1 (#2483)
by Kentaro
44:50
created
src/Eccube/Doctrine/Filter/NoStockHiddenFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
     public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias)
33 33
     {
34 34
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\ProductClass') {
35
-            return $targetTableAlias . '.stock >= 1 OR ' . $targetTableAlias . '.stock_unlimited = 1';
35
+            return $targetTableAlias.'.stock >= 1 OR '.$targetTableAlias.'.stock_unlimited = 1';
36 36
         } else {
37 37
             return "";
38 38
         }
Please login to merge, or discard this patch.
src/Eccube/Doctrine/Filter/OrderStatusFilter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,12 +33,12 @@
 block discarded – undo
33 33
     {
34 34
         // 決済処理中/購入処理中を除く.
35 35
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Order') {
36
-            return $targetTableAlias . '.status <> 7 AND ' . $targetTableAlias . '.status <> 8';
36
+            return $targetTableAlias.'.status <> 7 AND '.$targetTableAlias.'.status <> 8';
37 37
         }
38 38
 
39 39
         // 決済処理中/購入処理中を除く.
40 40
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Master\OrderStatus') {
41
-            return $targetTableAlias . '.id <> 7 AND ' . $targetTableAlias . '.id <> 8';
41
+            return $targetTableAlias.'.id <> 7 AND '.$targetTableAlias.'.id <> 8';
42 42
         }
43 43
 
44 44
         return '';
Please login to merge, or discard this patch.
src/Eccube/Doctrine/Filter/SoftDeleteFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
     public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias)
47 47
     {
48 48
         if ($targetEntity->hasField('del_flg') && !in_array($targetEntity->getName(), $this->getExcludes())) {
49
-            return $targetTableAlias . '.del_flg = 0';
49
+            return $targetTableAlias.'.del_flg = 0';
50 50
         } else {
51 51
             return "";
52 52
         }
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ProductClassType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@
 block discarded – undo
148 148
                 'required' => false,
149 149
                 'value' => 1,
150 150
             ))
151
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
151
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
152 152
                 $form = $event->getForm();
153 153
                 $data = $form->getData();
154 154
 
Please login to merge, or discard this patch.
src/Eccube/Form/Type/NameType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,10 +62,10 @@
 block discarded – undo
62 62
         }
63 63
 
64 64
         if (empty($options['lastname_name'])) {
65
-            $options['lastname_name'] = $builder->getName() . '01';
65
+            $options['lastname_name'] = $builder->getName().'01';
66 66
         }
67 67
         if (empty($options['firstname_name'])) {
68
-            $options['firstname_name'] = $builder->getName() . '02';
68
+            $options['firstname_name'] = $builder->getName().'02';
69 69
         }
70 70
 
71 71
         $builder
Please login to merge, or discard this patch.
src/Eccube/Form/Type/ShippingMultipleType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
         $app = $this->app;
48 48
 
49 49
         $builder
50
-            ->addEventListener(FormEvents::POST_SET_DATA, function ($event) use ($app) {
50
+            ->addEventListener(FormEvents::POST_SET_DATA, function($event) use ($app) {
51 51
                 /** @var \Eccube\Entity\ShipmentItem $data */
52 52
                 $data = $event->getData();
53 53
                 /** @var \Symfony\Component\Form\Form $form */
Please login to merge, or discard this patch.
src/Eccube/Repository/PageLayoutRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -257,7 +257,7 @@
 block discarded – undo
257 257
         }
258 258
 
259 259
         foreach ($readPaths as $readPath) {
260
-            $filePath = $readPath . '/' . $fileName . '.twig';
260
+            $filePath = $readPath.'/'.$fileName.'.twig';
261 261
             $fs = new Filesystem();
262 262
             if ($fs->exists($filePath)) {
263 263
                 return array(
Please login to merge, or discard this patch.
src/Eccube/Repository/PluginEventHandlerRepository.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
         $qb = $this->createQueryBuilder('e')
43 43
             ->innerJoin('e.Plugin', 'p')
44 44
             ->andWhere('e.del_flg = 0 ')  
45
-            ->Orderby('e.event','ASC') 
46
-            ->addOrderby('e.priority','DESC');
45
+            ->Orderby('e.event', 'ASC') 
46
+            ->addOrderby('e.priority', 'DESC');
47 47
             ;
48 48
 
49 49
         return $qb->getQuery()->getResult();
@@ -52,66 +52,66 @@  discard block
 block discarded – undo
52 52
     public function getPriorityRange($type)
53 53
     {
54 54
 
55
-        if(PluginEventHandler::EVENT_HANDLER_TYPE_FIRST==$type){
56
-            $range_start=PluginEventHandler::EVENT_PRIORITY_FIRST_START;
57
-            $range_end=PluginEventHandler::EVENT_PRIORITY_FIRST_END;
58
-        }elseif(PluginEventHandler::EVENT_HANDLER_TYPE_LAST==$type){
59
-            $range_start=PluginEventHandler::EVENT_PRIORITY_LAST_START;
60
-            $range_end=PluginEventHandler::EVENT_PRIORITY_LAST_END;
61
-        }else{
62
-            $range_start=PluginEventHandler::EVENT_PRIORITY_NORMAL_START;
63
-            $range_end=PluginEventHandler::EVENT_PRIORITY_NORMAL_END;
55
+        if (PluginEventHandler::EVENT_HANDLER_TYPE_FIRST == $type) {
56
+            $range_start = PluginEventHandler::EVENT_PRIORITY_FIRST_START;
57
+            $range_end = PluginEventHandler::EVENT_PRIORITY_FIRST_END;
58
+        }elseif (PluginEventHandler::EVENT_HANDLER_TYPE_LAST == $type) {
59
+            $range_start = PluginEventHandler::EVENT_PRIORITY_LAST_START;
60
+            $range_end = PluginEventHandler::EVENT_PRIORITY_LAST_END;
61
+        } else {
62
+            $range_start = PluginEventHandler::EVENT_PRIORITY_NORMAL_START;
63
+            $range_end = PluginEventHandler::EVENT_PRIORITY_NORMAL_END;
64 64
         }
65
-        return array($range_start,$range_end);
65
+        return array($range_start, $range_end);
66 66
 
67 67
     }
68 68
 
69
-    public function calcNewPriority($event , $type)
69
+    public function calcNewPriority($event, $type)
70 70
     {
71 71
 
72
-        list($range_start,$range_end) = $this->getPriorityRange($type);
72
+        list($range_start, $range_end) = $this->getPriorityRange($type);
73 73
 
74 74
         $qb = $this->createQueryBuilder('e');
75 75
         $qb->andWhere("e.priority >= $range_end ")
76 76
            ->andWhere("e.priority <= $range_start ")
77 77
            ->andWhere('e.event = :event')
78
-           ->setParameter('event',$event)
78
+           ->setParameter('event', $event)
79 79
            ->setMaxResults(1)
80
-           ->orderBy('e.priority','ASC');
80
+           ->orderBy('e.priority', 'ASC');
81 81
 
82
-        $result=$qb->getQuery()->getResult();
83
-        if(count($result)){
84
-             return $result[0]->getPriority() -1;
85
-        }else{
82
+        $result = $qb->getQuery()->getResult();
83
+        if (count($result)) {
84
+             return $result[0]->getPriority() - 1;
85
+        } else {
86 86
              return $range_start;
87 87
         }
88 88
 
89 89
     }
90 90
 
91
-    public function upPriority($pluginEventHandler,$up=true)
91
+    public function upPriority($pluginEventHandler, $up = true)
92 92
     {
93 93
 
94
-        list($range_start,$range_end) = $this->getPriorityRange($pluginEventHandler->getHandlerType());
94
+        list($range_start, $range_end) = $this->getPriorityRange($pluginEventHandler->getHandlerType());
95 95
 
96 96
         $qb = $this->createQueryBuilder('e');
97 97
 
98 98
         $qb->andWhere("e.priority >= $range_end ")
99 99
            ->andWhere("e.priority <= $range_start ")
100 100
            ->andWhere("e.del_flg = 0 ") 
101
-           ->andWhere('e.priority '.($up ?  '>' : '<' ).' :pri')
101
+           ->andWhere('e.priority '.($up ? '>' : '<').' :pri')
102 102
            ->andWhere('e.event = :event')
103
-           ->setParameter('event',$pluginEventHandler->getEvent())
104
-           ->setParameter('pri',  $pluginEventHandler->getPriority()  )
103
+           ->setParameter('event', $pluginEventHandler->getEvent())
104
+           ->setParameter('pri', $pluginEventHandler->getPriority())
105 105
            ->setMaxResults(1)
106
-           ->orderBy('e.priority', ($up ? 'ASC':'DESC' )  );
106
+           ->orderBy('e.priority', ($up ? 'ASC' : 'DESC'));
107 107
 
108
-        $result=$qb->getQuery()->getResult();
108
+        $result = $qb->getQuery()->getResult();
109 109
 
110
-        if(count($result)){
111
-            $em =$this->getEntityManager();
110
+        if (count($result)) {
111
+            $em = $this->getEntityManager();
112 112
             $em->getConnection()->beginTransaction();
113 113
             // 2個のentityのprioriryを入れ替える
114
-            $tmp=$pluginEventHandler->getPriority();
114
+            $tmp = $pluginEventHandler->getPriority();
115 115
             $pluginEventHandler->setPriority($result[0]->getPriority());
116 116
             $result[0]->setPriority($tmp);
117 117
             $em->persist($result[0]);
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
src/Eccube/Security/Core/Encoder/PasswordEncoder.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
         if ($this->config['auth_type'] == 'PLAIN') {
54 54
             $res = $raw;
55 55
         } else {
56
-            $res = hash_hmac($this->config['password_hash_algos'], $raw . ':' . $this->config['auth_magic'], $salt);
56
+            $res = hash_hmac($this->config['password_hash_algos'], $raw.':'.$this->config['auth_magic'], $salt);
57 57
         }
58 58
 
59 59
         return $res;
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
         } else {
82 82
             // 旧バージョン(2.11未満)からの移行を考慮
83 83
             if (empty($salt)) {
84
-                $hash = sha1($raw . ':' . $this->config['auth_magic']);
84
+                $hash = sha1($raw.':'.$this->config['auth_magic']);
85 85
             } else {
86 86
                 $hash = $this->encodePassword($raw, $salt);
87 87
             }
Please login to merge, or discard this patch.