EC-CUBE / ec-cube

src/Eccube/Repository/CustomerRepository.php

Spacing +6 added lines, -6 removed lines

@@ -147,7 +147,7 @@ 
 
         if (isset($searchData['multi']) && Str::isNotBlank($searchData['multi'])) {
             //スペース除去
-            $clean_key_multi = preg_replace('/\s+|[　]+/u', '',$searchData['multi']);
+            $clean_key_multi = preg_replace('/\s+|[　]+/u', '', $searchData['multi']);
             if (preg_match('/^\d+$/', $clean_key_multi)) {
                 $qb
                     ->andWhere('c.id = :customer_id')
@@ -155,9 +155,9 @@ 
             } else {
                 $qb
                     ->andWhere('CONCAT(c.name01, c.name02) LIKE :name OR CONCAT(c.kana01, c.kana02) LIKE :kana OR c.email LIKE :email')
-                    ->setParameter('name', '%' . $clean_key_multi . '%')
-                    ->setParameter('kana', '%' . $clean_key_multi . '%')
-                    ->setParameter('email', '%' . $clean_key_multi . '%');
+                    ->setParameter('name', '%'.$clean_key_multi.'%')
+                    ->setParameter('kana', '%'.$clean_key_multi.'%')
+                    ->setParameter('email', '%'.$clean_key_multi.'%');
             }
         }
 
@@ -210,7 +210,7 @@ 
         if (isset($searchData['tel']) && Str::isNotBlank($searchData['tel'])) {
             $qb
                 ->andWhere('CONCAT(c.tel01, c.tel02, c.tel03) LIKE :tel')
-                ->setParameter('tel', '%' . $searchData['tel'] . '%');
+                ->setParameter('tel', '%'.$searchData['tel'].'%');
         }
 
         // buy_total
@@ -304,7 +304,7 @@ 
                 ->leftJoin('c.Orders', 'o')
                 ->leftJoin('o.OrderDetails', 'od')
                 ->andWhere('od.product_name LIKE :buy_product_name OR od.product_code LIKE :buy_product_name')
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_code'] . '%');
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_code'].'%');
         }
 
         // Order By

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

@@ -100,14 +100,14 @@ 
         if (isset($searchData['name']) && Str::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']) && Str::isNotBlank($searchData['kana'])) {
             $qb
                 ->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana')
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
         }
 
         // email
@@ -244,7 +244,7 @@ 
             $qb
                 ->leftJoin('o.OrderDetails', 'od')
                 ->andWhere('od.product_name LIKE :buy_product_name')
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
         }
 
         // Order By
@@ -270,13 +270,13 @@ 
                 ->setParameter('order_id_start', $searchData['order_id_start']);
         }
         // multi
-        if (isset( $searchData['multi']) && Str::isNotBlank($searchData['multi'])) {
+        if (isset($searchData['multi']) && Str::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
@@ -301,28 +301,28 @@ 
         if (isset($searchData['name']) && Str::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']) && Str::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']) && Str::isNotBlank($searchData['email'])) {
             $qb
                 ->andWhere('o.email like :email')
-                ->setParameter('email', '%' . $searchData['email'] . '%');
+                ->setParameter('email', '%'.$searchData['email'].'%');
         }
 
         // tel
         if (isset($searchData['tel']) && Str::isNotBlank($searchData['tel'])) {
             $qb
                 ->andWhere('CONCAT(o.tel01, o.tel02, o.tel03) LIKE :tel')
-                ->setParameter('tel', '%' . $searchData['tel'] . '%');
+                ->setParameter('tel', '%'.$searchData['tel'].'%');
         }
 
         // sex
@@ -434,7 +434,7 @@ 
             $qb
                 ->leftJoin('o.OrderDetails', 'od')
                 ->andWhere('od.product_name LIKE :buy_product_name')
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
         }
 
 

src/Eccube/Repository/PageLayoutRepository.php

Spacing +1 added lines, -1 removed lines

@@ -257,7 +257,7 @@
         }
 
         foreach ($readPaths as $readPath) {
-            $filePath = $readPath . '/' . $fileName . '.twig';
+            $filePath = $readPath.'/'.$fileName.'.twig';
             $fs = new Filesystem();
             if ($fs->exists($filePath)) {
                 return array(

src/Eccube/Repository/PluginEventHandlerRepository.php

Indentation +15 added lines, -15 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,14 +96,14 @@ 
         $qb = $this->createQueryBuilder('e');
 
         $qb->andWhere("e.priority >= $range_end ")
-           ->andWhere("e.priority <= $range_start ")
-           ->andWhere("e.del_flg = 0 ") 
-           ->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.del_flg = 0 ") 
+            ->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')
             ->andWhere('e.del_flg = 0 ')  
-            ->Orderby('e.event','ASC') 
-            ->addOrderby('e.priority','DESC');
+            ->Orderby('e.event', 'ASC') 
+            ->addOrderby('e.priority', 'DESC');
             ;
 
         return $qb->getQuery()->getResult();
@@ -52,66 +52,66 @@ 
     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.del_flg = 0 ") 
-           ->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]);
@@ -119,7 +119,7 @@ 
             $em->flush();
             $em->getConnection()->commit();
             # 移動する
-        }else{
+        } else {
             # 移動しない
             throw new PluginException("Can't swap");
         }

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");
         }

src/Eccube/Repository/ProductRepository.php

Spacing +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
                 $key = sprintf('keyword%s', $index);
                 $qb
                     ->andWhere(sprintf('p.name LIKE :%s OR p.search_word LIKE :%s', $key, $key))
-                    ->setParameter($key, '%' . $keyword . '%');
+                    ->setParameter($key, '%'.$keyword.'%');
             }
         }
 
@@ -144,7 +144,7 @@ 
             $qb
                 ->andWhere('p.id = :id OR p.name LIKE :likeid OR pc.code LIKE :likeid')
                 ->setParameter('id', $id)
-                ->setParameter('likeid', '%' . $searchData['id'] . '%');
+                ->setParameter('likeid', '%'.$searchData['id'].'%');
         }
 
         // code

src/Eccube/Resource/doctrine/migration/Version20150722170707.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     public function up(Schema $schema)
     {
 
-        if($this->connection->getDatabasePlatform()->getName() == "mysql"){
+        if ($this->connection->getDatabasePlatform()->getName() == "mysql") {
             // this up() migration is auto-generated, please modify it to your needs
             $this->addSql("alter table  dtb_base_info                 collate utf8_general_ci ;");
             $this->addSql("alter table  dtb_block                     collate utf8_general_ci ;");

src/Eccube/Resource/doctrine/migration/Version20150806184533.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         $t = $schema->getTable('dtb_product_class');
         $c = $t->getColumn('stock_unlimited');
 
-        if($c->getType()->getName() != 'smallint'){
+        if ($c->getType()->getName() != 'smallint') {
             $this->addSql('ALTER TABLE dtb_product_class ADD stock_unlimited_tmp int ;');
             $this->addSql('UPDATE dtb_product_class SET stock_unlimited_tmp = 1 where stock_unlimited =  true ');
             $this->addSql('UPDATE dtb_product_class SET stock_unlimited_tmp = 0 where stock_unlimited <> true ');

src/Eccube/Resource/doctrine/migration/Version20150806220909.php

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
     public function up(Schema $schema)
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $t=$schema->getTable('dtb_product_class');
-        if(!$t->hasColumn('stock_unlimited') && $t->hasColumn('stock_unlimited_tmp')){
+        $t = $schema->getTable('dtb_product_class');
+        if (!$t->hasColumn('stock_unlimited') && $t->hasColumn('stock_unlimited_tmp')) {
             $t->addColumn('stock_unlimited', 'smallint', array('NotNull'=>true, 'Default'=>0));
         }
     }

src/Eccube/Resource/doctrine/migration/Version20150806222639.php

Spacing +2 added lines, -2 removed lines

@@ -39,8 +39,8 @@
     public function up(Schema $schema)
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $t=$schema->getTable('dtb_product_class');
-        if($t->hasColumn('stock_unlimited_tmp')){
+        $t = $schema->getTable('dtb_product_class');
+        if ($t->hasColumn('stock_unlimited_tmp')) {
             $this->addSql('update dtb_product_class set stock_unlimited = stock_unlimited_tmp;');
             $t->dropColumn('stock_unlimited_tmp');
         }