EC-CUBE / ec-cube

src/Eccube/Service/MailService.php

Spacing +9 added lines, -9 removed lines

@@ -61,7 +61,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認')
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -102,7 +102,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録が完了しました。')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録が完了しました。')
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -144,7 +144,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 退会手続きのご完了')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 退会手続きのご完了')
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($email))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -187,7 +187,7 @@ 
 
         // 問い合わせ者にメール送信
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] お問い合わせを受け付けました。')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] お問い合わせを受け付けました。')
             ->setFrom(array($this->BaseInfo->getEmail02() => $this->BaseInfo->getShopName()))
             ->setTo(array($formData['email']))
             ->setBcc($this->BaseInfo->getEmail02())
@@ -244,7 +244,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $MailTemplate->getSubject())
+            ->setSubject('['.$this->BaseInfo->getShopName().'] '.$MailTemplate->getSubject())
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Order->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -288,7 +288,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認')
             ->setFrom(array($this->BaseInfo->getEmail03() => $this->BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -332,7 +332,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $formData['subject'])
+            ->setSubject('['.$this->BaseInfo->getShopName().'] '.$formData['subject'])
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Order->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -373,7 +373,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のご確認')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のご確認')
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -414,7 +414,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のお知らせ')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のお知らせ')
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())

src/Eccube/Log/Monolog/Helper/LogHelper.php

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
         $webProcessor = new WebProcessor();
         $uidProcessor = new UidProcessor(8);
 
-        $FingerCrossedHandler->pushProcessor(function ($record) use ($app, $uidProcessor, $webProcessor) {
+        $FingerCrossedHandler->pushProcessor(function($record) use ($app, $uidProcessor, $webProcessor) {
             // ログフォーマットに出力する値を独自に設定
 
             $record['level_name'] = sprintf("%-5s", $record['level_name']);

src/Eccube/Controller/Admin/Setting/System/LogController.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
             return $log;
         }
 
-        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) {
+        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) {
             // 上限に達した場合、処理を抜ける
             if (count($log) >= $formData['line_max']) {
                 break;

Doc Comments +3 added lines

@@ -108,6 +108,9 @@
         ];
     }
 
+    /**
+     * @param string $logFile
+     */
     private function parseLogFile($logFile, $formData)
     {
         $log = array();

src/Eccube/Command/GeneratorCommand/AbstractPluginGenerator.php

Doc Comments +2 added lines, -2 removed lines

@@ -348,7 +348,7 @@ 
      * @param array $metadatas
      * @param array $fsList
      * @param $pluginCode
-     * @param $codePath
+     * @param string $codePath
      */
     protected function generateMigration(array $metadatas, array &$fsList = array(), $pluginCode, $codePath)
     {
@@ -373,7 +373,7 @@ 
      *
      * @param $pluginCode
      * @param array $metadatas
-     * @return mixed|string
+     * @return string
      */
     protected function makeMigration($pluginCode, array $metadatas)
     {

src/Eccube/Application/ApplicationTrait.php

Unused Use Statements -6 removed lines

@@ -2,15 +2,9 @@
 
 namespace Eccube\Application;
 
-use Eccube\Event\TemplateEvent;
-use Monolog\Logger;
-use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Security\Core\User\UserInterface;
 
 trait ApplicationTrait
 {

Spacing +8 added lines, -8 removed lines

@@ -19,32 +19,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()
@@ -63,7 +63,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);
         }
     }
 
@@ -111,7 +111,7 @@ 
      * @param Response $response
      * @return Application
      */
-    public function forwardChain($path, array $requestParameters = [], Response &$response = null)
+    public function forwardChain($path, array $requestParameters = [], Response&$response = null)
     {
         $response = $this->forward($path, $requestParameters);
         return $this;

Doc Comments +6 added lines, -2 removed lines

@@ -16,6 +16,7 @@ 
 {
     /**
      * Application Shortcut Methods
+     * @param string $message
      */
     public function addSuccess($message, $namespace = 'front')
     {
@@ -58,6 +59,9 @@ 
         $this->addWarning('admin.delete.warning', 'admin');
     }
 
+    /**
+     * @param string $targetPath
+     */
     public function setLoginTargetPath($targetPath, $namespace = null)
     {
         if (is_null($namespace)) {
@@ -109,7 +113,7 @@ 
      * @param string $path フォワード先のパス
      * @param array $requestParameters
      * @param Response $response
-     * @return Application
+     * @return ApplicationTrait
      */
     public function forwardChain($path, array $requestParameters = [], Response &$response = null)
     {
@@ -122,7 +126,7 @@ 
      * Pimple標準では再登録を行うと, `RuntimeException: Cannot override frozen service`が投げられるため,一度unsetしてから再登録を行う.
      * config系の変更程度に利用はとどめること
      *
-     * @param $key
+     * @param string $key
      * @param $service
      * @throws \InvalidArgumentException keyが存在しない場合.
      */

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

Unused Use Statements -2 removed lines

@@ -27,8 +27,6 @@
 use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormError;
-use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
 use Symfony\Component\Validator\Constraints as Assert;

src/Eccube/Application/TwigTrait.php

Spacing +3 added lines, -3 removed lines

@@ -40,14 +40,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/ServiceProvider/LogServiceProvider.php

Spacing +7 added lines, -7 removed lines

@@ -22,17 +22,17 @@ 
         $app->register(new \Silex\Provider\MonologServiceProvider());
 
         // Log
-        $app['eccube.logger'] = function ($app) {
+        $app['eccube.logger'] = function($app) {
             return new Logger($app);
         };
 
         // ヘルパー作成
-        $app['eccube.monolog.helper'] = function ($app) {
+        $app['eccube.monolog.helper'] = function($app) {
             return new LogHelper($app);
         };
 
         // ログクラス作成ファクトリー
-        $app['eccube.monolog.factory'] = $app->protect(function (array $channelValues) use ($app) {
+        $app['eccube.monolog.factory'] = $app->protect(function(array $channelValues) use ($app) {
 
             $log = new $app['monolog.logger.class']($channelValues['name']);
 
@@ -47,7 +47,7 @@ 
         // monologの設定は除外
         unset($channels['monolog']);
         foreach ($channels as $channel => $channelValues) {
-            $app['monolog.logger.'.$channel] = function ($app) use ($channelValues) {
+            $app['monolog.logger.'.$channel] = function($app) use ($channelValues) {
                 return $app['eccube.monolog.factory']($channelValues);
             };
         }
@@ -55,15 +55,15 @@ 
         // MonologServiceProviderで定義されているmonolog.handlerの置換
         $channelValues = $app['config']['log']['channel']['monolog'];
         $app['monolog.name'] = $channelValues['name'];
-        $app['monolog.handler'] = function ($app) use ($channelValues) {
+        $app['monolog.handler'] = function($app) use ($channelValues) {
             return $app['eccube.monolog.helper']->getHandler($channelValues);
         };
 
-        $app['eccube.monolog.listener'] = function () use ($app) {
+        $app['eccube.monolog.listener'] = function() use ($app) {
             return new LogListener($app['eccube.logger']);
         };
 
-        $app['listener.requestdump'] = function ($app) {
+        $app['listener.requestdump'] = function($app) {
             return new \Eccube\EventListener\RequestDumpListener($app);
         };
     }

src/Eccube/ServiceProvider/InstallServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -42,13 +42,13 @@
      */
     public function register(Container $app)
     {
-        $app->extend('form.type.extensions', function ($extensions) use ($app) {
+        $app->extend('form.type.extensions', function($extensions) use ($app) {
             $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension();
 
             return $extensions;
         });
 
-        $app->extend('form.types', function ($types) use ($app) {
+        $app->extend('form.types', function($types) use ($app) {
             $types[] = new \Eccube\Form\Type\Install\Step1Type($app);
             $types[] = new \Eccube\Form\Type\Install\Step3Type($app);
             $types[] = new \Eccube\Form\Type\Install\Step4Type($app);