EC-CUBE / ec-cube

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

Spacing +6 added lines, -6 removed lines

@@ -93,10 +93,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
                     );
                 }
 
@@ -144,7 +144,7 @@ 
             }
 
             $extension = $image->guessExtension();
-            $filename = date('mdHis') . uniqid('_') . '.' . $extension;
+            $filename = date('mdHis').uniqid('_').'.'.$extension;
             $image->move($app['config']['image_temp_realdir'], $filename);
         }
         $event = new EventArgs(
@@ -180,7 +180,7 @@ 
         foreach ($Payments as $Payment) {
             if ($Payment->getId() != $id) {
                 $Payment->setRank($rank);
-                $rank ++;
+                $rank++;
             }
         }
 
@@ -194,7 +194,7 @@ 
         );
         $app['eccube.event.dispatcher']->dispatch(EccubeEvents::ADMIN_SETTING_SHOP_PAYMENT_DELETE_COMPLETE, $event);
 
-        $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/Store/TemplateController.php

Spacing +23 added lines, -23 removed lines

@@ -77,7 +77,7 @@ 
                 $config['template_realdir'] = $config['root_dir'].'/app/template/'.$templateCode;
                 $config['template_html_realdir'] = $config['public_path_realdir'].'/template/'.$templateCode;
                 $config['front_urlpath'] = $config['root_urlpath'].RELATIVE_PUBLIC_DIR_PATH.'/template/'.$templateCode;
-                $config['block_realdir'] =$config['template_realdir'].'/Block';
+                $config['block_realdir'] = $config['template_realdir'].'/Block';
 
                 if (file_exists($file.'.php')) {
                     file_put_contents($file.'.php', sprintf('<?php return %s', var_export($config, true)).';');
@@ -117,19 +117,19 @@ 
         // 該当テンプレートのディレクトリ
         $config = $app['config'];
         $templateCode = $Template->getCode();
-        $targetRealDir = $config['root_dir'] . '/app/template/' . $templateCode;
-        $targetHtmlRealDir = $config['root_dir'] . '/html/template/' . $templateCode;
+        $targetRealDir = $config['root_dir'].'/app/template/'.$templateCode;
+        $targetHtmlRealDir = $config['root_dir'].'/html/template/'.$templateCode;
 
         // 一時ディレクトリ
         $uniqId = sha1(Str::random(32));
-        $tmpDir = $config['template_temp_realdir'] . '/' . $uniqId;
-        $appDir = $tmpDir . '/app';
-        $htmlDir = $tmpDir . '/html';
+        $tmpDir = $config['template_temp_realdir'].'/'.$uniqId;
+        $appDir = $tmpDir.'/app';
+        $htmlDir = $tmpDir.'/html';
 
         // ファイル名
-        $tarFile = $config['template_temp_realdir'] . '/' . $uniqId . '.tar';
-        $tarGzFile = $tarFile . '.gz';
-        $downloadFileName = $Template->getCode() . '.tar.gz';
+        $tarFile = $config['template_temp_realdir'].'/'.$uniqId.'.tar';
+        $tarGzFile = $tarFile.'.gz';
+        $downloadFileName = $Template->getCode().'.tar.gz';
 
         // 該当テンプレートを一時ディレクトリへコピーする.
         $fs = new Filesystem();
@@ -149,14 +149,14 @@ 
 
         // ダウンロード完了後にファイルを削除する.
         // http://stackoverflow.com/questions/15238897/removing-file-after-delivering-response-with-silex-symfony
-        $app->finish(function (Request $request, Response $response, \Silex\Application $app) use (
+        $app->finish(function(Request $request, Response $response, \Silex\Application $app) use (
             $tmpDir,
             $tarFile,
             $tarGzFile
         ) {
-            $app['monolog']->addDebug('remove temp file: ' . $tmpDir);
-            $app['monolog']->addDebug('remove temp file: ' . $tarFile);
-            $app['monolog']->addDebug('remove temp file: ' . $tarGzFile);
+            $app['monolog']->addDebug('remove temp file: '.$tmpDir);
+            $app['monolog']->addDebug('remove temp file: '.$tarFile);
+            $app['monolog']->addDebug('remove temp file: '.$tarGzFile);
             $fs = new Filesystem();
             $fs->remove($tmpDir);
             $fs->remove($tarFile);
@@ -197,8 +197,8 @@ 
         // テンプレートディレクトリの削除
         $config = $app['config'];
         $templateCode = $Template->getCode();
-        $targetRealDir = $config['root_dir'] . '/app/template/' . $templateCode;
-        $targetHtmlRealDir = $config['root_dir'] . '/html/template/' . $templateCode;
+        $targetRealDir = $config['root_dir'].'/app/template/'.$templateCode;
+        $targetHtmlRealDir = $config['root_dir'].'/html/template/'.$templateCode;
 
         $fs = new Filesystem();
         $fs->remove($targetRealDir);
@@ -241,18 +241,18 @@ 
                 // 該当テンプレートのディレクトリ
                 $config = $app['config'];
                 $templateCode = $Template->getCode();
-                $targetRealDir = $config['root_dir'] . '/app/template/' . $templateCode;
-                $targetHtmlRealDir = $config['root_dir'] . '/html/template/' . $templateCode;
+                $targetRealDir = $config['root_dir'].'/app/template/'.$templateCode;
+                $targetHtmlRealDir = $config['root_dir'].'/html/template/'.$templateCode;
 
                 // 一時ディレクトリ
                 $uniqId = sha1(Str::random(32));
-                $tmpDir = $config['template_temp_realdir'] . '/' . $uniqId;
-                $appDir = $tmpDir . '/app';
-                $htmlDir = $tmpDir . '/html';
+                $tmpDir = $config['template_temp_realdir'].'/'.$uniqId;
+                $appDir = $tmpDir.'/app';
+                $htmlDir = $tmpDir.'/html';
 
                 $formFile = $form['file']->getData();
                 // ファイル名
-                $archive = $templateCode . '.' . $formFile->getClientOriginalExtension();
+                $archive = $templateCode.'.'.$formFile->getClientOriginalExtension();
 
                 // ファイルを一時ディレクトリへ移動.
                 $formFile->move($tmpDir, $archive);
@@ -261,11 +261,11 @@ 
                 try {
                     if ($formFile->getClientOriginalExtension() == 'zip') {
                         $zip = new \ZipArchive();
-                        $zip->open($tmpDir . '/' . $archive);
+                        $zip->open($tmpDir.'/'.$archive);
                         $zip->extractTo($tmpDir);
                         $zip->close();
                     } else {
-                        $phar = new \PharData($tmpDir . '/' . $archive);
+                        $phar = new \PharData($tmpDir.'/'.$archive);
                         $phar->extractTo($tmpDir, null, true);
                     }
                 } catch (\Exception $e) {

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

Spacing +4 added lines, -4 removed lines

@@ -205,7 +205,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);
@@ -219,7 +219,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();
 
@@ -239,9 +239,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();
 
         log_info('カテゴリCSV出力ファイル名', array($filename));

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

Spacing +3 added lines, -3 removed lines

@@ -114,7 +114,7 @@ 
                 // ファイル生成・更新
                 $tplDir = $app['config']['block_realdir'];
 
-                $filePath = $tplDir . '/' . $Block->getFileName() . '.twig';
+                $filePath = $tplDir.'/'.$Block->getFileName().'.twig';
 
                 $fs = new Filesystem();
                 $blockData = $form->get('block_html')->getData();
@@ -122,7 +122,7 @@ 
                 $fs->dumpFile($filePath, $blockData);
                 // 更新でファイル名を変更した場合、以前のファイルを削除
                 if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) {
-                    $oldFilePath = $tplDir . '/' . $previous_filename . '.twig';
+                    $oldFilePath = $tplDir.'/'.$previous_filename.'.twig';
                     if ($fs->exists($oldFilePath)) {
                         $fs->remove($oldFilePath);
                     }
@@ -175,7 +175,7 @@ 
         // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る
         if ($Block->getDeletableFlg() > 0) {
             $tplDir = $app['config']['block_realdir'];
-            $file = $tplDir . '/' . $Block->getFileName() . '.twig';
+            $file = $tplDir.'/'.$Block->getFileName().'.twig';
             $fs = new Filesystem();
             if ($fs->exists($file)) {
                 $fs->remove($file);

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('不正なアクセスです。');