EC-CUBE / ec-cube

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

Spacing +9 added lines, -9 removed lines

@@ -303,7 +303,7 @@ 
         log_info('受注削除開始', array($Order->getId()));
 
         // 出荷に紐付いている明細がある場合は削除できない.
-        $hasShipping = $Order->getItems()->exists(function ($k, $v) {
+        $hasShipping = $Order->getItems()->exists(function($k, $v) {
             return false === is_null($v->getShipping());
         });
         if ($hasShipping) {
@@ -361,7 +361,7 @@ 
         $em->getConfiguration()->setSQLLogger(null);
 
         $response = new StreamedResponse();
-        $response->setCallback(function () use ($app, $request) {
+        $response->setCallback(function() use ($app, $request) {
 
             // CSV種別を元に初期化.
             $this->csvExportService->initCsvType(CsvType::CSV_TYPE_ORDER);
@@ -375,7 +375,7 @@ 
 
             // データ行の出力.
             $this->csvExportService->setExportQueryBuilder($qb);
-            $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) {
+            $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) {
 
                 $Csvs = $csvService->getCsvs();
 
@@ -416,9 +416,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'order_' . $now->format('YmdHis') . '.csv';
+        $filename = 'order_'.$now->format('YmdHis').'.csv';
         $response->headers->set('Content-Type', 'application/octet-stream');
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
         $response->send();
 
         log_info('受注CSV出力ファイル名', array($filename));
@@ -445,7 +445,7 @@ 
         $em->getConfiguration()->setSQLLogger(null);
 
         $response = new StreamedResponse();
-        $response->setCallback(function () use ($app, $request) {
+        $response->setCallback(function() use ($app, $request) {
 
             // CSV種別を元に初期化.
             $this->csvExportService->initCsvType(CsvType::CSV_TYPE_SHIPPING);
@@ -459,7 +459,7 @@ 
 
             // データ行の出力.
             $this->csvExportService->setExportQueryBuilder($qb);
-            $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) {
+            $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) {
 
                 $Csvs = $csvService->getCsvs();
 
@@ -509,9 +509,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'shipping_' . $now->format('YmdHis') . '.csv';
+        $filename = 'shipping_'.$now->format('YmdHis').'.csv';
         $response->headers->set('Content-Type', 'application/octet-stream');
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
         $response->send();
 
         log_info('配送CSV出力ファイル名', array($filename));

src/Eccube/Controller/Admin/Setting/Shop/PaymentController.php

Spacing +1 added lines, -1 removed lines

@@ -242,7 +242,7 @@
             $this->eventDispatcher->dispatch(EccubeEvents::ADMIN_SETTING_SHOP_PAYMENT_DELETE_COMPLETE, $event);
 
             $app->addSuccess('admin.delete.complete', 'admin');
-        } catch(ForeignKeyConstraintViolationException $e) {
+        } catch (ForeignKeyConstraintViolationException $e) {
             $this->entityManager->rollback();
             $app->addError('admin.payment.delete.error', 'admin');
         }

src/Eccube/Repository/PluginEventHandlerRepository.php

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