Completed
Push — experimental/3.1 ( a10ce1...874d3d )
by Kiyotaka
28:39
created
src/Eccube/DI/DependencyBuilder.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -161,7 +161,9 @@
 block discarded – undo
161 161
             }
162 162
 
163 163
             if (!empty($components)) {
164
-                if ($snippets) $snippets .= PHP_EOL;
164
+                if ($snippets) {
165
+                    $snippets .= PHP_EOL;
166
+                }
165 167
                 $snippets .= $wiring->generate($twig, $components);
166 168
                 $snippets .= $wiring->generateExtend($twig, $components);
167 169
             }
Please login to merge, or discard this patch.
src/Eccube/Resource/config/path.php 2 patches
Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -1,31 +1,31 @@
 block discarded – undo
1 1
 <?php return [
2
-  'root_dir' => '%ROOT_DIR%',
3
-  'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null),
4
-  'template_code' => env('ECCUBE_TEMPLATE_CODE','default'),
5
-  'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'),
6
-  'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'),
7
-  'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/html',
8
-  'public_path_realdir' => '%ROOT_DIR%/html',
9
-  'image_save_realdir' => '%ROOT_DIR%/html/upload/save_image',
10
-  'image_temp_realdir' => '%ROOT_DIR%/html/upload/temp_image',
11
-  'user_data_realdir' => '%ROOT_DIR%/html/user_data',
12
-  'block_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default/Block',
13
-  'block_realdir' => '%ROOT_DIR%/app/template/default/Block',
14
-  'template_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default',
15
-  'template_default_html_realdir' => '%ROOT_DIR%/html/template/default',
16
-  'template_admin_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/admin',
17
-  'template_admin_html_realdir' => '%ROOT_DIR%/html/template/admin',
18
-  'template_realdir' => '%ROOT_DIR%/app/template/default',
19
-  'template_html_realdir' => '%ROOT_DIR%/html/template/default',
20
-  'template_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/template',
21
-  'csv_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/csv',
22
-  'plugin_realdir' => '%ROOT_DIR%/app/Plugin',
23
-  'plugin_temp_realdir' => '%ROOT_DIR%/app/cache/plugin',
24
-  'plugin_html_realdir' => '%ROOT_DIR%/html/plugin',
25
-  'admin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/admin',
26
-  'front_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/default',
27
-  'image_save_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/save_image',
28
-  'image_temp_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/temp_image',
29
-  'user_data_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/user_data',
30
-  'plugin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/plugin',
2
+    'root_dir' => '%ROOT_DIR%',
3
+    'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null),
4
+    'template_code' => env('ECCUBE_TEMPLATE_CODE','default'),
5
+    'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'),
6
+    'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'),
7
+    'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/html',
8
+    'public_path_realdir' => '%ROOT_DIR%/html',
9
+    'image_save_realdir' => '%ROOT_DIR%/html/upload/save_image',
10
+    'image_temp_realdir' => '%ROOT_DIR%/html/upload/temp_image',
11
+    'user_data_realdir' => '%ROOT_DIR%/html/user_data',
12
+    'block_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default/Block',
13
+    'block_realdir' => '%ROOT_DIR%/app/template/default/Block',
14
+    'template_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default',
15
+    'template_default_html_realdir' => '%ROOT_DIR%/html/template/default',
16
+    'template_admin_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/admin',
17
+    'template_admin_html_realdir' => '%ROOT_DIR%/html/template/admin',
18
+    'template_realdir' => '%ROOT_DIR%/app/template/default',
19
+    'template_html_realdir' => '%ROOT_DIR%/html/template/default',
20
+    'template_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/template',
21
+    'csv_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/csv',
22
+    'plugin_realdir' => '%ROOT_DIR%/app/Plugin',
23
+    'plugin_temp_realdir' => '%ROOT_DIR%/app/cache/plugin',
24
+    'plugin_html_realdir' => '%ROOT_DIR%/html/plugin',
25
+    'admin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/admin',
26
+    'front_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/default',
27
+    'image_save_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/save_image',
28
+    'image_temp_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/temp_image',
29
+    'user_data_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/user_data',
30
+    'plugin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/plugin',
31 31
 ];
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php return [
2 2
   'root_dir' => '%ROOT_DIR%',
3 3
   'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null),
4
-  'template_code' => env('ECCUBE_TEMPLATE_CODE','default'),
5
-  'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'),
4
+  'template_code' => env('ECCUBE_TEMPLATE_CODE', 'default'),
5
+  'admin_route' => env('ECCUBE_ADMIN_ROUTE', 'admin'),
6 6
   'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'),
7 7
   'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/html',
8 8
   'public_path_realdir' => '%ROOT_DIR%/html',
Please login to merge, or discard this patch.
src/Eccube/Service/EntityProxyService.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -194,7 +194,7 @@
 block discarded – undo
194 194
 
195 195
     /**
196 196
      * EntityからTraitを削除.
197
-     * @param $entityTokens Tokens Entityのトークン
197
+     * @param Tokens $entityTokens Tokens Entityのトークン
198 198
      * @param $trait string 削除するTraitのFQCN
199 199
      */
200 200
     private function removeTrait($entityTokens, $trait)
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/QueriesServiceProvider.php 3 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,6 @@
 block discarded – undo
16 16
      * This method should only be used to configure services and parameters.
17 17
      * It should not get services.
18 18
      *
19
-     * @param Container $pimple A container instance
20 19
      */
21 20
     public function register(Container $app)
22 21
     {
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,6 @@
 block discarded – undo
4 4
 namespace Eccube\ServiceProvider;
5 5
 
6 6
 
7
-use Eccube\Entity\Event\EntityEventDispatcher;
8 7
 use Pimple\Container;
9 8
 use Pimple\ServiceProviderInterface;
10 9
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
      */
21 21
     public function register(Container $app)
22 22
     {
23
-        $app['eccube.queries'] = function () {
23
+        $app['eccube.queries'] = function() {
24 24
             return new \Eccube\Doctrine\Query\Queries();
25 25
         };
26 26
     }
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/PagenatorServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 {
12 12
     public function register(Container $app)
13 13
     {
14
-        $app['paginator'] = $app->protect(function () {
14
+        $app['paginator'] = $app->protect(function() {
15 15
             $paginator = new Paginator();
16 16
             $paginator->subscribe(new PaginatorListener());
17 17
 
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/TransactionServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
     {
16 16
         $app['eccube.listener.transaction.enabled'] = true;
17 17
 
18
-        $app['eccube.listener.transaction'] = function (Container $app) {
18
+        $app['eccube.listener.transaction'] = function(Container $app) {
19 19
             $listener = new TransactionListener(
20 20
                 $app['orm.em'],
21 21
                 $app['logger'],
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/EccubeServiceProvider.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -46,16 +46,16 @@
 block discarded – undo
46 46
      */
47 47
     public function register(Container $app)
48 48
     {
49
-        $app[BaseInfo::class] = function () use ($app) {
49
+        $app[BaseInfo::class] = function() use ($app) {
50 50
             return $app[BaseInfoRepository::class]->get();
51 51
         };
52 52
 
53
-        $app['request_scope'] = function () {
53
+        $app['request_scope'] = function() {
54 54
             return new ParameterBag();
55 55
         };
56 56
 
57 57
         // Application::initRenderingと一緒に修正
58
-        $app['eccube.twig.block.templates'] = function () {
58
+        $app['eccube.twig.block.templates'] = function() {
59 59
             $templates = new ArrayCollection();
60 60
             $templates[] = 'render_block.twig';
61 61
 
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/PaymentServiceProvider.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,14 +14,14 @@  discard block
 block discarded – undo
14 14
 {
15 15
     public function register(Container $app)
16 16
     {
17
-        $app['payment.method'] = $app->protect(function ($clazz, $form) use ($app) {
17
+        $app['payment.method'] = $app->protect(function($clazz, $form) use ($app) {
18 18
             $PaymentMethod = new $clazz;
19 19
             $PaymentMethod->setApplication($app);
20 20
             $PaymentMethod->setFormType($form);
21 21
             return $PaymentMethod;
22 22
         });
23 23
 
24
-        $app['payment.method.request'] = $app->protect(function ($clazz, $form, $request) use ($app) {
24
+        $app['payment.method.request'] = $app->protect(function($clazz, $form, $request) use ($app) {
25 25
             $PaymentMethod = new $clazz;
26 26
             $PaymentMethod->setApplication($app);
27 27
             $PaymentMethod->setFormType($form);
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
             return $PaymentMethod;
30 30
         });
31 31
 
32
-        $app['eccube.service.payment'] = $app->protect(function ($clazz) use ($app) {
32
+        $app['eccube.service.payment'] = $app->protect(function($clazz) use ($app) {
33 33
             $Service = new $clazz($app['request_stack']);
34 34
 
35 35
             return $Service;
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/ForwardOnlyServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
 {
14 14
     public function register(Container $app)
15 15
     {
16
-        $app['eccube.listener.forward_only'] = function (Container $app) {
16
+        $app['eccube.listener.forward_only'] = function(Container $app) {
17 17
             return new ForwardOnlyListener();
18 18
         };
19 19
     }
Please login to merge, or discard this patch.