Completed
Push — experimental/3.1 ( 10e424...a981bd )
by Kiyotaka
55:16
created
src/Eccube/Form/Type/Admin/SecurityType.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,8 +77,8 @@
 block discarded – undo
77 77
                     new Assert\NotBlank(),
78 78
                     new Assert\Length(array('max' => $this->appConfig['stext_len'])),
79 79
                     new Assert\Regex(array(
80
-                       'pattern' => "/^[0-9a-zA-Z]+$/",
81
-                   )),
80
+                        'pattern' => "/^[0-9a-zA-Z]+$/",
81
+                    )),
82 82
                 ),
83 83
             ))
84 84
             ->add('admin_allow_hosts', TextareaType::class, array(
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -92,19 +92,19 @@
 block discarded – undo
92 92
                 'label' => 'SSLを強制',
93 93
                 'required' => false,
94 94
             ))
95
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use($app) {
95
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) use($app) {
96 96
                 $form = $event->getForm();
97 97
                 $data = $form->getData();
98 98
 
99 99
                 $ips = preg_split("/\R/", $data['admin_allow_hosts'], null, PREG_SPLIT_NO_EMPTY);
100 100
 
101
-                foreach($ips as $ip) {
101
+                foreach ($ips as $ip) {
102 102
                     $errors = $this->recursiveValidator->validate($ip, array(
103 103
                             new Assert\Ip(),
104 104
                         )
105 105
                     );
106 106
                     if ($errors->count() != 0) {
107
-                        $form['admin_allow_hosts']->addError(new FormError($ip . 'はIPv4アドレスではありません。'));
107
+                        $form['admin_allow_hosts']->addError(new FormError($ip.'はIPv4アドレスではありません。'));
108 108
                     }
109 109
                 }
110 110
             })
Please login to merge, or discard this patch.
src/Eccube/Resource/config/log.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php return [
2
-  'log' => 
3
-  [
2
+    'log' => 
3
+    [
4 4
     'suffix' => null,
5 5
     'filename' => 'site',
6 6
     'delimiter' => '_',
@@ -13,8 +13,8 @@  discard block
 block discarded – undo
13 13
     'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
14 14
     'channel' => 
15 15
     [
16
-      'monolog' => 
17
-      [
16
+        'monolog' => 
17
+        [
18 18
         'name' => 'eccube',
19 19
         'filename' => 'site',
20 20
         'delimiter' => '_',
@@ -25,9 +25,9 @@  discard block
 block discarded – undo
25 25
         'max_files' => 90,
26 26
         'log_dateformat' => 'Y-m-d H:i:s,u',
27 27
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
28
-      ],
29
-      'front' => 
30
-      [
28
+        ],
29
+        'front' => 
30
+        [
31 31
         'name' => 'front',
32 32
         'filename' => 'front_site',
33 33
         'delimiter' => '_',
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
38 38
         'max_files' => 90,
39 39
         'log_dateformat' => 'Y-m-d H:i:s,u',
40 40
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
41
-      ],
42
-      'admin' => 
43
-      [
41
+        ],
42
+        'admin' => 
43
+        [
44 44
         'name' => 'admin',
45 45
         'filename' => 'admin_site',
46 46
         'delimiter' => '_',
@@ -51,12 +51,12 @@  discard block
 block discarded – undo
51 51
         'max_files' => 90,
52 52
         'log_dateformat' => 'Y-m-d H:i:s,u',
53 53
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
54
-      ],
54
+        ],
55 55
     ],
56 56
     'exclude_keys' => 
57 57
     [
58
-      'password',
59
-      'app',
58
+        'password',
59
+        'app',
60
+    ],
60 61
     ],
61
-  ],
62 62
 ];
Please login to merge, or discard this patch.
src/Eccube/Resource/config/doctrine_cache.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -1,39 +1,39 @@
 block discarded – undo
1 1
 <?php return [
2
-  'doctrine_cache' => 
3
-  [
2
+    'doctrine_cache' => 
3
+    [
4 4
     'metadata_cache' => 
5 5
     [
6
-      'driver' => 'array',
7
-      'path' => null,
8
-      'host' => null,
9
-      'port' => null,
10
-      'password' => null,
6
+        'driver' => 'array',
7
+        'path' => null,
8
+        'host' => null,
9
+        'port' => null,
10
+        'password' => null,
11 11
     ],
12 12
     'query_cache' => 
13 13
     [
14
-      'driver' => 'array',
15
-      'path' => null,
16
-      'host' => null,
17
-      'port' => null,
18
-      'password' => null,
14
+        'driver' => 'array',
15
+        'path' => null,
16
+        'host' => null,
17
+        'port' => null,
18
+        'password' => null,
19 19
     ],
20 20
     'result_cache' => 
21 21
     [
22
-      'driver' => 'array',
23
-      'path' => null,
24
-      'host' => null,
25
-      'port' => null,
26
-      'password' => null,
27
-      'lifetime' => 3600,
28
-      'clear_cache' => true,
22
+        'driver' => 'array',
23
+        'path' => null,
24
+        'host' => null,
25
+        'port' => null,
26
+        'password' => null,
27
+        'lifetime' => 3600,
28
+        'clear_cache' => true,
29 29
     ],
30 30
     'hydration_cache' => 
31 31
     [
32
-      'driver' => 'array',
33
-      'path' => null,
34
-      'host' => null,
35
-      'port' => null,
36
-      'password' => null,
32
+        'driver' => 'array',
33
+        'path' => null,
34
+        'host' => null,
35
+        'port' => null,
36
+        'password' => null,
37
+    ],
37 38
     ],
38
-  ],
39 39
 ];
Please login to merge, or discard this patch.
install.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
     apc_clear_cache();
27 27
 }
28 28
 
29
-require __DIR__ . '/autoload.php';
29
+require __DIR__.'/autoload.php';
30 30
 
31 31
 set_time_limit(0);
32 32
 ini_set('memory_limit', -1);
Please login to merge, or discard this patch.
index.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
 $loader = require __DIR__.'/autoload.php';
26 26
 
27 27
 ini_set('display_errors', 'Off');
28
-error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
28
+error_reporting(E_ALL&~E_DEPRECATED&~E_STRICT);
29 29
 
30 30
 // see http://silex.sensiolabs.org/doc/web_servers.html#php-5-4
31 31
 $filename = __DIR__.preg_replace('#(\?.*)$#', '', $_SERVER['REQUEST_URI']);
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ShippingType.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
                 'allow_delete' => true,
208 208
                 'prototype' => true,
209 209
             ))
210
-            ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) {
210
+            ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) {
211 211
                 /** @var \Eccube\Entity\Shipping $data */
212 212
                 $data = $event->getData();
213 213
                 /** @var \Symfony\Component\Form\Form $form */
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
                     'placeholder' => '指定なし',
229 229
                     'required' => false,
230 230
                     'data' => $DeliveryTime,
231
-                    'query_builder' => function (EntityRepository $er) use ($Delivery) {
231
+                    'query_builder' => function(EntityRepository $er) use ($Delivery) {
232 232
                         $qb = $er->createQueryBuilder('dt');
233 233
                         if ($Delivery) {
234 234
                             $qb
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
                     'mapped' => false,
241 241
                 ));
242 242
             })
243
-            ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
243
+            ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
244 244
                 $data = $event->getData();
245 245
                 $form = $event->getForm();
246 246
 
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
                     'choice_label' => 'delivery_time',
262 262
                     'placeholder' => '指定なし',
263 263
                     'required' => false,
264
-                    'query_builder' => function (EntityRepository $er) use ($Delivery) {
264
+                    'query_builder' => function(EntityRepository $er) use ($Delivery) {
265 265
                         $qb = $er->createQueryBuilder('dt');
266 266
                         if ($Delivery) {
267 267
                             $qb
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
                     'mapped' => false,
274 274
                 ));
275 275
             })
276
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
276
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
277 277
                 $form = $event->getForm();
278 278
                 $OrderItems = $form['OrderItems']->getData();
279 279
 
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
                     $form['shipping_delivery_date']->addError(new FormError('商品が追加されていません。'));
283 283
                 }
284 284
             })
285
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
285
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
286 286
                 $form = $event->getForm();
287 287
                 $Shipping = $event->getData();
288 288
                 $Delivery = $Shipping->getDelivery();
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/EccubePluginServiceProvider.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
     public function register(Container $app)
27 27
     {
28 28
         // EventDispatcher
29
-        $app['eccube.event.dispatcher'] = function () use ($app) {
29
+        $app['eccube.event.dispatcher'] = function() use ($app) {
30 30
             return $app['dispatcher'];
31 31
         };
32 32
 
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 
36 36
         $enabledPlugins = $app['orm.em']->getRepository('Eccube\Entity\Plugin')->findAllEnabled();
37 37
 
38
-        $app['eccube.routers.plugin'] = function ($app) use ($enabledPlugins) {
38
+        $app['eccube.routers.plugin'] = function($app) use ($enabledPlugins) {
39 39
             $pluginDirs = array_map(function($plugin) use ($app) {
40 40
                 return $app['config']['root_dir'].'/app/Plugin/'.$plugin->getCode();
41 41
             }, $enabledPlugins);
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
             $config = $pluginConfig['config'];
63 63
 
64 64
             if (isset($config['const'])) {
65
-                $app->extend('config', function ($eccubeConfig) use ($config) {
65
+                $app->extend('config', function($eccubeConfig) use ($config) {
66 66
                     $eccubeConfig[$config['code']] = array(
67 67
                         'const' => $config['const'],
68 68
                     );
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
     public function initPluginEventDispatcher(Application $app)
85 85
     {
86 86
         // hook point
87
-        $app->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) {
87
+        $app->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) {
88 88
             if (!$event->isMasterRequest()) {
89 89
                 return;
90 90
             }
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
93 93
         }, Application::EARLY_EVENT);
94 94
 
95
-        $app->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) {
95
+        $app->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) {
96 96
             if (!$event->isMasterRequest()) {
97 97
                 return;
98 98
             }
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
102 102
         });
103 103
 
104
-        $app->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) {
104
+        $app->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) {
105 105
             if (!$event->isMasterRequest()) {
106 106
                 return;
107 107
             }
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
111 111
         });
112 112
 
113
-        $app->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) {
113
+        $app->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) {
114 114
             if (!$event->isMasterRequest()) {
115 115
                 return;
116 116
             }
@@ -118,13 +118,13 @@  discard block
 block discarded – undo
118 118
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
119 119
         }, Application::LATE_EVENT);
120 120
 
121
-        $app->on(KernelEvents::TERMINATE, function (PostResponseEvent $event) use ($app) {
121
+        $app->on(KernelEvents::TERMINATE, function(PostResponseEvent $event) use ($app) {
122 122
             $route = $event->getRequest()->attributes->get('_route');
123 123
             $hookpoint = "eccube.event.controller.$route.finish";
124 124
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
125 125
         });
126 126
 
127
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
127
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
128 128
             if (!$event->isMasterRequest()) {
129 129
                 return;
130 130
             }
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
         });
134 134
 
135 135
         // Request Event
136
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function (\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) {
136
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function(\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) {
137 137
 
138 138
             if (!$event->isMasterRequest()) {
139 139
                 return;
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
         }, 30); // Routing(32)が解決し, 認証判定(8)が実行される前のタイミング.
165 165
 
166 166
         // Controller Event
167
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
167
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
168 168
 
169 169
             if (!$event->isMasterRequest()) {
170 170
                 return;
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
         });
194 194
 
195 195
         // Response Event
196
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
196
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
197 197
             if (!$event->isMasterRequest()) {
198 198
                 return;
199 199
             }
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
         });
223 223
 
224 224
         // Exception Event
225
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function (\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) {
225
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function(\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) {
226 226
 
227 227
             if (!$event->isMasterRequest()) {
228 228
                 return;
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
         });
253 253
 
254 254
         // Terminate Event
255
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function (\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) {
255
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function(\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) {
256 256
 
257 257
             $route = $event->getRequest()->attributes->get('_route');
258 258
 
Please login to merge, or discard this patch.
src/Eccube/DI/AutoWiring/FormExtensionAutoWiring.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 {
32 32
     /**
33 33
      * FormExtensionAutoWiring constructor.
34
-     * @param array|string[] $scanDirs
34
+     * @param string[] $scanDirs
35 35
      */
36 36
     public function __construct($scanDirs)
37 37
     {
Please login to merge, or discard this patch.
src/Eccube/DI/AutoWiring/RepositoryAutoWiring.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
 {
31 31
     /**
32 32
      * RepositoryAutoWiring constructor.
33
-     * @param array|string[] $scanDirs
33
+     * @param string[] $scanDirs
34 34
      */
35 35
     public function __construct($scanDirs)
36 36
     {
Please login to merge, or discard this patch.