EC-CUBE / ec-cube

src/Eccube/Controller/ProductController.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
             ));
             $addCartForm = $builder->getForm();
 
-            if ($request->getMethod() === 'POST' && (string)$Product->getId() === $request->get('product_id')) {
+            if ($request->getMethod() === 'POST' && (string) $Product->getId() === $request->get('product_id')) {
                 $addCartForm->handleRequest($request);
 
                 if ($addCartForm->isValid()) {

src/Eccube/Application/ApplicationTrait.php

Spacing +10 added lines, -10 removed lines

@@ -20,32 +20,32 @@ 
      */
     public function addSuccess($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.success', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.success', $message);
     }
 
     public function addError($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.error', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.error', $message);
     }
 
     public function addDanger($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.danger', $message);
     }
 
     public function addWarning($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.warning', $message);
     }
 
     public function addInfo($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.info', $message);
     }
 
     public function addRequestError($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message);
+        $this['session']->getFlashBag()->set('eccube.'.$namespace.'.request.error', $message);
     }
 
     public function clearMessage()
@@ -64,7 +64,7 @@ 
         if (is_null($namespace)) {
             $this['session']->getFlashBag()->set('eccube.login.target.path', $targetPath);
         } else {
-            $this['session']->getFlashBag()->set('eccube.' . $namespace . '.login.target.path', $targetPath);
+            $this['session']->getFlashBag()->set('eccube.'.$namespace.'.login.target.path', $targetPath);
         }
     }
 
@@ -234,14 +234,14 @@ 
         $eventName = $view;
         if ($this->isAdminRequest()) {
             // 管理画面の場合、event名に「Admin/」を付ける
-            $eventName = 'Admin/' . $view;
+            $eventName = 'Admin/'.$view;
         }
-        $this['monolog']->debug('Template Event Name : ' . $eventName);
+        $this['monolog']->debug('Template Event Name : '.$eventName);
 
         $this['eccube.event.dispatcher']->dispatch($eventName, $event);
 
         if ($response instanceof StreamedResponse) {
-            $response->setCallback(function () use ($twig, $view, $parameters) {
+            $response->setCallback(function() use ($twig, $view, $parameters) {
                 $twig->display($view, $parameters);
             });
         } else {

src/Eccube/Controller/Admin/Customer/CustomerEditController.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
                         ->setCompanyName($Customer->getCompanyName())
                         ->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())

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

Indentation +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
                                 'allow_add' => true,
                                 'allow_delete' => true,
                                 'data' => $ProductClasses,
-                             ));
+                                ));
 
                         $event = new EventArgs(
                             array(

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
                     $class2Valied = $this->isValiedCategory($ClassName2);
 
                     // 規格が選択されていないか、選択された状態で分類が保有されていれば、画面表示
-                    if($class1Valied && $class2Valied){
+                    if ($class1Valied && $class2Valied) {
                         $hasClassCategoryFlg = true;
                     }
 

Doc Comments +5 added lines

@@ -529,6 +529,9 @@ 
     /**
      * 登録、更新時のエラー画面表示
      *
+     * @param Application $app
+     * @param boolean $not_product_class
+     * @param \Symfony\Component\Form\FormInterface $classForm
      */
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
     {
@@ -580,6 +583,7 @@ 
 
     /**
      * 規格1と規格2を組み合わせた商品規格を作成
+     * @param Application $app
      */
     private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null)
     {
@@ -667,6 +671,7 @@ 
      *
      * @param $productClassDest コピー先となる商品規格
      * @param $productClassOrig コピー元となる商品規格
+     * @param Application $app
      */
     private function setDefualtProductClass($app, $productClassDest, $productClassOrig) {
         $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate());

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

Spacing +3 added lines, -3 removed lines

@@ -113,13 +113,13 @@ 
                 // ファイル生成・更新
                 $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 . '.twig';
+                    $oldFilePath = $tplDir.'/'.$previous_filename.'.twig';
                     if ($fs->exists($oldFilePath)) {
                         $fs->remove($oldFilePath);
                     }
@@ -171,7 +171,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/Setting/System/SecurityController.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,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/Resource/doctrine/migration/Version20160413151321.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
         // path.ymlの更新
         $app = Application::getInstance();
-        $file = $app['config']['root_dir'] . '/app/config/eccube/path.yml';
+        $file = $app['config']['root_dir'].'/app/config/eccube/path.yml';
         $config = Yaml::parse(file_get_contents($file));
 
         if (!array_key_exists('public_path', $config)) {

src/Eccube/ServiceProvider/DebugServiceProvider.php

Spacing +9 added lines, -9 removed lines

@@ -66,7 +66,7 @@ 
 {
     public function register(Application $app)
     {
-        $app['var_dumper.cloner'] = $app->share(function ($app) {
+        $app['var_dumper.cloner'] = $app->share(function($app) {
             $cloner = new VarCloner();
 
             if (isset($app['debug.max_items'])) {
@@ -80,23 +80,23 @@ 
             return $cloner;
         });
 
-        $app['data_collector.templates'] = $app->share($app->extend('data_collector.templates', function ($templates) {
+        $app['data_collector.templates'] = $app->share($app->extend('data_collector.templates', function($templates) {
             return array_merge($templates, array(array('dump', '@Debug/Profiler/dump.html.twig')));
         }));
 
-        $app['data_collector.dump'] = $app->share(function ($app) {
+        $app['data_collector.dump'] = $app->share(function($app) {
             return new DumpDataCollector($app['stopwatch'], $app['code.file_link_format']);
         });
 
-        $app['data_collectors'] = $app->share($app->extend('data_collectors', function ($collectors, $app) {
-            $collectors['dump'] = $app->share(function ($app) {
+        $app['data_collectors'] = $app->share($app->extend('data_collectors', function($collectors, $app) {
+            $collectors['dump'] = $app->share(function($app) {
                 return $app['data_collector.dump'];
             });
 
             return $collectors;
         }));
 
-        $app['twig'] = $app->share($app->extend('twig', function ($twig, $app) {
+        $app['twig'] = $app->share($app->extend('twig', function($twig, $app) {
             if (class_exists('\Symfony\Bridge\Twig\Extension\DumpExtension')) {
                 $twig->addExtension(new DumpExtension($app['var_dumper.cloner']));
             }
@@ -104,13 +104,13 @@ 
             return $twig;
         }));
 
-        $app['twig.loader.filesystem'] = $app->share($app->extend('twig.loader.filesystem', function ($loader, $app) {
+        $app['twig.loader.filesystem'] = $app->share($app->extend('twig.loader.filesystem', function($loader, $app) {
             $loader->addPath($app['debug.templates_path'], 'Debug');
 
             return $loader;
         }));
 
-        $app['debug.templates_path'] = function () {
+        $app['debug.templates_path'] = function() {
             $r = new \ReflectionClass('Symfony\Bundle\DebugBundle\DependencyInjection\Configuration');
 
             return dirname(dirname($r->getFileName())).'/Resources/views';
@@ -122,7 +122,7 @@ 
         // This code is here to lazy load the dump stack. This default
         // configuration for CLI mode is overridden in HTTP mode on
         // 'kernel.request' event
-        VarDumper::setHandler(function ($var) use ($app) {
+        VarDumper::setHandler(function($var) use ($app) {
             $dumper = new CliDumper();
             $dumper->dump($app['var_dumper.cloner']->cloneVar($var));
         });

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

Doc Comments -1 removed lines

@@ -307,7 +307,6 @@
      * 対象プラグインの README を返却します。
      *
      * @param Application $app
-     * @param unknown $code
      */
     public function readme(Application $app, Request $request, $id)
     {

Unused Use Statements -2 removed lines

@@ -36,8 +36,6 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\Form\FormError;
-use Monolog\Logger;
 
 class PluginController extends AbstractController
 {