EC-CUBE / ec-cube

src/Eccube/Controller/Admin/Order/MailController.php

Doc Comments +3 added lines

@@ -259,6 +259,9 @@
     }
 
 
+    /**
+     * @param Application $app
+     */
     private function createBody($app, $header, $footer, $Order)
     {
         return $app->renderView('Mail/order.twig', array(

Spacing +2 added lines, -2 removed lines

@@ -336,10 +336,10 @@
                 }
             }
         } else {
-            $filter = function ($v) {
+            $filter = function($v) {
                 return preg_match('/^ids\d+$/', $v);
             };
-            $map = function ($v) {
+            $map = function($v) {
                 return preg_replace('/[^\d+]/', '', $v);
             };
             $keys = array_keys($request->query->all());

src/Eccube/Repository/TaxRuleRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
      * @param  int|null|\Eccube\Entity\ProductClass   $ProductClass 商品規格
      * @param  int|null|\Eccube\Entity\Master\Pref    $Pref         都道府県
      * @param  int|null|\Eccube\Entity\Master\Country $Country      国
-     * @return \Eccube\Entity\TaxRule                 税設定情報
+     * @return integer                 税設定情報
      *
      * @throws NoResultException
      */

src/Eccube/Doctrine/Filter/NoStockHiddenFilter.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias)
     {
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\ProductClass') {
-            return $targetTableAlias . '.stock >= 1 OR ' . $targetTableAlias . '.stock_unlimited = 1';
+            return $targetTableAlias.'.stock >= 1 OR '.$targetTableAlias.'.stock_unlimited = 1';
         } else {
             return "";
         }

src/Eccube/Doctrine/Filter/OrderStatusFilter.php

Spacing +2 added lines, -2 removed lines

@@ -33,12 +33,12 @@
     {
         // 決済処理中/購入処理中を除く.
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Order') {
-            return $targetTableAlias . '.status <> 7 AND ' . $targetTableAlias . '.status <> 8';
+            return $targetTableAlias.'.status <> 7 AND '.$targetTableAlias.'.status <> 8';
         }
 
         // 決済処理中/購入処理中を除く.
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Master\OrderStatus') {
-            return $targetTableAlias . '.id <> 7 AND ' . $targetTableAlias . '.id <> 8';
+            return $targetTableAlias.'.id <> 7 AND '.$targetTableAlias.'.id <> 8';
         }
 
         return '';

src/Eccube/Form/Type/Admin/ProductClassType.php

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
                 'required' => false,
                 'value' => 1,
             ))
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
                 $form = $event->getForm();
                 $data = $form->getData();
 

src/Eccube/Form/Type/NameType.php

Spacing +2 added lines, -2 removed lines

@@ -62,10 +62,10 @@
         }
 
         if (empty($options['lastname_name'])) {
-            $options['lastname_name'] = $builder->getName() . '01';
+            $options['lastname_name'] = $builder->getName().'01';
         }
         if (empty($options['firstname_name'])) {
-            $options['firstname_name'] = $builder->getName() . '02';
+            $options['firstname_name'] = $builder->getName().'02';
         }
 
         $builder

src/Eccube/Repository/OrderRepository.php

Indentation +1 added lines, -1 removed lines

@@ -274,7 +274,7 @@
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
             $qb
                 ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' .
-                           'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti')
+                            'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti')
                 ->setParameter('multi', $multi)
                 ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
         }

Spacing +11 added lines, -11 removed lines

@@ -109,14 +109,14 @@ 
         if (isset($searchData['name']) && StringUtil::isNotBlank($searchData['name'])) {
             $qb
                 ->andWhere('CONCAT(o.name01, o.name02) LIKE :name')
-                ->setParameter('name', '%' . $searchData['name'] . '%');
+                ->setParameter('name', '%'.$searchData['name'].'%');
         }
 
         // kana
         if (isset($searchData['kana']) && StringUtil::isNotBlank($searchData['kana'])) {
             $qb
                 ->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana')
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
         }
 
         // email
@@ -247,7 +247,7 @@ 
             $qb
                 ->leftJoin('o.OrderItems', 'oi')
                 ->andWhere('oi.product_name LIKE :buy_product_name')
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
         }
 
         // Order By
@@ -273,13 +273,13 @@ 
                 ->setParameter('order_id_start', $searchData['order_id_start']);
         }
         // multi
-        if (isset( $searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) {
+        if (isset($searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) {
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
             $qb
-                ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' .
+                ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR '.
                            'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti')
                 ->setParameter('multi', $multi)
-                ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
+                ->setParameter('likemulti', '%'.$searchData['multi'].'%');
         }
 
         // order_id_end
@@ -316,21 +316,21 @@ 
         if (isset($searchData['name']) && StringUtil::isNotBlank($searchData['name'])) {
             $qb
                 ->andWhere('CONCAT(o.name01, o.name02) LIKE :name')
-                ->setParameter('name', '%' . $searchData['name'] . '%');
+                ->setParameter('name', '%'.$searchData['name'].'%');
         }
 
         // kana
         if (isset($searchData['kana']) && StringUtil::isNotBlank($searchData['kana'])) {
             $qb
                 ->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana')
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
         }
 
         // email
         if (isset($searchData['email']) && StringUtil::isNotBlank($searchData['email'])) {
             $qb
                 ->andWhere('o.email like :email')
-                ->setParameter('email', '%' . $searchData['email'] . '%');
+                ->setParameter('email', '%'.$searchData['email'].'%');
         }
 
         // tel
@@ -338,7 +338,7 @@ 
             $tel = preg_replace('/[^0-9]/ ', '', $searchData['tel']);
             $qb
                 ->andWhere('CONCAT(o.tel01, o.tel02, o.tel03) LIKE :tel')
-                ->setParameter('tel', '%' . $tel . '%');
+                ->setParameter('tel', '%'.$tel.'%');
         }
 
         // sex
@@ -442,7 +442,7 @@ 
             $qb
                 ->leftJoin('o.OrderItems', 'oi')
                 ->andWhere('oi.product_name LIKE :buy_product_name')
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
         }
 
         // Order By

src/Eccube/Repository/PluginEventHandlerRepository.php

Braces +4 added lines, -4 removed lines

@@ -55,10 +55,10 @@ 
         if(PluginEventHandler::EVENT_HANDLER_TYPE_FIRST==$type){
             $range_start=PluginEventHandler::EVENT_PRIORITY_FIRST_START;
             $range_end=PluginEventHandler::EVENT_PRIORITY_FIRST_END;
-        }elseif(PluginEventHandler::EVENT_HANDLER_TYPE_LAST==$type){
+        } elseif(PluginEventHandler::EVENT_HANDLER_TYPE_LAST==$type){
             $range_start=PluginEventHandler::EVENT_PRIORITY_LAST_START;
             $range_end=PluginEventHandler::EVENT_PRIORITY_LAST_END;
-        }else{
+        } else{
             $range_start=PluginEventHandler::EVENT_PRIORITY_NORMAL_START;
             $range_end=PluginEventHandler::EVENT_PRIORITY_NORMAL_END;
         }
@@ -82,7 +82,7 @@ 
         $result=$qb->getQuery()->getResult();
         if(count($result)){
              return $result[0]->getPriority() -1;
-        }else{
+        } else{
              return $range_start;
         }
 
@@ -119,7 +119,7 @@ 
             $em->flush();
             $em->getConnection()->commit();
             # 移動する
-        }else{
+        } else{
             # 移動しない
             throw new PluginException("Can't swap");
         }

Indentation +14 added lines, -14 removed lines

@@ -73,17 +73,17 @@ 
 
         $qb = $this->createQueryBuilder('e');
         $qb->andWhere("e.priority >= $range_end ")
-           ->andWhere("e.priority <= $range_start ")
-           ->andWhere('e.event = :event')
-           ->setParameter('event',$event)
-           ->setMaxResults(1)
-           ->orderBy('e.priority','ASC');
+            ->andWhere("e.priority <= $range_start ")
+            ->andWhere('e.event = :event')
+            ->setParameter('event',$event)
+            ->setMaxResults(1)
+            ->orderBy('e.priority','ASC');
 
         $result=$qb->getQuery()->getResult();
         if(count($result)){
-             return $result[0]->getPriority() -1;
+                return $result[0]->getPriority() -1;
         }else{
-             return $range_start;
+                return $range_start;
         }
 
     }
@@ -96,13 +96,13 @@ 
         $qb = $this->createQueryBuilder('e');
 
         $qb->andWhere("e.priority >= $range_end ")
-           ->andWhere("e.priority <= $range_start ")
-           ->andWhere('e.priority '.($up ?  '>' : '<' ).' :pri')
-           ->andWhere('e.event = :event')
-           ->setParameter('event',$pluginEventHandler->getEvent())
-           ->setParameter('pri',  $pluginEventHandler->getPriority()  )
-           ->setMaxResults(1)
-           ->orderBy('e.priority', ($up ? 'ASC':'DESC' )  );
+            ->andWhere("e.priority <= $range_start ")
+            ->andWhere('e.priority '.($up ?  '>' : '<' ).' :pri')
+            ->andWhere('e.event = :event')
+            ->setParameter('event',$pluginEventHandler->getEvent())
+            ->setParameter('pri',  $pluginEventHandler->getPriority()  )
+            ->setMaxResults(1)
+            ->orderBy('e.priority', ($up ? 'ASC':'DESC' )  );
 
         $result=$qb->getQuery()->getResult();
 

Spacing +31 added lines, -31 removed lines

@@ -42,8 +42,8 @@ 
     {
         $qb = $this->createQueryBuilder('e')
             ->innerJoin('e.Plugin', 'p')
-            ->Orderby('e.event','ASC') 
-            ->addOrderby('e.priority','DESC');
+            ->Orderby('e.event', 'ASC') 
+            ->addOrderby('e.priority', 'DESC');
             ;
 
         return $qb->getQuery()->getResult();
@@ -52,65 +52,65 @@ 
     public function getPriorityRange($type)
     {
 
-        if(PluginEventHandler::EVENT_HANDLER_TYPE_FIRST==$type){
-            $range_start=PluginEventHandler::EVENT_PRIORITY_FIRST_START;
-            $range_end=PluginEventHandler::EVENT_PRIORITY_FIRST_END;
-        }elseif(PluginEventHandler::EVENT_HANDLER_TYPE_LAST==$type){
-            $range_start=PluginEventHandler::EVENT_PRIORITY_LAST_START;
-            $range_end=PluginEventHandler::EVENT_PRIORITY_LAST_END;
-        }else{
-            $range_start=PluginEventHandler::EVENT_PRIORITY_NORMAL_START;
-            $range_end=PluginEventHandler::EVENT_PRIORITY_NORMAL_END;
+        if (PluginEventHandler::EVENT_HANDLER_TYPE_FIRST == $type) {
+            $range_start = PluginEventHandler::EVENT_PRIORITY_FIRST_START;
+            $range_end = PluginEventHandler::EVENT_PRIORITY_FIRST_END;
+        }elseif (PluginEventHandler::EVENT_HANDLER_TYPE_LAST == $type) {
+            $range_start = PluginEventHandler::EVENT_PRIORITY_LAST_START;
+            $range_end = PluginEventHandler::EVENT_PRIORITY_LAST_END;
+        } else {
+            $range_start = PluginEventHandler::EVENT_PRIORITY_NORMAL_START;
+            $range_end = PluginEventHandler::EVENT_PRIORITY_NORMAL_END;
         }
-        return array($range_start,$range_end);
+        return array($range_start, $range_end);
 
     }
 
-    public function calcNewPriority($event , $type)
+    public function calcNewPriority($event, $type)
     {
 
-        list($range_start,$range_end) = $this->getPriorityRange($type);
+        list($range_start, $range_end) = $this->getPriorityRange($type);
 
         $qb = $this->createQueryBuilder('e');
         $qb->andWhere("e.priority >= $range_end ")
            ->andWhere("e.priority <= $range_start ")
            ->andWhere('e.event = :event')
-           ->setParameter('event',$event)
+           ->setParameter('event', $event)
            ->setMaxResults(1)
-           ->orderBy('e.priority','ASC');
+           ->orderBy('e.priority', 'ASC');
 
-        $result=$qb->getQuery()->getResult();
-        if(count($result)){
-             return $result[0]->getPriority() -1;
-        }else{
+        $result = $qb->getQuery()->getResult();
+        if (count($result)) {
+             return $result[0]->getPriority() - 1;
+        } else {
              return $range_start;
         }
 
     }
 
-    public function upPriority($pluginEventHandler,$up=true)
+    public function upPriority($pluginEventHandler, $up = true)
     {
 
-        list($range_start,$range_end) = $this->getPriorityRange($pluginEventHandler->getHandlerType());
+        list($range_start, $range_end) = $this->getPriorityRange($pluginEventHandler->getHandlerType());
 
         $qb = $this->createQueryBuilder('e');
 
         $qb->andWhere("e.priority >= $range_end ")
            ->andWhere("e.priority <= $range_start ")
-           ->andWhere('e.priority '.($up ?  '>' : '<' ).' :pri')
+           ->andWhere('e.priority '.($up ? '>' : '<').' :pri')
            ->andWhere('e.event = :event')
-           ->setParameter('event',$pluginEventHandler->getEvent())
-           ->setParameter('pri',  $pluginEventHandler->getPriority()  )
+           ->setParameter('event', $pluginEventHandler->getEvent())
+           ->setParameter('pri', $pluginEventHandler->getPriority())
            ->setMaxResults(1)
-           ->orderBy('e.priority', ($up ? 'ASC':'DESC' )  );
+           ->orderBy('e.priority', ($up ? 'ASC' : 'DESC'));
 
-        $result=$qb->getQuery()->getResult();
+        $result = $qb->getQuery()->getResult();
 
-        if(count($result)){
-            $em =$this->getEntityManager();
+        if (count($result)) {
+            $em = $this->getEntityManager();
             $em->getConnection()->beginTransaction();
             // 2個のentityのprioriryを入れ替える
-            $tmp=$pluginEventHandler->getPriority();
+            $tmp = $pluginEventHandler->getPriority();
             $pluginEventHandler->setPriority($result[0]->getPriority());
             $result[0]->setPriority($tmp);
             $em->persist($result[0]);
@@ -118,7 +118,7 @@ 
             $em->flush();
             $em->getConnection()->commit();
             # 移動する
-        }else{
+        } else {
             # 移動しない
             throw new PluginException("Can't swap");
         }

src/Eccube/Security/Core/Encoder/PasswordEncoder.php

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
         if ($this->config['auth_type'] == 'PLAIN') {
             $res = $raw;
         } else {
-            $res = hash_hmac($this->config['password_hash_algos'], $raw . ':' . $this->config['auth_magic'], $salt);
+            $res = hash_hmac($this->config['password_hash_algos'], $raw.':'.$this->config['auth_magic'], $salt);
         }
 
         return $res;
@@ -81,7 +81,7 @@ 
         } else {
             // 旧バージョン(2.11未満)からの移行を考慮
             if (empty($salt)) {
-                $hash = sha1($raw . ':' . $this->config['auth_magic']);
+                $hash = sha1($raw.':'.$this->config['auth_magic']);
             } else {
                 $hash = $this->encodePassword($raw, $salt);
             }