Completed
Push — experimental/3.1 ( a10ce1...874d3d )
by Kiyotaka
28:39
created
src/Eccube/Command/GeneratorCommand/AbstractPluginGenerator.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
      * @param array $metadatas
349 349
      * @param array $fsList
350 350
      * @param $pluginCode
351
-     * @param $codePath
351
+     * @param string $codePath
352 352
      */
353 353
     protected function generateMigration(array $metadatas, array &$fsList = array(), $pluginCode, $codePath)
354 354
     {
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
      *
374 374
      * @param $pluginCode
375 375
      * @param array $metadatas
376
-     * @return mixed|string
376
+     * @return string
377 377
      */
378 378
     protected function makeMigration($pluginCode, array $metadatas)
379 379
     {
Please login to merge, or discard this patch.
src/Eccube/Application/ApplicationTrait.php 3 patches
Unused Use Statements   -6 removed lines patch added patch discarded remove patch
@@ -2,15 +2,9 @@
 block discarded – undo
2 2
 
3 3
 namespace Eccube\Application;
4 4
 
5
-use Eccube\Event\TemplateEvent;
6
-use Monolog\Logger;
7
-use Symfony\Component\Form\FormBuilder;
8 5
 use Symfony\Component\HttpFoundation\Request;
9 6
 use Symfony\Component\HttpFoundation\Response;
10
-use Symfony\Component\HttpFoundation\StreamedResponse;
11 7
 use Symfony\Component\HttpKernel\HttpKernelInterface;
12
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
13
-use Symfony\Component\Security\Core\User\UserInterface;
14 8
 
15 9
 trait ApplicationTrait
16 10
 {
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -19,32 +19,32 @@  discard block
 block discarded – undo
19 19
      */
20 20
     public function addSuccess($message, $namespace = 'front')
21 21
     {
22
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.success', $message);
22
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.success', $message);
23 23
     }
24 24
 
25 25
     public function addError($message, $namespace = 'front')
26 26
     {
27
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.error', $message);
27
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.error', $message);
28 28
     }
29 29
 
30 30
     public function addDanger($message, $namespace = 'front')
31 31
     {
32
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message);
32
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.danger', $message);
33 33
     }
34 34
 
35 35
     public function addWarning($message, $namespace = 'front')
36 36
     {
37
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message);
37
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.warning', $message);
38 38
     }
39 39
 
40 40
     public function addInfo($message, $namespace = 'front')
41 41
     {
42
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message);
42
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.info', $message);
43 43
     }
44 44
 
45 45
     public function addRequestError($message, $namespace = 'front')
46 46
     {
47
-        $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message);
47
+        $this['session']->getFlashBag()->set('eccube.'.$namespace.'.request.error', $message);
48 48
     }
49 49
 
50 50
     public function clearMessage()
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
         if (is_null($namespace)) {
64 64
             $this['session']->getFlashBag()->set('eccube.login.target.path', $targetPath);
65 65
         } else {
66
-            $this['session']->getFlashBag()->set('eccube.' . $namespace . '.login.target.path', $targetPath);
66
+            $this['session']->getFlashBag()->set('eccube.'.$namespace.'.login.target.path', $targetPath);
67 67
         }
68 68
     }
69 69
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
      * @param Response $response
112 112
      * @return Application
113 113
      */
114
-    public function forwardChain($path, array $requestParameters = [], Response &$response = null)
114
+    public function forwardChain($path, array $requestParameters = [], Response&$response = null)
115 115
     {
116 116
         $response = $this->forward($path, $requestParameters);
117 117
         return $this;
Please login to merge, or discard this patch.
Doc Comments   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,6 +16,7 @@  discard block
 block discarded – undo
16 16
 {
17 17
     /**
18 18
      * Application Shortcut Methods
19
+     * @param string $message
19 20
      */
20 21
     public function addSuccess($message, $namespace = 'front')
21 22
     {
@@ -58,6 +59,9 @@  discard block
 block discarded – undo
58 59
         $this->addWarning('admin.delete.warning', 'admin');
59 60
     }
60 61
 
62
+    /**
63
+     * @param string $targetPath
64
+     */
61 65
     public function setLoginTargetPath($targetPath, $namespace = null)
62 66
     {
63 67
         if (is_null($namespace)) {
@@ -109,7 +113,7 @@  discard block
 block discarded – undo
109 113
      * @param string $path フォワード先のパス
110 114
      * @param array $requestParameters
111 115
      * @param Response $response
112
-     * @return Application
116
+     * @return ApplicationTrait
113 117
      */
114 118
     public function forwardChain($path, array $requestParameters = [], Response &$response = null)
115 119
     {
@@ -122,7 +126,7 @@  discard block
 block discarded – undo
122 126
      * Pimple標準では再登録を行うと, `RuntimeException: Cannot override frozen service`が投げられるため,一度unsetしてから再登録を行う.
123 127
      * config系の変更程度に利用はとどめること
124 128
      *
125
-     * @param $key
129
+     * @param string $key
126 130
      * @param $service
127 131
      * @throws \InvalidArgumentException keyが存在しない場合.
128 132
      */
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ChangePasswordType.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -27,8 +27,6 @@
 block discarded – undo
27 27
 use Symfony\Component\Form\Extension\Core\Type\PasswordType;
28 28
 use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
29 29
 use Symfony\Component\Form\FormBuilderInterface;
30
-use Symfony\Component\Form\FormError;
31
-use Symfony\Component\Form\FormEvents;
32 30
 use Symfony\Component\OptionsResolver\OptionsResolver;
33 31
 use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
34 32
 use Symfony\Component\Validator\Constraints as Assert;
Please login to merge, or discard this patch.
src/Eccube/Application/TwigTrait.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -40,14 +40,14 @@
 block discarded – undo
40 40
         $eventName = $view;
41 41
         if ($this->isAdminRequest()) {
42 42
             // 管理画面の場合、event名に「Admin/」を付ける
43
-            $eventName = 'Admin/' . $view;
43
+            $eventName = 'Admin/'.$view;
44 44
         }
45
-        $this['monolog']->debug('Template Event Name : ' . $eventName);
45
+        $this['monolog']->debug('Template Event Name : '.$eventName);
46 46
 
47 47
         // $this['eccube.event.dispatcher']->dispatch($eventName, $event);
48 48
 
49 49
         if ($response instanceof StreamedResponse) {
50
-            $response->setCallback(function () use ($twig, $view, $parameters) {
50
+            $response->setCallback(function() use ($twig, $view, $parameters) {
51 51
                 $twig->display($view, $parameters);
52 52
             });
53 53
         } else {
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/LogServiceProvider.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -22,17 +22,17 @@  discard block
 block discarded – undo
22 22
         $app->register(new \Silex\Provider\MonologServiceProvider());
23 23
 
24 24
         // Log
25
-        $app['eccube.logger'] = function ($app) {
25
+        $app['eccube.logger'] = function($app) {
26 26
             return new Logger($app);
27 27
         };
28 28
 
29 29
         // ヘルパー作成
30
-        $app['eccube.monolog.helper'] = function ($app) {
30
+        $app['eccube.monolog.helper'] = function($app) {
31 31
             return new LogHelper($app);
32 32
         };
33 33
 
34 34
         // ログクラス作成ファクトリー
35
-        $app['eccube.monolog.factory'] = $app->protect(function (array $channelValues) use ($app) {
35
+        $app['eccube.monolog.factory'] = $app->protect(function(array $channelValues) use ($app) {
36 36
 
37 37
             $log = new $app['monolog.logger.class']($channelValues['name']);
38 38
 
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
         // monologの設定は除外
48 48
         unset($channels['monolog']);
49 49
         foreach ($channels as $channel => $channelValues) {
50
-            $app['monolog.logger.'.$channel] = function ($app) use ($channelValues) {
50
+            $app['monolog.logger.'.$channel] = function($app) use ($channelValues) {
51 51
                 return $app['eccube.monolog.factory']($channelValues);
52 52
             };
53 53
         }
@@ -55,15 +55,15 @@  discard block
 block discarded – undo
55 55
         // MonologServiceProviderで定義されているmonolog.handlerの置換
56 56
         $channelValues = $app['config']['log']['channel']['monolog'];
57 57
         $app['monolog.name'] = $channelValues['name'];
58
-        $app['monolog.handler'] = function ($app) use ($channelValues) {
58
+        $app['monolog.handler'] = function($app) use ($channelValues) {
59 59
             return $app['eccube.monolog.helper']->getHandler($channelValues);
60 60
         };
61 61
 
62
-        $app['eccube.monolog.listener'] = function () use ($app) {
62
+        $app['eccube.monolog.listener'] = function() use ($app) {
63 63
             return new LogListener($app['eccube.logger']);
64 64
         };
65 65
 
66
-        $app['listener.requestdump'] = function ($app) {
66
+        $app['listener.requestdump'] = function($app) {
67 67
             return new \Eccube\EventListener\RequestDumpListener($app);
68 68
         };
69 69
     }
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/InstallServiceProvider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,13 +42,13 @@
 block discarded – undo
42 42
      */
43 43
     public function register(Container $app)
44 44
     {
45
-        $app->extend('form.type.extensions', function ($extensions) use ($app) {
45
+        $app->extend('form.type.extensions', function($extensions) use ($app) {
46 46
             $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension();
47 47
 
48 48
             return $extensions;
49 49
         });
50 50
 
51
-        $app->extend('form.types', function ($types) use ($app) {
51
+        $app->extend('form.types', function($types) use ($app) {
52 52
             $types[] = new \Eccube\Form\Type\Install\Step1Type($app);
53 53
             $types[] = new \Eccube\Form\Type\Install\Step3Type($app);
54 54
             $types[] = new \Eccube\Form\Type\Install\Step4Type($app);
Please login to merge, or discard this patch.
src/Eccube/Form/Type/ShippingItemType.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
         $app = $this->app;
50 50
 
51 51
         $builder
52
-            ->addEventListener(FormEvents::PRE_SET_DATA, function ($event) use ($app) {
52
+            ->addEventListener(FormEvents::PRE_SET_DATA, function($event) use ($app) {
53 53
                 /** @var \Eccube\Entity\Shipping $data */
54 54
                 $data = $event->getData();
55 55
                 /** @var \Symfony\Component\Form\Form $form */
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
                         'placeholder' => '指定なし',
103 103
                     ));
104 104
             })
105
-            ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) {
105
+            ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) {
106 106
                 /** @var \Eccube\Entity\Shipping $data */
107 107
                 $data = $event->getData();
108 108
                 /** @var \Symfony\Component\Form\Form $form */
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
                 }
119 119
 
120 120
             })
121
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
121
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
122 122
                 /** @var \Eccube\Entity\Shipping $data */
123 123
                 $data = $event->getData();
124 124
                 /** @var \Symfony\Component\Form\Form $form */
Please login to merge, or discard this patch.
src/Eccube/Form/Type/TelType.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
         $builder->setAttribute('tel02_name', $options['tel02_name']);
80 80
         $builder->setAttribute('tel03_name', $options['tel03_name']);
81 81
         // todo 変
82
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function ($event) use ($builder) {
82
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function($event) use ($builder) {
83 83
             $form = $event->getForm();
84 84
             $count = 0;
85 85
             if ($form[$builder->getName().'01']->getData() != '') {
Please login to merge, or discard this patch.
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,6 @@
 block discarded – undo
59 59
     {
60 60
     }
61 61
     /**
62
-
63 62
      * {@inheritdoc}
64 63
      */
65 64
     public function buildForm(FormBuilderInterface $builder, array $options)
Please login to merge, or discard this patch.
src/silex-doctrine-migrations/MigrationServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
         $app['db.migrations.table_name'] = null;
26 26
         $app['db.migrations.name'] = null;
27 27
 
28
-        $app['dispatcher']->addListener(ConsoleEvents::INIT, function (ConsoleEvent $event) use ($app) {
28
+        $app['dispatcher']->addListener(ConsoleEvents::INIT, function(ConsoleEvent $event) use ($app) {
29 29
             $application = $event->getApplication();
30 30
 
31 31
             if (isset($app['orm.em'])) {
Please login to merge, or discard this patch.