EC-CUBE / ec-cube

src/Eccube/Application.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +28 added lines, -28 removed lines

@@ -146,7 +146,7 @@ 
         $this->register(new MobileDetectServiceProvider());
 
         $app = $this;
-        $this->error(function (\Exception $e, $code) use ($app) {
+        $this->error(function(\Exception $e, $code) use ($app) {
             if ($app['debug']) {
                 return;
             }
@@ -214,7 +214,7 @@ 
             'locale' => $this['config']['locale'],
             'translator.cache_dir' => $this['debug'] ? null : $this['config']['root_dir'].'/app/cache/translator',
         ));
-        $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());
 
             $file = __DIR__.'/Resource/locale/validator.'.$app['locale'].'.yml';
@@ -261,14 +261,14 @@ 
         $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) {
             $app['admin'] = false;
             $app['front'] = false;
             $pathinfo = rawurldecode($request->getPathInfo());
@@ -279,7 +279,7 @@ 
             }
 
             // フロント 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を分離する
@@ -326,7 +326,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) {
             // 未ログイン時にマイページや管理画面以下にアクセスするとSubRequestで実行されるため,
             // $event->isMasterRequest()ではなく、グローバル変数が初期化済かどうかの判定を行う
             if (isset($app['twig_global_initialized']) && $app['twig_global_initialized'] === true) {
@@ -392,7 +392,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');
@@ -572,19 +572,19 @@ 
             array('^/mypage', 'ROLE_USER', $channel),
         );
 
-        $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;
@@ -595,17 +595,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');
         });
 
@@ -629,14 +629,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;
             }
@@ -644,7 +644,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;
             }
@@ -653,7 +653,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;
             }
@@ -662,7 +662,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;
             }
@@ -670,13 +670,13 @@ 
             $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) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -685,7 +685,7 @@ 
         });
 
         // 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 (!$event->isMasterRequest()) {
                 return;
@@ -716,7 +716,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 (!$event->isMasterRequest()) {
                 return;
@@ -746,7 +746,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 (!$event->isMasterRequest()) {
                 return;
             }
@@ -775,7 +775,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 (!$event->isMasterRequest()) {
                 return;
@@ -805,7 +805,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');
 
@@ -876,7 +876,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'],
                     );
@@ -1079,7 +1079,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 (!$event->isMasterRequest()) {
                 return;

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

Unused Use Statements -1 removed lines

@@ -29,7 +29,6 @@
 use Eccube\Controller\AbstractController;
 use Eccube\Exception\PluginException;
 use Eccube\Util\Str;
-use Monolog\Logger;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpFoundation\Request;

html/install.php

Spacing +2 added lines, -2 removed lines

@@ -27,12 +27,12 @@
 }
 
 //[INFO]index.php,install.phpをEC-CUBEルート直下に移動させる場合は、コメントアウトしている行に置き換える
-require __DIR__ . '/../autoload.php';
+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();
     }

html/index.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,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);
 
 // see http://silex.sensiolabs.org/doc/web_servers.html#php-5-4
 $filename = __DIR__.preg_replace('#(\?.*)$#', '', $_SERVER['REQUEST_URI']);

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

Spacing +2 added lines, -2 removed lines

@@ -53,8 +53,8 @@
                 'constraints' => array(
                     new Assert\NotBlank(array('message' => 'ファイルを選択してください。')),
                     new Assert\File(array(
-                        'maxSize' => $app['config']['csv_size'] . 'M',
-                        'maxSizeMessage' => 'CSVファイルは' . $app['config']['csv_size'] . 'M以下でアップロードしてください。',
+                        'maxSize' => $app['config']['csv_size'].'M',
+                        'maxSizeMessage' => 'CSVファイルは'.$app['config']['csv_size'].'M以下でアップロードしてください。',
                     )),
                 ),
             ));

src/Eccube/Form/Type/Master/ProductListMaxType.php

Spacing +2 added lines, -2 removed lines

@@ -38,14 +38,14 @@
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
             $options = $event->getForm()->getConfig()->getOptions();
             if (!$event->getData()) {
                 $data = current(array_keys($options['choice_list']->getValues()));
                 $event->setData($data);
             }
         });
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
             $options = $event->getForm()->getConfig()->getOptions();
             $values = $options['choice_list']->getValues();
             if (!in_array($event->getData(), $values)) {

src/Eccube/Form/Type/Master/ProductListOrderByType.php

Spacing +2 added lines, -2 removed lines

@@ -38,14 +38,14 @@
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
             $options = $event->getForm()->getConfig()->getOptions();
             if (!$event->getData()) {
                 $data = current(array_keys($options['choice_list']->getValues()));
                 $event->setData($data);
             }
         });
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
             $options = $event->getForm()->getConfig()->getOptions();
             $values = $options['choice_list']->getValues();
             if (!in_array($event->getData(), $values)) {

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

Spacing +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
                 'label' => 'パスワード',
                 'required' => false,
             ))
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
                 $form = $event->getForm();
                 $data = $form->getData();
                 try {
@@ -117,7 +117,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()));
                 }
             });
     }
@@ -133,7 +133,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/Form/Type/AddCartType.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
                 }
             }
 
-            $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($Product) {
+            $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($Product) {
                 $data = $event->getData();
                 $form = $event->getForm();
                 if (!is_null($Product->getClassName2())) {