EC-CUBE / ec-cube

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;

src/Eccube/Service/PluginService.php

Doc Comments +21 added lines

@@ -36,6 +36,9 @@ 
     const EVENT_YML = 'event.yml';
     private $app;
 
+    /**
+     * @param \Silex\Application $app
+     */
     public function __construct($app)
     {
         $this->app = $app;
@@ -98,6 +101,9 @@ 
         }
     }
 
+    /**
+     * @param string $dir
+     */
     public function unpackPluginArchive($archive, $dir)
     {
         $extension = pathinfo($archive, PATHINFO_EXTENSION);
@@ -116,6 +122,9 @@ 
         }
     }
 
+    /**
+     * @param string $dir
+     */
     public function checkPluginArchiveContent($dir)
     {
         $meta = $this->readYml($dir.'/config.yml');
@@ -138,6 +147,9 @@ 
         }
     }
 
+    /**
+     * @param string $yml
+     */
     public function readYml($yml)
     {
         return Yaml::Parse($yml);
@@ -151,6 +163,9 @@ 
         // ディレクトリ名などに使われれるので厳しめ
     }
 
+    /**
+     * @param string $path
+     */
     public function deleteFile($path)
     {
         $f = new Filesystem();
@@ -170,6 +185,9 @@ 
         return $this->app['config']['plugin_realdir'].'/'.$name;
     }
 
+    /**
+     * @param string $d
+     */
     public function createPluginDir($d)
     {
         $b = mkdir($d);
@@ -229,6 +247,9 @@ 
         return $p;
     }
 
+    /**
+     * @param string $method
+     */
     public function callPluginManagerMethod($meta, $method)
     {
         $class = '\\Plugin'.'\\'.$meta['code'].'\\'.'PluginManager';

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
     public function checkPluginArchiveContent($dir)
     {
         try {
-            $meta = $this->readYml($dir . '/config.yml');
+            $meta = $this->readYml($dir.'/config.yml');
         } catch (\Symfony\Component\Yaml\Exception\ParseException $e) {
             $this->app['monolog']->warning($e->getMessage());
             throw new PluginException($e->getMessage(), $e->getCode(), $e);

src/Eccube/Service/ShoppingService.php

Doc Comments +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
      * 仮受注情報作成
      *
      * @param $Customer
-     * @param $preOrderId
+     * @param string $preOrderId
      * @return mixed
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException

Spacing +6 added lines, -6 removed lines

@@ -270,7 +270,7 @@ 
             ->setFax03($Customer->getFax03())
             ->setZip01($Customer->getZip01())
             ->setZip02($Customer->getZip02())
-            ->setZipCode($Customer->getZip01() . $Customer->getZip02())
+            ->setZipCode($Customer->getZip01().$Customer->getZip02())
             ->setPref($Customer->getPref())
             ->setAddr01($Customer->getAddr01())
             ->setAddr02($Customer->getAddr02())
@@ -409,7 +409,7 @@ 
                 ->setFax03($CustomerAddress->getFax03())
                 ->setZip01($CustomerAddress->getZip01())
                 ->setZip02($CustomerAddress->getZip02())
-                ->setZipCode($CustomerAddress->getZip01() . $CustomerAddress->getZip02())
+                ->setZipCode($CustomerAddress->getZip01().$CustomerAddress->getZip02())
                 ->setPref($CustomerAddress->getPref())
                 ->setAddr01($CustomerAddress->getAddr01())
                 ->setAddr02($CustomerAddress->getAddr02());
@@ -428,7 +428,7 @@ 
                 ->setFax03($Customer->getFax03())
                 ->setZip01($Customer->getZip01())
                 ->setZip02($Customer->getZip02())
-                ->setZipCode($Customer->getZip01() . $Customer->getZip02())
+                ->setZipCode($Customer->getZip01().$Customer->getZip02())
                 ->setPref($Customer->getPref())
                 ->setAddr01($Customer->getAddr01())
                 ->setAddr02($Customer->getAddr02());
@@ -913,10 +913,10 @@ 
 
         // 配送日数が設定されている
         if ($deliveryDateFlag) {
-            $period = new \DatePeriod (
-                new \DateTime($minDate . ' day'),
+            $period = new \DatePeriod(
+                new \DateTime($minDate.' day'),
                 new \DateInterval('P1D'),
-                new \DateTime($minDate + $this->app['config']['deliv_date_end_max'] . ' day')
+                new \DateTime($minDate + $this->app['config']['deliv_date_end_max'].' day')
             );
 
             foreach ($period as $day) {

html/index.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 require __DIR__.'/../autoload.php';
 
 ini_set('display_errors', 'Off');
-error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
+error_reporting(E_ALL&~E_DEPRECATED&~E_STRICT);
 
 $app = new Eccube\Application();
 

html/index_dev.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 
 // load config dev
 $conf = $app['config'];
-$app['config'] = $app->share(function () use ($conf) {
+$app['config'] = $app->share(function() use ($conf) {
     $confarray = array();
     $config_dev_file = __DIR__.'/../app/config/eccube/config_dev.yml';
     if (file_exists($config_dev_file)) {

html/install.php

Spacing +2 added lines, -2 removed lines

@@ -26,11 +26,11 @@
     apc_clear_cache();
 }
 
-require __DIR__ . '/../autoload.php';
+require __DIR__.'/../autoload.php';
 
 $app = new Eccube\InstallApplication();
 $app['debug'] = true;
-$app->before(function (\Symfony\Component\HttpFoundation\Request $request, \Silex\Application $app) {
+$app->before(function(\Symfony\Component\HttpFoundation\Request $request, \Silex\Application $app) {
     if (!$request->getSession()->isStarted()) {
         $request->getSession()->start();
     }

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/Content/BlockController.php

Spacing +5 added lines, -5 removed lines

@@ -88,19 +88,19 @@ 
                 // ファイル生成・更新
                 $tplDir = $app['config']['block_realdir'];
 
-                $filePath = $tplDir . '/' . $Block->getFileName() . '.twig';
+                $filePath = $tplDir.'/'.$Block->getFileName().'.twig';
 
                 $fs = new Filesystem();
                 $fs->dumpFile($filePath, $form->get('block_html')->getData());
                 // 更新でファイル名を変更した場合、以前のファイルを削除
                 if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) {
-                    $oldFilePath = $tplDir . $previous_filename;
+                    $oldFilePath = $tplDir.$previous_filename;
                     if ($fs->exists($oldFilePath)) {
                         $fs->remove($oldFilePath);
                     }
                 }
 
-                \Eccube\Util\Cache::clear($app,false);
+                \Eccube\Util\Cache::clear($app, false);
 
                 $app->addSuccess('admin.register.complete', 'admin');
 
@@ -137,7 +137,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);
@@ -146,7 +146,7 @@ 
             $app['orm.em']->flush();
 
             $app->addSuccess('admin.delete.complete', 'admin');
-            \Eccube\Util\Cache::clear($app,false);
+            \Eccube\Util\Cache::clear($app, false);
         }
 
 

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;

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