EC-CUBE / ec-cube

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

Spacing +8 added lines, -8 removed lines

@@ -184,7 +184,7 @@ 
         $em->getConfiguration()->setSQLLogger(null);
 
         $response = new StreamedResponse();
-        $response->setCallback(function () use ($app, $request) {
+        $response->setCallback(function() use ($app, $request) {
 
             // CSV種別を元に初期化.
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_ORDER);
@@ -198,7 +198,7 @@ 
 
             // データ行の出力.
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
 
                 $Csvs = $csvService->getCsvs();
 
@@ -228,9 +228,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();
 
         return $response;
@@ -253,7 +253,7 @@ 
         $em->getConfiguration()->setSQLLogger(null);
 
         $response = new StreamedResponse();
-        $response->setCallback(function () use ($app, $request) {
+        $response->setCallback(function() use ($app, $request) {
 
             // CSV種別を元に初期化.
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_SHIPPING);
@@ -267,7 +267,7 @@ 
 
             // データ行の出力.
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
 
                 $Csvs = $csvService->getCsvs();
 
@@ -305,9 +305,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();
 
         return $response;

src/Eccube/Controller/Admin/Product/CategoryController.php

Spacing +4 added lines, -4 removed lines

@@ -164,7 +164,7 @@ 
         $em->getConfiguration()->setSQLLogger(null);
 
         $response = new StreamedResponse();
-        $response->setCallback(function () use ($app, $request) {
+        $response->setCallback(function() use ($app, $request) {
 
             // CSV種別を元に初期化.
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_CATEGORY);
@@ -178,7 +178,7 @@ 
 
             // データ行の出力.
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
 
                 $Csvs = $csvService->getCsvs();
 
@@ -198,9 +198,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'category_' . $now->format('YmdHis') . '.csv';
+        $filename = 'category_'.$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();
 
         return $response;

src/Eccube/Controller/Admin/Product/ClassCategoryController.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
         $num = $app['eccube.repository.product_class']->createQueryBuilder('pc')
             ->select('count(pc.id)')
             ->where('pc.ClassCategory1 = :id OR pc.ClassCategory2 = :id')
-            ->setParameter('id',$id)
+            ->setParameter('id', $id)
             ->getQuery()
             ->getSingleScalarResult();
         if ($num > 0) {

src/Eccube/Controller/Admin/Product/ProductClassController.php

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
                     $class2Valied = $this->isValiedCategory($ClassName2);
 
                     // 規格が選択されていないか、選択された状態で分類が保有されていれば、画面表示
-                    if($class1Valied && $class2Valied){
+                    if ($class1Valied && $class2Valied) {
                         $hasClassCategoryFlg = true;
                     }
 
@@ -582,7 +582,7 @@ 
         // 個別消費税
         $BaseInfo = $app['eccube.repository.base_info']->get();
         if ($BaseInfo->getOptionProductTaxRule() == Constant::ENABLED) {
-            if($productClassOrig->getTaxRate()) {
+            if ($productClassOrig->getTaxRate()) {
                 $productClassDest->setTaxRate($productClassOrig->getTaxRate());
                 if ($productClassDest->getTaxRule() && !$productClassDest->getTaxRule()->getDelFlg()) {
                     $productClassDest->getTaxRule()->setTaxRate($productClassOrig->getTaxRate());

Indentation +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
                                 'allow_add' => true,
                                 'allow_delete' => true,
                                 'data' => $ProductClasses,
-                             ));
+                                ));
 
                         $event = new EventArgs(
                             array(

Doc Comments +1 added lines

@@ -511,6 +511,7 @@
     /**
      * 登録、更新時のエラー画面表示
      *
+     * @param boolean $not_product_class
      */
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
     {

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

Spacing +6 added lines, -6 removed lines

@@ -70,10 +70,10 @@ 
                 // ファイルアップロード
                 $file = $form['payment_image']->getData();
                 $fs = new Filesystem();
-                if ($file && $fs->exists($app['config']['image_temp_realdir'] . '/' . $file)) {
+                if ($file && $fs->exists($app['config']['image_temp_realdir'].'/'.$file)) {
                     $fs->rename(
-                        $app['config']['image_temp_realdir'] . '/' . $file,
-                        $app['config']['image_save_realdir'] . '/' . $file
+                        $app['config']['image_temp_realdir'].'/'.$file,
+                        $app['config']['image_save_realdir'].'/'.$file
                     );
                 }
 
@@ -100,7 +100,7 @@ 
         if (isset($images['payment_image_file'])) {
             $image = $images['payment_image_file'];
             $extension = $image->guessExtension();
-            $filename = date('mdHis') . uniqid('_') . '.' . $extension;
+            $filename = date('mdHis').uniqid('_').'.'.$extension;
             $image->move($app['config']['image_temp_realdir'], $filename);
         }
 
@@ -127,12 +127,12 @@ 
         foreach ($Payments as $Payment) {
             if ($Payment->getId() != $id) {
                 $Payment->setRank($rank);
-                $rank ++;
+                $rank++;
             }
         }
         $app['orm.em']->flush();
 
-        $app->addSuccess('admin.delete.complete', 'admin') ;
+        $app->addSuccess('admin.delete.complete', 'admin');
 
         return $app->redirect($app->url('admin_setting_shop_payment'));
     }

src/Eccube/Controller/Admin/Setting/System/LogController.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
         $log = array();
         $message = array();
 
-        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) {
+        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) {
             // 上限に達した場合、処理を抜ける
             if (count($log) >= $formData['line_max']) {
                 break;

src/Eccube/Controller/Admin/Setting/System/SecurityController.php

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
                 // 現在のセキュリティ情報を更新
                 $adminRoot = $app['config']['admin_route'];
 
-                $configFile = $app['config']['root_dir'] . '/app/config/eccube/config.yml';
+                $configFile = $app['config']['root_dir'].'/app/config/eccube/config.yml';
                 $config = Yaml::parse(file_get_contents($configFile));
                 // trim処理
                 $allowHost = Str::convertLineFeed($data['admin_allow_host']);
@@ -82,7 +82,7 @@ 
 
                 if ($adminRoot != $data['admin_route_dir']) {
                     // admin_routeが変更されればpath.ymlを更新
-                    $pathFile = $app['config']['root_dir'] . '/app/config/eccube/path.yml';
+                    $pathFile = $app['config']['root_dir'].'/app/config/eccube/path.yml';
                     $config = Yaml::parse(file_get_contents($pathFile));
                     $config['admin_route'] = $data['admin_route_dir'];
 
@@ -94,7 +94,7 @@ 
                     $this->getSecurity($app)->setToken(null);
 
                     // 管理者画面へ再ログイン
-                    return $app->redirect($request->getBaseUrl() . '/' . $config['admin_route']);
+                    return $app->redirect($request->getBaseUrl().'/'.$config['admin_route']);
                 }
 
                 $app->addSuccess('admin.sysmte.security.save.complete', 'admin');
@@ -107,7 +107,7 @@ 
             if (count($allowHost) > 0) {
                 $form->get('admin_allow_host')->setData(Str::convertLineFeed(implode("\n", $allowHost)));
             }
-            $form->get('force_ssl')->setData((bool)$app['config']['force_ssl']);
+            $form->get('force_ssl')->setData((bool) $app['config']['force_ssl']);
         }
 
         return $app->render('Setting/System/security.twig', array(

src/Eccube/Controller/Admin/Setting/System/SystemController.php

Indentation +4 added lines, -4 removed lines

@@ -49,7 +49,7 @@ 
 
                 return $phpinfo;
 
-               break;
+                break;
             default:
                 break;
         }
@@ -61,8 +61,8 @@ 
         ));
     }
 
-     public function getSystemInfo(Application $app)
-     {
+        public function getSystemInfo(Application $app)
+        {
         $system = $app['eccube.service.system'];
         $server = $app['request'];
 
@@ -78,5 +78,5 @@ 
         $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $server->headers->get('User-Agent'));
 
         return $arrSystemInfo;
-     }
+        }
 }

Spacing +5 added lines, -5 removed lines

@@ -67,13 +67,13 @@
         $server = $app['request'];
 
         $arrSystemInfo = array(
-            array('title' => 'EC-CUBE',     'value' => Constant::VERSION),
-            array('title' => 'サーバーOS',    'value' => php_uname()),
-            array('title' => 'DBサーバー',    'value' => $system->getDbversion()),
-            array('title' => 'WEBサーバー',   'value' => $server->server->get("SERVER_SOFTWARE")),
+            array('title' => 'EC-CUBE', 'value' => Constant::VERSION),
+            array('title' => 'サーバーOS', 'value' => php_uname()),
+            array('title' => 'DBサーバー', 'value' => $system->getDbversion()),
+            array('title' => 'WEBサーバー', 'value' => $server->server->get("SERVER_SOFTWARE")),
         );
 
-        $value = phpversion() . ' (' . implode(', ', get_loaded_extensions()) . ')';
+        $value = phpversion().' ('.implode(', ', get_loaded_extensions()).')';
         $arrSystemInfo[] = array('title' => 'PHP', 'value' => $value);
         $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $server->headers->get('User-Agent'));
 

src/Eccube/Controller/BlockController.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 
         if ($app['eccube.layout']) {
             foreach ($app['eccube.layout']->getBlocPositions() as $blocPositions) {
-                if ($blocPositions->getTargetId() == constant("Eccube\Entity\BlocPosition::" . $position)) {
+                if ($blocPositions->getTargetId() == constant("Eccube\Entity\BlocPosition::".$position)) {
                     $blocks[] = $blocPositions->getBloc();
                 }
             }