EC-CUBE / ec-cube

src/Eccube/Form/Type/MasterType.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         $builder->add('category_id', 'entity', array(
             'class' => 'Eccube\Entity\Category',
             'property' => 'NameWithLevel',
-            'query_builder' => function (EntityRepository $er) {
+            'query_builder' => function(EntityRepository $er) {
                 return $er
                     ->createQueryBuilder('c')
                     ->orderBy('c.rank', 'DESC');

src/Eccube/Repository/BlockRepository.php

Spacing +1 added lines, -1 removed lines

@@ -257,7 +257,7 @@
         }
 
         foreach ($readPaths as $readPath) {
-            $filePath = $readPath . '/' . $fileName . '.twig';
+            $filePath = $readPath.'/'.$fileName.'.twig';
             $fs = new Filesystem();
             if ($fs->exists($filePath)) {
                 return array(

src/Eccube/Form/Type/Admin/AuthorityRoleType.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
                 'label' => '拒否URL',
                 'required' => false,
             ))
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
                 $form = $event->getForm();
 
                 $Authority = $form['Authority']->getData();

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

Unused Use Statements -1 removed lines

@@ -29,7 +29,6 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Yaml\Yaml;
-use Monolog\Logger;
 
 class FormEventSubscriber implements EventSubscriberInterface
 {

Spacing +5 added lines, -5 removed lines

@@ -626,7 +626,7 @@ 
         $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;
             }
@@ -634,7 +634,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;
             }
@@ -643,7 +643,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;
             }
@@ -652,7 +652,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;
             }
@@ -660,7 +660,7 @@ 
             $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);