EC-CUBE / ec-cube

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

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
     private $error = null;
     private $encode = '';
 
-    public function __construct(){
+    public function __construct() {
         $this->encode = self::UTF;
         if ('\\' === DIRECTORY_SEPARATOR) {
             $this->encode = self::SJIS;
@@ -84,7 +84,7 @@ 
         $arrFileList = $this->getFileList($app, $nowDir);
 
         $javascript = $this->getJsArrayList($tree);
-        $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '" . $nowDir . "', 'tree_select_file', 'tree_status', 'move');";
+        $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '".$nowDir."', 'tree_select_file', 'tree_status', 'move');";
 
         return $app->render('Content/file.twig', array(
             'form' => $form->createView(),
@@ -141,7 +141,7 @@ 
                 $nowDir = $this->checkDir($request->get('now_dir'), $topDir)
                     ? $this->normalizePath($request->get('now_dir'))
                     : $topDir;
-                $fs->mkdir($nowDir . '/' . $filename);
+                $fs->mkdir($nowDir.'/'.$filename);
             }
         }
     }
@@ -219,7 +219,7 @@ 
     {
         $str = "arrTree = new Array();\n";
         foreach ($tree as $key => $val) {
-            $str .= 'arrTree[' . $key . "] = new Array(" . $key . ", '" . $val['type'] . "', '" . $val['path'] . "', " . $val['rank'] . ',';
+            $str .= 'arrTree['.$key."] = new Array(".$key.", '".$val['type']."', '".$val['path']."', ".$val['rank'].',';
             if ($val['open']) {
                 $str .= "true);\n";
             } else {
@@ -270,7 +270,7 @@ 
     private function getFileList($app, $nowDir)
     {
         $topDir = $app['config']['user_data_realdir'];
-        $filter = function (\SplFileInfo $file) use ($topDir) {
+        $filter = function(\SplFileInfo $file) use ($topDir) {
             $acceptPath = realpath($topDir);
             $targetPath = $file->getRealPath();
             return (strpos($targetPath, $acceptPath) === 0);

src/Eccube/Controller/Mypage/DeliveryController.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
         // 遷移が正しくない場合、デフォルトであるマイページの配送先追加の画面を設定する
         if (!in_array($parentPage, $allowdParents)) {
             // @deprecated 使用されていないコード
-            $parentPage  = $app->url('mypage_delivery');
+            $parentPage = $app->url('mypage_delivery');
         }
 
         $builder = $app['form.factory']

src/Eccube/Controller/UserDataController.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
         $paths[] = $app['config']['user_data_realdir'];
         $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths));
 
-        $file = $PageLayout->getFileName() . '.twig';
+        $file = $PageLayout->getFileName().'.twig';
 
         $event = new EventArgs(
             array(

src/Eccube/Controller/AbstractController.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         @trigger_error('The '.__METHOD__.' method is deprecated.', E_USER_DEPRECATED);
 
         $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']);
 

src/Eccube/Controller/ForgotController.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
                 // リセットキーの発行・有効期限の設定
                 $Customer
                     ->setResetKey($app['eccube.repository.customer']->getUniqueResetKey($app))
-                    ->setResetExpire(new \DateTime('+' . $app['config']['customer_reset_expire'] .' min'));
+                    ->setResetExpire(new \DateTime('+'.$app['config']['customer_reset_expire'].' min'));
 
                 // リセットキーを更新
                 $app['orm.em']->persist($Customer);
@@ -87,7 +87,7 @@ 
 
                 // ログ出力
                 $app['monolog']->addInfo(
-                    'send reset password mail to:'  . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
+                    'send reset password mail to:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
                 );
             } else {
                 log_warning('Un active customer try send reset password email: ', array('Enter email' => $form->get('login_email')->getData()));
@@ -169,7 +169,7 @@ 
 
             // ログ出力
             $app['monolog']->addInfo(
-                'reset password complete:' . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
+                'reset password complete:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
             );
         } else {
             throw new HttpException\AccessDeniedHttpException('不正なアクセスです。');

src/Eccube/Repository/OrderRepository.php

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
@@ -313,28 +313,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
@@ -446,7 +446,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

src/Eccube/Repository/ProductRepository.php

Spacing +2 added lines, -2 removed lines

@@ -113,7 +113,7 @@ 
                 $key = sprintf('keyword%s', $index);
                 $qb
                     ->andWhere(sprintf('NORMALIZE(p.name) LIKE NORMALIZE(:%s) OR NORMALIZE(p.search_word) LIKE NORMALIZE(:%s)', $key, $key))
-                    ->setParameter($key, '%' . $keyword . '%');
+                    ->setParameter($key, '%'.$keyword.'%');
             }
         }
 
@@ -176,7 +176,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/Controller/Admin/Product/ProductController.php

Spacing +14 added lines, -14 removed lines

@@ -202,7 +202,7 @@ 
                     }
 
                     $extension = $image->getClientOriginalExtension();
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
                     $image->move($app['config']['image_temp_realdir'], $filename);
                     $files[] = $filename;
                 }
@@ -278,7 +278,7 @@ 
         $form = $builder->getForm();
 
         if (!$has_class) {
-            $ProductClass->setStockUnlimited((boolean)$ProductClass->getStockUnlimited());
+            $ProductClass->setStockUnlimited((boolean) $ProductClass->getStockUnlimited());
             $form['class']->setData($ProductClass);
         }
 
@@ -364,8 +364,8 @@ 
                 $Categories = $form->get('Category')->getData();
                 $categoriesIdList = array();
                 foreach ($Categories as $Category) {
-                    foreach($Category->getPath() as $ParentCategory){
-                        if (!isset($categoriesIdList[$ParentCategory->getId()])){
+                    foreach ($Category->getPath() as $ParentCategory) {
+                        if (!isset($categoriesIdList[$ParentCategory->getId()])) {
                             $ProductCategory = $this->createProductCategory($Product, $ParentCategory, $count);
                             $app['orm.em']->persist($ProductCategory);
                             $count++;
@@ -374,7 +374,7 @@ 
                             $categoriesIdList[$ParentCategory->getId()] = true;
                         }
                     }
-                    if (!isset($categoriesIdList[$Category->getId()])){
+                    if (!isset($categoriesIdList[$Category->getId()])) {
                         $ProductCategory = $this->createProductCategory($Product, $Category, $count);
                         $app['orm.em']->persist($ProductCategory);
                         $count++;
@@ -396,7 +396,7 @@ 
                     $app['orm.em']->persist($ProductImage);
 
                     // 移動
-                    $file = new File($app['config']['image_temp_realdir'] . '/' . $add_image);
+                    $file = new File($app['config']['image_temp_realdir'].'/'.$add_image);
                     $file->move($app['config']['image_save_realdir']);
                 }
 
@@ -416,7 +416,7 @@ 
 
                     // 削除
                     $fs = new Filesystem();
-                    $fs->remove($app['config']['image_save_realdir'] . '/' . $delete_image);
+                    $fs->remove($app['config']['image_save_realdir'].'/'.$delete_image);
                 }
                 $app['orm.em']->persist($Product);
                 $app['orm.em']->flush();
@@ -576,7 +576,7 @@ 
                 foreach ($deleteImages as $deleteImage) {
                     try {
                         $fs = new Filesystem();
-                        $fs->remove($app['config']['image_save_realdir'] . '/' . $deleteImage);
+                        $fs->remove($app['config']['image_save_realdir'].'/'.$deleteImage);
                     } catch (\Exception $e) {
                         // エラーが発生しても無視する
                     }
@@ -646,10 +646,10 @@ 
 
                     // 画像ファイルを新規作成
                     $extension = pathinfo($Image->getFileName(), PATHINFO_EXTENSION);
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
                     try {
                         $fs = new Filesystem();
-                        $fs->copy($app['config']['image_save_realdir'] . '/' . $Image->getFileName(), $app['config']['image_save_realdir'] . '/' . $filename);
+                        $fs->copy($app['config']['image_save_realdir'].'/'.$Image->getFileName(), $app['config']['image_save_realdir'].'/'.$filename);
                     } catch (\Exception $e) {
                         // エラーが発生しても無視する
                     }
@@ -724,7 +724,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_PRODUCT);
@@ -748,7 +748,7 @@ 
 
             // データ行の出力.
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) use ($app, $request) {
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) use ($app, $request) {
 
                 $Csvs = $csvService->getCsvs();
 
@@ -792,9 +792,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'product_' . $now->format('YmdHis') . '.csv';
+        $filename = 'product_'.$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));