EC-CUBE / ec-cube

src/Eccube/Application.php

Unused Use Statements -5 removed lines

@@ -25,11 +25,6 @@
 
 use Eccube\Application\ApplicationTrait;
 use Eccube\Common\Constant;
-use Monolog\Formatter\LineFormatter;
-use Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy;
-use Monolog\Handler\FingersCrossedHandler;
-use Monolog\Handler\RotatingFileHandler;
-use Monolog\Logger;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpFoundation\Request;

src/Eccube/Command/CacheClearCommand.php

Unused Use Statements -1 removed lines

@@ -24,7 +24,6 @@
 
 namespace Eccube\Command;
 
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputOption;

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
     protected function execute(InputInterface $input, OutputInterface $output) {
 
-        \Eccube\Util\Cache::clear($this->app,$input->getOption('all'));
+        \Eccube\Util\Cache::clear($this->app, $input->getOption('all'));
         $output->writeln(sprintf("%s <info>success</info>", 'cache:clear'));
 
     }

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

Unused Use Statements -2 removed lines

@@ -24,12 +24,10 @@
 
 namespace Eccube\Controller\Admin\Product;
 
-use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Validator\Constraints as Assert;
-
 use Eccube\Application;
 use Eccube\Common\Constant;
 use Eccube\Entity\ClassName;

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());

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

Unused Use Statements -1 removed lines

@@ -23,7 +23,6 @@
 
 namespace Eccube\Controller\Admin\Setting\System;
 
-use Doctrine\Common\Util\Debug;
 use Eccube\Application;
 use Eccube\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;

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

Unused Use Statements -2 removed lines

@@ -28,9 +28,7 @@
 use Eccube\Common\Constant;
 use Eccube\Util\Str;
 use Eccube\Controller\AbstractController;
-
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Yaml\Yaml;
 
 

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

Unused Use Statements -1 removed lines

@@ -28,7 +28,6 @@
 use Eccube\Entity\Master\DeviceType;
 use Eccube\Util\Str;
 use Symfony\Component\Filesystem\Filesystem;
-use Symfony\Component\Finder\Finder;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;

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/Form/Type/KanaType.php

Unused Use Statements -2 removed lines

@@ -25,9 +25,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**

src/Eccube/Service/CsvExportService.php

Unused Use Statements -1 removed lines

@@ -26,7 +26,6 @@
 
 use Eccube\Common\Constant;
 use Eccube\Util\EntityUtil;
-use Symfony\Component\Form\FormFactory;
 use Symfony\Component\HttpFoundation\Request;
 
 class CsvExportService

Spacing +1 added lines, -1 removed lines

@@ -307,7 +307,7 @@
     {
         $config = $this->config;
 
-        return function ($value) use ($config) {
+        return function($value) use ($config) {
             return mb_convert_encoding(
                 (string) $value, $config['csv_export_encoding'], 'UTF-8'
             );

src/Eccube/Service/CsvImportService.php

Unused Use Statements -2 removed lines

@@ -23,8 +23,6 @@
 
 namespace Eccube\Service;
 
-use Eccube\Application;
-
 
 /**
  * Copyright (C) 2012-2014 David de Boer <david@ddeboer.nl>

Spacing +4 added lines, -4 removed lines

@@ -117,9 +117,9 @@ 
 
         $this->file = $file;
         $this->file->setFlags(
-            \SplFileObject::READ_CSV |
-            \SplFileObject::SKIP_EMPTY |
-            \SplFileObject::READ_AHEAD |
+            \SplFileObject::READ_CSV|
+            \SplFileObject::SKIP_EMPTY|
+            \SplFileObject::READ_AHEAD|
             \SplFileObject::DROP_NEW_LINE
         );
         $this->file->setCsvControl(
@@ -358,7 +358,7 @@ 
             if ($count > 1) {
                 $incrementedHeaders[] = $header;
                 for ($i = 1; $i < $count; $i++) {
-                    $incrementedHeaders[] = $header . $i;
+                    $incrementedHeaders[] = $header.$i;
                 }
             } else {
                 $incrementedHeaders[] = $header;