Failed Conditions
Pull Request — experimental/3.1 (#2561)
by k-yamamura
44:34 queued 05:21
created
src/Eccube/DI/DIServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 {
13 13
     public function register(Container $app)
14 14
     {
15
-        $app['eccube.di'] = function (Container $app) {
15
+        $app['eccube.di'] = function(Container $app) {
16 16
             $di = new DependencyBuilder(
17 17
                 $app['eccube.di.generator.dir'],
18 18
                 $app['eccube.di.generator.class'],
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/Service/PluginService.php 3 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,6 @@
 block discarded – undo
30 30
 use Eccube\Application;
31 31
 use Eccube\Entity\Plugin;
32 32
 use Eccube\Exception\PluginException;
33
-use Eccube\Plugin\ConfigManager;
34 33
 use Eccube\Plugin\ConfigManager as PluginConfigManager;
35 34
 use Eccube\Repository\PluginEventHandlerRepository;
36 35
 use Eccube\Repository\PluginRepository;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
     {
144 144
         // Proxyのクラスをロードせずにスキーマを更新するために、
145 145
         // インストール時には一時的なディレクトリにProxyを生成する
146
-        $tmpProxyOutputDir = sys_get_temp_dir() . '/proxy_' . Str::random(12);
146
+        $tmpProxyOutputDir = sys_get_temp_dir().'/proxy_'.Str::random(12);
147 147
         @mkdir($tmpProxyOutputDir);
148 148
 
149 149
         try {
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
             if (!empty($config_cache)) {
210 210
                 $meta = $config_cache;
211 211
             } else {
212
-                $meta = $this->readYml($dir . '/config.yml');
212
+                $meta = $this->readYml($dir.'/config.yml');
213 213
             }
214 214
         } catch (\Symfony\Component\Yaml\Exception\ParseException $e) {
215 215
             throw new PluginException($e->getMessage(), $e->getCode(), $e);
Please login to merge, or discard this patch.
Doc Comments   +26 added lines patch added patch discarded remove patch
@@ -92,6 +92,10 @@  discard block
 block discarded – undo
92 92
     const VENDOR_NAME = 'ec-cube';
93 93
 
94 94
     // ファイル指定してのプラグインインストール
95
+
96
+    /**
97
+     * @param string $path
98
+     */
95 99
     public function install($path, $source = 0)
96 100
     {
97 101
         $pluginBaseDir = null;
@@ -140,6 +144,10 @@  discard block
 block discarded – undo
140 144
     }
141 145
 
142 146
     // インストール事後処理
147
+
148
+    /**
149
+     * @param integer $source
150
+     */
143 151
     public function postInstall($config, $event, $source)
144 152
     {
145 153
         // Proxyのクラスをロードせずにスキーマを更新するために、
@@ -186,6 +194,9 @@  discard block
 block discarded – undo
186 194
         }
187 195
     }
188 196
 
197
+    /**
198
+     * @param string $dir
199
+     */
189 200
     public function unpackPluginArchive($archive, $dir)
190 201
     {
191 202
         $extension = pathinfo($archive, PATHINFO_EXTENSION);
@@ -245,6 +256,9 @@  discard block
 block discarded – undo
245 256
         }
246 257
     }
247 258
 
259
+    /**
260
+     * @param string $yml
261
+     */
248 262
     public function readYml($yml)
249 263
     {
250 264
         if (file_exists($yml)) {
@@ -262,6 +276,9 @@  discard block
 block discarded – undo
262 276
         // ディレクトリ名などに使われれるので厳しめ
263 277
     }
264 278
 
279
+    /**
280
+     * @param string $path
281
+     */
265 282
     public function deleteFile($path)
266 283
     {
267 284
         $f = new Filesystem();
@@ -281,6 +298,9 @@  discard block
 block discarded – undo
281 298
         return $this->appConfig['plugin_realdir'].'/'.$name;
282 299
     }
283 300
 
301
+    /**
302
+     * @param string $d
303
+     */
284 304
     public function createPluginDir($d)
285 305
     {
286 306
         $b = @mkdir($d);
@@ -338,6 +358,9 @@  discard block
 block discarded – undo
338 358
         return $p;
339 359
     }
340 360
 
361
+    /**
362
+     * @param string $method
363
+     */
341 364
     public function callPluginManagerMethod($meta, $method)
342 365
     {
343 366
         $class = '\\Plugin'.'\\'.$meta['code'].'\\'.'PluginManager';
@@ -454,6 +477,9 @@  discard block
 block discarded – undo
454 477
         return true;
455 478
     }
456 479
 
480
+    /**
481
+     * @param string $path
482
+     */
457 483
     public function update(\Eccube\Entity\Plugin $plugin, $path)
458 484
     {
459 485
         $pluginBaseDir = null;
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/PurchaseFlowServiceProvider.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
26 26
 {
27 27
     public function register(Container $app)
28 28
     {
29
-        $app['eccube.purchase.context'] = $app->protect(function (ItemHolderInterface $origin = null) {
29
+        $app['eccube.purchase.context'] = $app->protect(function(ItemHolderInterface $origin = null) {
30 30
             return new PurchaseContext($origin);
31 31
         });
32 32
 
33
-        $app['eccube.purchase.flow.cart.item_processors'] = function (Container $app) {
33
+        $app['eccube.purchase.flow.cart.item_processors'] = function(Container $app) {
34 34
             $processors = new ArrayCollection();
35 35
             $processors[] = new DisplayStatusValidator();
36 36
             $processors[] = new SaleLimitValidator();
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
             return $processors;
41 41
         };
42 42
 
43
-        $app['eccube.purchase.flow.cart.holder_processors'] = function (Container $app) {
43
+        $app['eccube.purchase.flow.cart.holder_processors'] = function(Container $app) {
44 44
             $processors = new ArrayCollection();
45 45
             $processors[] = new PaymentProcessor($app[DeliveryRepository::class]);
46 46
             $processors[] = new PaymentTotalLimitValidator($app['config']['max_total_fee']);
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
             return $processors;
51 51
         };
52 52
 
53
-        $app['eccube.purchase.flow.cart'] = function (Container $app) {
53
+        $app['eccube.purchase.flow.cart'] = function(Container $app) {
54 54
             $flow = new PurchaseFlow();
55 55
             $flow->setItemProcessors($app['eccube.purchase.flow.cart.item_processors']);
56 56
             $flow->setItemHolderProcessors($app['eccube.purchase.flow.cart.holder_processors']);
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
             return $flow;
59 59
         };
60 60
 
61
-        $app['eccube.purchase.flow.shopping.item_processors'] = function (Container $app) {
61
+        $app['eccube.purchase.flow.shopping.item_processors'] = function(Container $app) {
62 62
             $processors = new ArrayCollection();
63 63
             $processors[] = new StockValidator();
64 64
             $processors[] = new DisplayStatusValidator();
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
             return $processors;
67 67
         };
68 68
 
69
-        $app['eccube.purchase.flow.shopping.holder_processors'] = function (Container $app) {
69
+        $app['eccube.purchase.flow.shopping.holder_processors'] = function(Container $app) {
70 70
             $processors = new ArrayCollection();
71 71
             $processors[] = new PaymentTotalLimitValidator($app['config']['max_total_fee']);
72 72
             $processors[] = new DeliveryFeeProcessor($app['orm.em']);
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
             return $processors;
76 76
         };
77 77
 
78
-        $app['eccube.purchase.flow.shopping'] = function (Container $app) {
78
+        $app['eccube.purchase.flow.shopping'] = function(Container $app) {
79 79
             $flow = new PurchaseFlow();
80 80
             $flow->setItemProcessors($app['eccube.purchase.flow.shopping.item_processors']);
81 81
             $flow->setItemHolderProcessors($app['eccube.purchase.flow.shopping.holder_processors']);
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
             return $flow;
84 84
         };
85 85
 
86
-        $app['eccube.purchase.flow.order.item_processors'] = function (Container $app) {
86
+        $app['eccube.purchase.flow.order.item_processors'] = function(Container $app) {
87 87
             $processors = new ArrayCollection();
88 88
             $processors[] = new StockValidator();
89 89
             $processors[] = new PaymentTotalLimitValidator($app['config']['max_total_fee']);
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
             return $processors;
92 92
         };
93 93
 
94
-        $app['eccube.purchase.flow.order.holder_processors'] = function (Container $app) {
94
+        $app['eccube.purchase.flow.order.holder_processors'] = function(Container $app) {
95 95
             $processors = new ArrayCollection();
96 96
             $processors[] = new UpdateDatePurchaseProcessor($app['config']);
97 97
             $processors[] = new AdminOrderRegisterPurchaseProcessor($app);
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
             return $processors;
100 100
         };
101 101
 
102
-        $app['eccube.purchase.flow.order'] = function (Container $app) {
102
+        $app['eccube.purchase.flow.order'] = function(Container $app) {
103 103
             $flow = new PurchaseFlow();
104 104
             $flow->setItemProcessors($app['eccube.purchase.flow.order.item_processors']);
105 105
             $flow->setItemHolderProcessors($app['eccube.purchase.flow.order.holder_processors']);
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.