EC-CUBE / ec-cube

src/Eccube/Controller/Admin/AdminController.php

Spacing +3 added lines, -3 removed lines

@@ -127,12 +127,12 @@ 
     {
         // install.phpのチェック.
         if (isset($this->appConfig['eccube_install']) && $this->appConfig['eccube_install'] == 1) {
-            $file = $this->appConfig['root_dir'] . '/html/install.php';
+            $file = $this->appConfig['root_dir'].'/html/install.php';
             if (file_exists($file)) {
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'html/install.php'));
                 $app->addWarning($message, 'admin');
             }
-            $fileOnRoot = $this->appConfig['root_dir'] . '/install.php';
+            $fileOnRoot = $this->appConfig['root_dir'].'/install.php';
             if (file_exists($fileOnRoot)) {
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'install.php'));
                 $app->addWarning($message, 'admin');
@@ -376,7 +376,7 @@ 
                     t1.order_status_id
                 ORDER BY
                     t1.order_status_id';
-        $rsm = new ResultSetMapping();;
+        $rsm = new ResultSetMapping(); ;
         $rsm->addScalarResult('status', 'status');
         $rsm->addScalarResult('count', 'count');
         $query = $em->createNativeQuery($sql, $rsm);

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 . '.order_status_id <> 7 AND ' . $targetTableAlias . '.order_status_id <> 8';
+            return $targetTableAlias.'.order_status_id <> 7 AND '.$targetTableAlias.'.order_status_id <> 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 '';