EC-CUBE / ec-cube

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

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/Admin/Store/PluginController.php

Spacing +23 added lines, -23 removed lines

@@ -58,7 +58,7 @@ 
         foreach ($Plugins as $Plugin) {
 
             $form = $app['form.factory']
-                ->createNamedBuilder('form' . $Plugin->getId(), 'plugin_management', null, array(
+                ->createNamedBuilder('form'.$Plugin->getId(), 'plugin_management', null, array(
                     'plugin_id' => $Plugin->getId(),
                 ))
                 ->getForm();
@@ -67,7 +67,7 @@ 
 
             try {
                 // プラグイン用設定画面があれば表示(プラグイン用のサービスプロバイダーに定義されているか)
-                $configPages[$Plugin->getCode()] = $app->url('plugin_' . $Plugin->getCode() . '_config');
+                $configPages[$Plugin->getCode()] = $app->url('plugin_'.$Plugin->getCode().'_config');
             } catch (\Exception $e) {
                 // プラグインで設定画面のルートが定義されていない場合は無視
             }
@@ -89,7 +89,7 @@ 
         if (!is_null($authKey)) {
 
             // オーナーズストア通信
-            $url = $app['config']['owners_store_url'] . '?method=list';
+            $url = $app['config']['owners_store_url'].'?method=list';
             list($json, $httpHeader) = $this->getRequestApi($request, $authKey, $url);
 
             if ($json) {
@@ -150,7 +150,7 @@ 
         $Plugin = $app['eccube.repository.plugin']->find($id);
 
         $form = $app['form.factory']
-            ->createNamedBuilder('form' . $id, 'plugin_management', null, array(
+            ->createNamedBuilder('form'.$id, 'plugin_management', null, array(
                 'plugin_id' => null, // placeHolder
             ))
             ->getForm();
@@ -168,10 +168,10 @@ 
                     $formFile = $form['plugin_archive']->getData();
 
                     $tmpDir = $app['eccube.service.plugin']->createTempDir();
-                    $tmpFile = sha1(Str::random(32)) . '.' . $formFile->getClientOriginalExtension();
+                    $tmpFile = sha1(Str::random(32)).'.'.$formFile->getClientOriginalExtension();
 
                     $formFile->move($tmpDir, $tmpFile);
-                    $app['eccube.service.plugin']->update($Plugin, $tmpDir . '/' . $tmpFile);
+                    $app['eccube.service.plugin']->update($Plugin, $tmpDir.'/'.$tmpFile);
 
                     $fs = new Filesystem();
                     $fs->remove($tmpDir);
@@ -340,11 +340,11 @@ 
                     $formFile = $form['plugin_archive']->getData();
 
                     $tmpDir = $service->createTempDir();
-                    $tmpFile = sha1(Str::random(32)) . '.' . $formFile->getClientOriginalExtension(); // 拡張子を付けないとpharが動かないので付ける
+                    $tmpFile = sha1(Str::random(32)).'.'.$formFile->getClientOriginalExtension(); // 拡張子を付けないとpharが動かないので付ける
 
                     $formFile->move($tmpDir, $tmpFile);
 
-                    $service->install($tmpDir . '/' . $tmpFile);
+                    $service->install($tmpDir.'/'.$tmpFile);
 
                     $fs = new Filesystem();
                     $fs->remove($tmpDir);
@@ -391,7 +391,7 @@ 
         if (!is_null($authKey)) {
 
             // オーナーズストア通信
-            $url = $app['config']['owners_store_url'] . '?method=list';
+            $url = $app['config']['owners_store_url'].'?method=list';
             list($json, $httpHeader) = $this->getRequestApi($request, $authKey, $url);
 
             if ($json === false) {
@@ -465,7 +465,7 @@ 
                         }
 
                     } else {
-                        $message = $data['error_code'] . ' : ' . $data['error_message'];
+                        $message = $data['error_code'].' : '.$data['error_message'];
                     }
                 } else {
                     $success = 0;
@@ -507,7 +507,7 @@ 
         if (!is_null($authKey)) {
 
             // オーナーズストア通信
-            $url = $app['config']['owners_store_url'] . '?method=download&product_id=' . $id;
+            $url = $app['config']['owners_store_url'].'?method=download&product_id='.$id;
             list($json, $httpHeader) = $this->getRequestApi($request, $authKey, $url);
 
             if ($json === false) {
@@ -532,22 +532,22 @@ 
                             $extension = pathinfo($item['file_name'], PATHINFO_EXTENSION);
 
                             $tmpDir = $service->createTempDir();
-                            $tmpFile = sha1(Str::random(32)) . '.' . $extension;
+                            $tmpFile = sha1(Str::random(32)).'.'.$extension;
 
                             // ファイル作成
                             $fs = new Filesystem();
-                            $fs->dumpFile($tmpDir . '/' . $tmpFile, $file);
+                            $fs->dumpFile($tmpDir.'/'.$tmpFile, $file);
 
                             if ($action == 'install') {
 
-                                $service->install($tmpDir . '/' . $tmpFile, $id);
+                                $service->install($tmpDir.'/'.$tmpFile, $id);
                                 $app->addSuccess('admin.plugin.install.complete', 'admin');
 
                             } else if ($action == 'update') {
 
                                 $Plugin = $app['eccube.repository.plugin']->findOneBy(array('source' => $id));
 
-                                $service->update($Plugin, $tmpDir . '/' . $tmpFile);
+                                $service->update($Plugin, $tmpDir.'/'.$tmpFile);
                                 $app->addSuccess('admin.plugin.update.complete', 'admin');
 
                                 Cache::clear($app, false);
@@ -558,7 +558,7 @@ 
                             $fs->remove($tmpDir);
 
                             // ダウンロード完了通知処理(正常終了時)
-                            $url = $app['config']['owners_store_url'] . '?method=commit&product_id=' . $id . '&status=1&version=' . $version;
+                            $url = $app['config']['owners_store_url'].'?method=commit&product_id='.$id.'&status=1&version='.$version;
                             $this->getRequestApi($request, $authKey, $url);
 
                             return $app->redirect($app->url('admin_store_plugin'));
@@ -572,7 +572,7 @@ 
                         }
 
                     } else {
-                        $message = $data['error_code'] . ' : ' . $data['error_message'];
+                        $message = $data['error_code'].' : '.$data['error_message'];
                     }
                 } else {
                     $message = "EC-CUBEオーナーズストアにエラーが発生しています。";
@@ -581,7 +581,7 @@ 
         }
 
         // ダウンロード完了通知処理(エラー発生時)
-        $url = $app['config']['owners_store_url'] . '?method=commit&product_id=' . $id . '&status=0&version=' . $version . '&message=' . urlencode($message);
+        $url = $app['config']['owners_store_url'].'?method=commit&product_id='.$id.'&status=0&version='.$version.'&message='.urlencode($message);
         $this->getRequestApi($request, $authKey, $url);
 
         $app->addError($message, 'admin');
@@ -653,9 +653,9 @@ 
                 'ignore_errors' => false,
                 'timeout' => 60,
                 'header' => array(
-                    'Authorization: ' . base64_encode($authKey),
-                    'x-eccube-store-url: ' . base64_encode($request->getSchemeAndHttpHost() . $request->getBasePath()),
-                    'x-eccube-store-version: ' . base64_encode(Constant::VERSION)
+                    'Authorization: '.base64_encode($authKey),
+                    'x-eccube-store-url: '.base64_encode($request->getSchemeAndHttpHost().$request->getBasePath()),
+                    'x-eccube-store-version: '.base64_encode(Constant::VERSION)
                 )
             )
         );
@@ -680,10 +680,10 @@ 
 
             switch ($statusCode) {
                 case '404':
-                    $message = $statusCode . ' : ' . $message;
+                    $message = $statusCode.' : '.$message;
                     break;
                 case '500':
-                    $message = $statusCode . ' : ' . $message;
+                    $message = $statusCode.' : '.$message;
                     break;
                 default:
                     $message = "EC-CUBEオーナーズストアにエラーが発生しています。";

src/Eccube/Controller/Admin/Store/TemplateController.php

Spacing +27 added lines, -27 removed lines

@@ -65,15 +65,15 @@ 
                     ->find($form['selected']->getData());
 
                 // path.ymlの再構築
-                $file = $app['config']['root_dir'] . '/app/config/eccube/path.yml';
+                $file = $app['config']['root_dir'].'/app/config/eccube/path.yml';
                 $config = Yaml::parse($file);
 
                 $templateCode = $Template->getCode();
                 $config['template_code'] = $templateCode;
-                $config['template_realdir'] = $config['root_dir'] . '/app/template/' . $templateCode;
-                $config['template_html_realdir'] = $config['root_dir'] . '/html/template/' . $templateCode;
-                $config['front_urlpath'] = $config['root_urlpath'] . '/template/' . $templateCode;
-                $config['block_realdir'] =$config['template_realdir'] . '/Block';
+                $config['template_realdir'] = $config['root_dir'].'/app/template/'.$templateCode;
+                $config['template_html_realdir'] = $config['root_dir'].'/html/template/'.$templateCode;
+                $config['front_urlpath'] = $config['root_urlpath'].'/template/'.$templateCode;
+                $config['block_realdir'] = $config['template_realdir'].'/Block';
 
                 file_put_contents($file, Yaml::dump($config));
 
@@ -108,19 +108,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();
@@ -140,14 +140,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);
@@ -188,8 +188,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);
@@ -232,18 +232,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);
@@ -252,11 +252,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/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();
                 }
             }

src/Eccube/Controller/Mypage/DeliveryController.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 
         // 遷移が正しくない場合、デフォルトであるマイページの配送先追加の画面を設定する
         if (!in_array($parentPage, $allowdParents)) {
-            $parentPage  = $app->url('mypage_delivery');
+            $parentPage = $app->url('mypage_delivery');
         }
 
         /* @var $form \Symfony\Component\Form\FormInterface */

src/Eccube/Controller/UserDataController.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
         $paths[] = $app['config']['user_data_realdir'];
         $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths));
 
-        $file = $PageLayout->getFileName() . '.twig';
+        $file = $PageLayout->getFileName().'.twig';
 
         return $app['twig']->render($file);
     }

src/Eccube/Doctrine/Filter/NoStockHiddenFilter.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias)
     {
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\ProductClass') {
-            return $targetTableAlias . '.stock >= 1 OR ' . $targetTableAlias . '.stock_unlimited = 1';
+            return $targetTableAlias.'.stock >= 1 OR '.$targetTableAlias.'.stock_unlimited = 1';
         } else {
             return "";
         }

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

src/Eccube/Doctrine/Filter/SoftDeleteFilter.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
     public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias)
     {
         if ($targetEntity->hasField('del_flg') && !in_array($targetEntity->getName(), $this->getExcludes())) {
-            return $targetTableAlias . '.del_flg = 0';
+            return $targetTableAlias.'.del_flg = 0';
         } else {
             return "";
         }