EC-CUBE / ec-cube

src/Eccube/Security/Voter/AuthorityVoter.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 
     public function __construct(Application $app)
     {
-        $this->app     = $app;
+        $this->app = $app;
     }
 
     public function supportsAttribute($attribute)

src/Eccube/ServiceProvider/EccubeServiceProvider.php

Spacing +58 added lines, -58 removed lines

@@ -41,28 +41,28 @@ 
     public function register(BaseApplication $app)
     {
         // Service
-        $app['eccube.service.system'] = $app->share(function () use ($app) {
+        $app['eccube.service.system'] = $app->share(function() use ($app) {
             return new \Eccube\Service\SystemService($app);
         });
-        $app['view'] = $app->share(function () use ($app) {
+        $app['view'] = $app->share(function() use ($app) {
             return $app['twig'];
         });
-        $app['eccube.service.cart'] = $app->share(function () use ($app) {
+        $app['eccube.service.cart'] = $app->share(function() use ($app) {
             return new \Eccube\Service\CartService($app);
         });
-        $app['eccube.service.order'] = $app->share(function () use ($app) {
+        $app['eccube.service.order'] = $app->share(function() use ($app) {
             return new \Eccube\Service\OrderService($app);
         });
-        $app['eccube.service.tax_rule'] = $app->share(function () use ($app) {
+        $app['eccube.service.tax_rule'] = $app->share(function() use ($app) {
             return new \Eccube\Service\TaxRuleService($app['eccube.repository.tax_rule']);
         });
-        $app['eccube.service.plugin'] = $app->share(function () use ($app) {
+        $app['eccube.service.plugin'] = $app->share(function() use ($app) {
             return new \Eccube\Service\PluginService($app);
         });
-        $app['eccube.service.mail'] = $app->share(function () use ($app) {
+        $app['eccube.service.mail'] = $app->share(function() use ($app) {
             return new \Eccube\Service\MailService($app);
         });
-        $app['eccube.service.csv.export'] = $app->share(function () use ($app) {
+        $app['eccube.service.csv.export'] = $app->share(function() use ($app) {
             $csvService = new \Eccube\Service\CsvExportService();
             $csvService->setConfig($app['config']);
             $csvService->setCsvRepository($app['eccube.repository.csv']);
@@ -73,170 +73,170 @@ 
 
             return $csvService;
         });
-        $app['eccube.service.shopping'] = $app->share(function () use ($app) {
+        $app['eccube.service.shopping'] = $app->share(function() use ($app) {
             return new \Eccube\Service\ShoppingService($app, $app['eccube.service.cart'], $app['eccube.service.order']);
         });
 
         // Repository
-        $app['eccube.repository.master.authority'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.authority'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Authority');
         });
-        $app['eccube.repository.master.tag'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.tag'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Tag');
         });
-        $app['eccube.repository.master.pref'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.pref'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Pref');
         });
-        $app['eccube.repository.master.sex'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.sex'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Sex');
         });
-        $app['eccube.repository.master.disp'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.disp'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Disp');
         });
-        $app['eccube.repository.master.product_type'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.product_type'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductType');
         });
-        $app['eccube.repository.master.page_max'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.page_max'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\PageMax');
         });
-        $app['eccube.repository.master.order_status'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.order_status'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus');
         });
-        $app['eccube.repository.master.device_type'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.device_type'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\DeviceType');
         });
-        $app['eccube.repository.master.csv_type'] = $app->share(function () use ($app) {
+        $app['eccube.repository.master.csv_type'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\CsvType');
         });
 
-        $app['eccube.repository.delivery'] = $app->share(function () use ($app) {
+        $app['eccube.repository.delivery'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Delivery');
         });
-        $app['eccube.repository.delivery_date'] = $app->share(function () use ($app) {
+        $app['eccube.repository.delivery_date'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryDate');
         });
-        $app['eccube.repository.delivery_fee'] = $app->share(function () use ($app) {
+        $app['eccube.repository.delivery_fee'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryFee');
         });
-        $app['eccube.repository.delivery_time'] = $app->share(function () use ($app) {
+        $app['eccube.repository.delivery_time'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryTime');
         });
-        $app['eccube.repository.payment'] = $app->share(function () use ($app) {
+        $app['eccube.repository.payment'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Payment');
         });
-        $app['eccube.repository.payment_option'] = $app->share(function () use ($app) {
+        $app['eccube.repository.payment_option'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\PaymentOption');
         });
-        $app['eccube.repository.category'] = $app->share(function () use ($app) {
+        $app['eccube.repository.category'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Category');
         });
-        $app['eccube.repository.customer'] = $app->share(function () use ($app) {
+        $app['eccube.repository.customer'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Customer');
         });
-        $app['eccube.repository.news'] = $app->share(function () use ($app) {
+        $app['eccube.repository.news'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\News');
         });
-        $app['eccube.repository.mail_history'] = $app->share(function () use ($app) {
+        $app['eccube.repository.mail_history'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\MailHistory');
         });
-        $app['eccube.repository.member'] = $app->share(function () use ($app) {
+        $app['eccube.repository.member'] = $app->share(function() use ($app) {
             $memberRepository = $app['orm.em']->getRepository('Eccube\Entity\Member');
             $memberRepository->setEncoderFactorty($app['security.encoder_factory']);
             return $memberRepository;
         });
-        $app['eccube.repository.order'] = $app->share(function () use ($app) {
+        $app['eccube.repository.order'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Order');
         });
-        $app['eccube.repository.product'] = $app->share(function () use ($app) {
+        $app['eccube.repository.product'] = $app->share(function() use ($app) {
             $productRepository = $app['orm.em']->getRepository('Eccube\Entity\Product');
             return $productRepository;
         });
-        $app['eccube.repository.product_image'] = $app->share(function () use ($app) {
+        $app['eccube.repository.product_image'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ProductImage');
         });
-        $app['eccube.repository.product_class'] = $app->share(function () use ($app) {
+        $app['eccube.repository.product_class'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ProductClass');
         });
-        $app['eccube.repository.product_stock'] = $app->share(function () use ($app) {
+        $app['eccube.repository.product_stock'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ProductStock');
         });
-        $app['eccube.repository.class_name'] = $app->share(function () use ($app) {
+        $app['eccube.repository.class_name'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ClassName');
         });
-        $app['eccube.repository.class_category'] = $app->share(function () use ($app) {
+        $app['eccube.repository.class_category'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ClassCategory');
         });
-        $app['eccube.repository.customer_favorite_product'] = $app->share(function () use ($app) {
+        $app['eccube.repository.customer_favorite_product'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\CustomerFavoriteProduct');
         });
-        $app['eccube.repository.base_info'] = $app->share(function () use ($app) {
+        $app['eccube.repository.base_info'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\BaseInfo');
         });
-        $app['eccube.repository.tax_rule'] = $app->share(function () use ($app) {
+        $app['eccube.repository.tax_rule'] = $app->share(function() use ($app) {
             $taxRuleRepository = $app['orm.em']->getRepository('Eccube\Entity\TaxRule');
             $taxRuleRepository->setApplication($app);
 
             return $taxRuleRepository;
         });
-        $app['eccube.repository.page_layout'] = $app->share(function () use ($app) {
+        $app['eccube.repository.page_layout'] = $app->share(function() use ($app) {
             $pageLayoutRepository = $app['orm.em']->getRepository('Eccube\Entity\PageLayout');
             $pageLayoutRepository->setApplication($app);
 
             return $pageLayoutRepository;
         });
-        $app['eccube.repository.block'] = $app->share(function () use ($app) {
+        $app['eccube.repository.block'] = $app->share(function() use ($app) {
             $blockRepository = $app['orm.em']->getRepository('Eccube\Entity\Block');
             $blockRepository->setApplication($app);
 
             return $blockRepository;
         });
-        $app['eccube.repository.order'] = $app->share(function () use ($app) {
+        $app['eccube.repository.order'] = $app->share(function() use ($app) {
             $orderRepository = $app['orm.em']->getRepository('Eccube\Entity\Order');
             $orderRepository->setApplication($app);
 
             return $orderRepository;
         });
-        $app['eccube.repository.customer_address'] = $app->share(function () use ($app) {
+        $app['eccube.repository.customer_address'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\CustomerAddress');
         });
-        $app['eccube.repository.shipping'] = $app->share(function () use ($app) {
+        $app['eccube.repository.shipping'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Shipping');
         });
-        $app['eccube.repository.customer_status'] = $app->share(function () use ($app) {
+        $app['eccube.repository.customer_status'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\CustomerStatus');
         });
-        $app['eccube.repository.order_status'] = $app->share(function () use ($app) {
+        $app['eccube.repository.order_status'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus');
         });
-        $app['eccube.repository.mail_template'] = $app->share(function () use ($app) {
+        $app['eccube.repository.mail_template'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\MailTemplate');
         });
-        $app['eccube.repository.csv'] = $app->share(function () use ($app) {
+        $app['eccube.repository.csv'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Csv');
         });
-        $app['eccube.repository.template'] = $app->share(function () use ($app) {
+        $app['eccube.repository.template'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Template');
         });
-        $app['eccube.repository.authority_role'] = $app->share(function () use ($app) {
+        $app['eccube.repository.authority_role'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\AuthorityRole');
         });
 
-        $app['paginator'] = $app->protect(function () {
+        $app['paginator'] = $app->protect(function() {
             return new \Knp\Component\Pager\Paginator();
         });
 
-        $app['eccube.repository.help'] = $app->share(function () use ($app) {
+        $app['eccube.repository.help'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Help');
         });
-        $app['eccube.repository.plugin'] = $app->share(function () use ($app) {
+        $app['eccube.repository.plugin'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Plugin');
         });
-        $app['eccube.repository.plugin_event_handler'] = $app->share(function () use ($app) {
+        $app['eccube.repository.plugin_event_handler'] = $app->share(function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\PluginEventHandler');
         });
         // em
         if (isset($app['orm.em'])) {
-            $app['orm.em'] = $app->share($app->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
+            $app['orm.em'] = $app->share($app->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
                 // tax_rule
                 $taxRuleRepository = $em->getRepository('Eccube\Entity\TaxRule');
                 $taxRuleRepository->setApplication($app);
@@ -259,13 +259,13 @@ 
         }
 
         // Form\Type
-        $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function ($extensions) use ($app) {
+        $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function($extensions) use ($app) {
             $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension();
             $extensions[] = new \Eccube\Form\Extension\FreezeTypeExtension();
 
             return $extensions;
         }));
-        $app['form.types'] = $app->share($app->extend('form.types', function ($types) use ($app) {
+        $app['form.types'] = $app->share($app->extend('form.types', function($types) use ($app) {
             $types[] = new \Eccube\Form\Type\NameType($app['config']);
             $types[] = new \Eccube\Form\Type\KanaType($app['config']);
             $types[] = new \Eccube\Form\Type\TelType($app['config']);

src/Eccube/Controller/ForgotController.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,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);
@@ -61,7 +61,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()}"
                 );
             }
 
@@ -115,7 +115,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('不正なアクセスです。');

src/Eccube/Controller/Mypage/WithdrawController.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
                     // 会員削除
                     $email = $Customer->getEmail();
                     // メールアドレスにダミーをセット
-                    $Customer->setEmail(Str::random(60) . '@dummy.dummy');
+                    $Customer->setEmail(Str::random(60).'@dummy.dummy');
                     $Customer->setDelFlg(Constant::ENABLED);
 
                     $app['orm.em']->flush();

src/Eccube/Form/Type/Install/Step4Type.php

Spacing +3 added lines, -3 removed lines

@@ -96,7 +96,7 @@ 
                     new Assert\Callback(array($this, 'validate')),
                 ),
             ))
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
                 $form = $event->getForm();
                 $data = $form->getData();
                 try {
@@ -121,7 +121,7 @@ 
                     $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
                     $conn->connect();
                 } catch (\Exception $e) {
-                    $form['database']->addError(new FormError('データベースに接続できませんでした。' . $e->getMessage()));
+                    $form['database']->addError(new FormError('データベースに接続できませんでした。'.$e->getMessage()));
                 }
             });
     }
@@ -137,7 +137,7 @@ 
     public function validate($data, ExecutionContext $context, $param = null)
     {
         $parameters = $this->app['request']->get('install_step4');
-        if ($parameters['database'] != 'pdo_sqlite'){
+        if ($parameters['database'] != 'pdo_sqlite') {
             $context->validateValue($data, array(
                 new Assert\NotBlank()
             ));

src/Eccube/Application.php

Doc Comments +1 added lines, -1 removed lines

@@ -725,7 +725,7 @@
      * 成功 : trueを返却
      *　失敗 : \Doctrine\DBAL\DBALExceptionエラーが発生( 接続に失敗した場合 )、エラー画面を表示しdie()
      * 備考 : app['debug']がtrueの際は処理を行わない
-     * @return boolean true
+     * @return null|boolean true
      *
      */
     protected function checkDatabaseConnection()

Spacing +28 added lines, -28 removed lines

@@ -133,7 +133,7 @@ 
         $this->register(new \Eccube\ServiceProvider\ValidatorServiceProvider());
 
         $app = $this;
-        $this->error(function (\Exception $e, $code) use ($app) {
+        $this->error(function(\Exception $e, $code) use ($app) {
             if ($app['debug']) {
                 return;
             }
@@ -197,7 +197,7 @@ 
         $this->register(new \Silex\Provider\TranslationServiceProvider(), array(
             'locale' => $this['config']['locale'],
         ));
-        $this['translator'] = $this->share($this->extend('translator', function ($translator, \Silex\Application $app) {
+        $this['translator'] = $this->share($this->extend('translator', function($translator, \Silex\Application $app) {
             $translator->addLoader('yaml', new \Symfony\Component\Translation\Loader\YamlFileLoader());
 
             $r = new \ReflectionClass('Symfony\Component\Validator\Validator');
@@ -241,16 +241,16 @@ 
         $this->register(new \Silex\Provider\TwigServiceProvider(), array(
             'twig.form.templates' => array('Form/form_layout.twig'),
         ));
-        $this['twig'] = $this->share($this->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) {
+        $this['twig'] = $this->share($this->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) {
             $twig->addExtension(new \Eccube\Twig\Extension\EccubeExtension($app));
             $twig->addExtension(new \Twig_Extension_StringLoader());
 
             return $twig;
         }));
 
-        $this->before(function (Request $request, \Silex\Application $app) {
+        $this->before(function(Request $request, \Silex\Application $app) {
             // フロント or 管理画面ごとにtwigの探索パスを切り替える.
-            $app['twig'] = $app->share($app->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) {
+            $app['twig'] = $app->share($app->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) {
                 $paths = array();
 
                 // 互換性がないのでprofiler とproduction 時のcacheを分離する
@@ -302,7 +302,7 @@ 
 
         // twigのグローバル変数を定義.
         $app = $this;
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
             // ショップ基本情報
             $BaseInfo = $app['eccube.repository.base_info']->get();
             $app['twig']->addGlobal('BaseInfo', $BaseInfo);
@@ -362,7 +362,7 @@ 
         // メール送信時の文字エンコード指定(デフォルトはUTF-8)
         if (isset($this['config']['mail']['charset_iso_2022_jp']) && is_bool($this['config']['mail']['charset_iso_2022_jp'])) {
             if ($this['config']['mail']['charset_iso_2022_jp'] === true) {
-                \Swift::init(function () {
+                \Swift::init(function() {
                     \Swift_DependencyContainer::getInstance()
                         ->register('mime.qpheaderencoder')
                         ->asAliasOf('mime.base64headerencoder');
@@ -529,19 +529,19 @@ 
             array('^/mypage', 'ROLE_USER'),
         );
 
-        $this['eccube.password_encoder'] = $this->share(function ($app) {
+        $this['eccube.password_encoder'] = $this->share(function($app) {
             return new \Eccube\Security\Core\Encoder\PasswordEncoder($app['config']);
         });
-        $this['security.encoder_factory'] = $this->share(function ($app) {
+        $this['security.encoder_factory'] = $this->share(function($app) {
             return new \Symfony\Component\Security\Core\Encoder\EncoderFactory(array(
                 'Eccube\Entity\Customer' => $app['eccube.password_encoder'],
                 'Eccube\Entity\Member' => $app['eccube.password_encoder'],
             ));
         });
-        $this['eccube.event_listner.security'] = $this->share(function ($app) {
+        $this['eccube.event_listner.security'] = $this->share(function($app) {
             return new \Eccube\EventListener\SecurityEventListener($app['orm.em']);
         });
-        $this['user'] = function ($app) {
+        $this['user'] = function($app) {
             $token = $app['security']->getToken();
 
             return ($token !== null) ? $token->getUser() : null;
@@ -552,17 +552,17 @@ 
 
         // Voterの設定
         $app = $this;
-        $this['authority_voter'] = $this->share(function ($app) {
+        $this['authority_voter'] = $this->share(function($app) {
             return new \Eccube\Security\Voter\AuthorityVoter($app);
         });
 
-        $app['security.voters'] = $app->extend('security.voters', function ($voters) use ($app) {
+        $app['security.voters'] = $app->extend('security.voters', function($voters) use ($app) {
             $voters[] = $app['authority_voter'];
 
             return $voters;
         });
 
-        $this['security.access_manager'] = $this->share(function ($app) {
+        $this['security.access_manager'] = $this->share(function($app) {
             return new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager($app['security.voters'], 'unanimous');
         });
 
@@ -586,14 +586,14 @@ 
     public function initPluginEventDispatcher()
     {
         // EventDispatcher
-        $this['eccube.event.dispatcher'] = $this->share(function () {
+        $this['eccube.event.dispatcher'] = $this->share(function() {
             return new EventDispatcher();
         });
 
         $app = $this;
 
         // hook point
-        $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) {
+        $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -601,7 +601,7 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         }, self::EARLY_EVENT);
 
-        $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) {
+        $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -610,7 +610,7 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         });
 
-        $this->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) {
+        $this->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -619,7 +619,7 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         });
 
-        $this->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) {
+        $this->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -627,19 +627,19 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         }, self::LATE_EVENT);
 
-        $this->on(KernelEvents::TERMINATE, function (PostResponseEvent $event) use ($app) {
+        $this->on(KernelEvents::TERMINATE, function(PostResponseEvent $event) use ($app) {
             $route = $event->getRequest()->attributes->get('_route');
             $hookpoint = "eccube.event.controller.$route.finish";
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         });
 
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
             $route = $event->getRequest()->attributes->get('_route');
             $app['eccube.event.dispatcher']->dispatch('eccube.event.render.'.$route.'.before', $event);
         });
 
         // Request Event
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function (\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function(\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) {
 
             if (\Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
                 return;
@@ -670,7 +670,7 @@ 
         }, 30); // Routing(32)が解決しし, 認証判定(8)が実行される前のタイミング.
 
         // Controller Event
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
 
             if (\Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
                 return;
@@ -701,7 +701,7 @@ 
         });
 
         // Response Event
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
 
             if (\Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
                 return;
@@ -731,7 +731,7 @@ 
         });
 
         // Exception Event
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function (\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function(\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) {
 
             if (\Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
                 return;
@@ -761,7 +761,7 @@ 
         });
 
         // Terminate Event
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function (\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function(\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) {
 
             $route = $event->getRequest()->attributes->get('_route');
 
@@ -840,7 +840,7 @@ 
 
             // const
             if (isset($config['const'])) {
-                $this['config'] = $this->share($this->extend('config', function ($eccubeConfig) use ($config) {
+                $this['config'] = $this->share($this->extend('config', function($eccubeConfig) use ($config) {
                     $eccubeConfig[$config['code']] = array(
                         'const' => $config['const'],
                     );
@@ -982,7 +982,7 @@ 
         $app = $this;
 
         // Response Event(http cache対応、event実行は一番遅く設定)
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
 
             if ($app['config']['http_cache']['enabled']) {
                 // httpキャッシュが有効の場合

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

Spacing +11 added lines, -11 removed lines

@@ -177,7 +177,7 @@ 
             foreach ($images as $img) {
                 foreach ($img as $image) {
                     $extension = $image->getClientOriginalExtension();
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
                     $image->move($app['config']['image_temp_realdir'], $filename);
                     $files[] = $filename;
                 }
@@ -239,7 +239,7 @@ 
         $app['eccube.event.dispatcher']->dispatch(EccubeEvents::ADMIN_PRODUCT_EDIT_INITIALIZE, $event);
 
         if (!$has_class) {
-            $ProductClass->setStockUnlimited((boolean)$ProductClass->getStockUnlimited());
+            $ProductClass->setStockUnlimited((boolean) $ProductClass->getStockUnlimited());
             $form['class']->setData($ProductClass);
         }
 
@@ -337,7 +337,7 @@ 
                     $app['orm.em']->persist($ProductImage);
 
                     // 移動
-                    $file = new File($app['config']['image_temp_realdir'] . '/' . $add_image);
+                    $file = new File($app['config']['image_temp_realdir'].'/'.$add_image);
                     $file->move($app['config']['image_save_realdir']);
                 }
 
@@ -357,7 +357,7 @@ 
 
                     // 削除
                     $fs = new Filesystem();
-                    $fs->remove($app['config']['image_save_realdir'] . '/' . $delete_image);
+                    $fs->remove($app['config']['image_save_realdir'].'/'.$delete_image);
                 }
                 $app['orm.em']->persist($Product);
                 $app['orm.em']->flush();
@@ -463,7 +463,7 @@ 
                 foreach ($deleteImages as $deleteImage) {
                     try {
                         $fs = new Filesystem();
-                        $fs->remove($app['config']['image_save_realdir'] . '/' . $deleteImage);
+                        $fs->remove($app['config']['image_save_realdir'].'/'.$deleteImage);
                     } catch (\Exception $e) {
                         // エラーが発生しても無視する
                     }
@@ -527,10 +527,10 @@ 
 
                     // 画像ファイルを新規作成
                     $extension = pathinfo($Image->getFileName(), PATHINFO_EXTENSION);
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
                     try {
                         $fs = new Filesystem();
-                        $fs->copy($app['config']['image_save_realdir'] . '/' . $Image->getFileName(), $app['config']['image_save_realdir'] . '/' . $filename);
+                        $fs->copy($app['config']['image_save_realdir'].'/'.$Image->getFileName(), $app['config']['image_save_realdir'].'/'.$filename);
                     } catch (\Exception $e) {
                         // エラーが発生しても無視する
                     }
@@ -585,7 +585,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_PRODUCT);
@@ -609,7 +609,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();
 
@@ -641,9 +641,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'product_' . $now->format('YmdHis') . '.csv';
+        $filename = 'product_'.$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();
 
         return $response;

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/Controller/Admin/Product/ProductClassController.php

Doc Comments +5 added lines

@@ -510,6 +510,8 @@ 
     /**
      * 登録、更新時のエラー画面表示
      *
+     * @param Application $app
+     * @param boolean $not_product_class
      */
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
     {
@@ -559,6 +561,7 @@ 
 
     /**
      * 規格1と規格2を組み合わせた商品規格を作成
+     * @param Application $app
      */
     private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null)
     {
@@ -646,6 +649,7 @@ 
      *
      * @param $productClassDest コピー先となる商品規格
      * @param $productClassOrig コピー元となる商品規格
+     * @param Application $app
      */
     private function setDefualtProductClass($app, $productClassDest, $productClassOrig) {
         $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate());
@@ -687,6 +691,7 @@ 
      * 商品規格を登録
      *
      * @param $ProductClasses 登録される商品規格
+     * @param Application $app
      */
     private function insertProductClass($app, $Product, $ProductClasses) {
 

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