EC-CUBE / ec-cube

src/Eccube/Controller/AbstractController.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
     protected function getBoundForm(Application $app, $type)
     {
         $form = $app['form.factory']
-            ->createBuilder($app['eccube.form.type.' . $type], $app['eccube.entity.' . $type])
+            ->createBuilder($app['eccube.form.type.'.$type], $app['eccube.entity.'.$type])
             ->getForm();
         $form->handleRequest($app['request']);
 

Doc Comments +6 added lines

@@ -52,11 +52,17 @@
         return $form;
     }
 
+    /**
+     * @param Application $app
+     */
     protected function getSecurity($app)
     {
         return $app['security.token_storage'];
     }
 
+    /**
+     * @param Application $app
+     */
     protected function isTokenValid($app)
     {
         $csrf = $app['form.csrf_provider'];

src/Eccube/Controller/Admin/AdminController.php

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
     {
         // install.phpのチェック.
         if (isset($app['config']['eccube_install']) && $app['config']['eccube_install'] == 1) {
-            $file = $app['config']['root_dir'] . '/html/install.php';
+            $file = $app['config']['root_dir'].'/html/install.php';
             if (file_exists($file)) {
                 $app->addWarning('admin.install.warning', 'admin');
             }
@@ -184,7 +184,7 @@ 
                     t1.status
                 ORDER BY
                     t1.status';
-        $rsm = new ResultSetMapping();;
+        $rsm = new ResultSetMapping(); ;
         $rsm->addScalarResult('status', 'status');
         $rsm->addScalarResult('count', 'count');
         $query = $em->createNativeQuery($sql, $rsm);

src/Eccube/Controller/Admin/Content/LayoutController.php

Spacing +9 added lines, -9 removed lines

@@ -89,20 +89,20 @@ 
                 $max = count($Blocks);
                 for ($i = 0; $i < $max; $i++) {
                     // block_id が取得できない場合は INSERT しない
-                    if (!isset($data['id_' . $i])) {
+                    if (!isset($data['id_'.$i])) {
                         continue;
                     }
                     // 未使用は INSERT しない
-                    if ($data['target_id_' . $i] == \Eccube\Entity\PageLayout::TARGET_ID_UNUSED) {
+                    if ($data['target_id_'.$i] == \Eccube\Entity\PageLayout::TARGET_ID_UNUSED) {
                         continue;
                     }
                     // 他のページに anywhere が存在する場合は INSERT しない
-                    $anywhere = (isset($data['anywhere_' . $i]) && $data['anywhere_' . $i] == 1) ? 1 : 0;
-                    if (isset($data['anywhere_' . $i]) && $data['anywhere_' . $i] == 1) {
+                    $anywhere = (isset($data['anywhere_'.$i]) && $data['anywhere_'.$i] == 1) ? 1 : 0;
+                    if (isset($data['anywhere_'.$i]) && $data['anywhere_'.$i] == 1) {
                         $Other = $app['orm.em']->getRepository('Eccube\Entity\BlockPosition')
                             ->findBy(array(
                                 'anywhere' => 1,
-                                'block_id' => $data['id_' . $i],
+                                'block_id' => $data['id_'.$i],
                             ));
                         if (count($Other) > 0) {
                             continue;
@@ -112,14 +112,14 @@ 
                     $BlockPosition = new \Eccube\Entity\BlockPosition();
                     $Block = $app['orm.em']->getRepository('Eccube\Entity\Block')
                         ->findOneBy(array(
-                            'id' => $data['id_' . $i],
+                            'id' => $data['id_'.$i],
                             'DeviceType' => $DeviceType,
                         ));
                     $BlockPosition
                         ->setPageId($id)
-                        ->setBlockId($data['id_' . $i])
-                        ->setBlockRow($data['top_' . $i])
-                        ->setTargetId($data['target_id_' . $i])
+                        ->setBlockId($data['id_'.$i])
+                        ->setBlockRow($data['top_'.$i])
+                        ->setTargetId($data['target_id_'.$i])
                         ->setBlock($Block)
                         ->setPageLayout($TargetPageLayout)
                         ->setAnywhere($anywhere);

src/Eccube/Controller/Admin/Content/PageController.php

Spacing +3 added lines, -3 removed lines

@@ -89,7 +89,7 @@ 
 
                 // ファイル生成・更新
                 $templatePath = $app['eccube.repository.page_layout']->getWriteTemplatePath($editable);
-                $filePath = $templatePath . '/' . $PageLayout->getFileName() . '.twig';
+                $filePath = $templatePath.'/'.$PageLayout->getFileName().'.twig';
 
                 $fs = new Filesystem();
                 $fs->dumpFile($filePath, $form->get('tpl_data')->getData());
@@ -97,7 +97,7 @@ 
                 $app->addSuccess('admin.register.complete', 'admin');
 
                 // twig キャッシュの削除.
-                $finder = Finder::create()->in($app['config']['root_dir'] . '/app/cache/twig');
+                $finder = Finder::create()->in($app['config']['root_dir'].'/app/cache/twig');
                 $fs->remove($finder);
 
                 return $app->redirect($app->url('admin_content_page_edit', array('id' => $PageLayout->getId())));
@@ -136,7 +136,7 @@ 
         if ($PageLayout->getEditFlg() == PageLayout::EDIT_FLG_USER) {
             $templatePath = $app['eccube.repository.page_layout']
                 ->getWriteTemplatePath($DeviceType, true);
-            $file = $templatePath . '/' . $PageLayout->getFileName() . '.twig';
+            $file = $templatePath.'/'.$PageLayout->getFileName().'.twig';
             $fs = new Filesystem();
             if ($fs->exists($file)) {
                 $fs->remove($file);

src/Eccube/Controller/Admin/Customer/CustomerController.php

Spacing +4 added lines, -4 removed lines

@@ -171,7 +171,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_CUSTOMER);
@@ -185,7 +185,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();
 
@@ -207,9 +207,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'customer_' . $now->format('YmdHis') . '.csv';
+        $filename = 'customer_'.$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/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());

Doc Comments +5 added lines

@@ -510,6 +510,8 @@ 
     /**
      * 登録、更新時のエラー画面表示
      *
+     * @param Application $app
+     * @param boolean $not_product_class
      */
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
     {
@@ -559,6 +561,7 @@ 
 
     /**
      * 規格1と規格2を組み合わせた商品規格を作成
+     * @param Application $app
      */
     private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null)
     {
@@ -646,6 +649,7 @@ 
      *
      * @param $productClassDest コピー先となる商品規格
      * @param $productClassOrig コピー元となる商品規格
+     * @param Application $app
      */
     private function setDefualtProductClass($app, $productClassDest, $productClassOrig) {
         $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate());
@@ -687,6 +691,7 @@ 
      * 商品規格を登録
      *
      * @param $ProductClasses 登録される商品規格
+     * @param Application $app
      */
     private function insertProductClass($app, $Product, $ProductClasses) {
 

Indentation +1 added lines, -1 removed lines

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