EC-CUBE / ec-cube

src/Eccube/ServiceProvider/EccubePluginServiceProvider.php

Spacing +14 added lines, -14 removed lines

@@ -26,7 +26,7 @@ 
     public function register(Container $app)
     {
         // EventDispatcher
-        $app['eccube.event.dispatcher'] = function () use ($app) {
+        $app['eccube.event.dispatcher'] = function() use ($app) {
             return $app['dispatcher'];
         };
 
@@ -35,7 +35,7 @@ 
 
         $enabledPlugins = $app['orm.em']->getRepository('Eccube\Entity\Plugin')->findAllEnabled();
 
-        $app['eccube.routers.plugin'] = function ($app) use ($enabledPlugins) {
+        $app['eccube.routers.plugin'] = function($app) use ($enabledPlugins) {
             $pluginDirs = array_map(function($plugin) use ($app) {
                 return $app['config']['root_dir'].'/app/Plugin/'.$plugin->getCode();
             }, $enabledPlugins);
@@ -62,7 +62,7 @@ 
             $config = $pluginConfig['config'];
 
             if (isset($config['const'])) {
-                $app->extend('config', function ($eccubeConfig) use ($config) {
+                $app->extend('config', function($eccubeConfig) use ($config) {
                     $eccubeConfig[$config['code']] = array(
                         'const' => $config['const'],
                     );
@@ -84,7 +84,7 @@ 
     public function initPluginEventDispatcher(Application $app)
     {
         // hook point
-        $app->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) {
+        $app->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -92,7 +92,7 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         }, Application::EARLY_EVENT);
 
-        $app->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) {
+        $app->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -101,7 +101,7 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         });
 
-        $app->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) {
+        $app->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -110,7 +110,7 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         });
 
-        $app->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) {
+        $app->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -118,13 +118,13 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         }, Application::LATE_EVENT);
 
-        $app->on(KernelEvents::TERMINATE, function (PostResponseEvent $event) use ($app) {
+        $app->on(KernelEvents::TERMINATE, function(PostResponseEvent $event) use ($app) {
             $route = $event->getRequest()->attributes->get('_route');
             $hookpoint = "eccube.event.controller.$route.finish";
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         });
 
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -133,7 +133,7 @@ 
         });
 
         // Request Event
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function (\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function(\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) {
 
             if (!$event->isMasterRequest()) {
                 return;
@@ -164,7 +164,7 @@ 
         }, 30); // Routing(32)が解決し, 認証判定(8)が実行される前のタイミング.
 
         // Controller Event
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
 
             if (!$event->isMasterRequest()) {
                 return;
@@ -193,7 +193,7 @@ 
         });
 
         // Response Event
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -222,7 +222,7 @@ 
         });
 
         // Exception Event
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function (\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function(\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) {
 
             if (!$event->isMasterRequest()) {
                 return;
@@ -252,7 +252,7 @@ 
         });
 
         // Terminate Event
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function (\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function(\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) {
 
             $route = $event->getRequest()->attributes->get('_route');
 

src/Eccube/DI/AutoWiring/FormExtensionAutoWiring.php

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 {
     /**
      * FormExtensionAutoWiring constructor.
-     * @param array|string[] $scanDirs
+     * @param string[] $scanDirs
      */
     public function __construct($scanDirs)
     {

src/Eccube/DI/AutoWiring/RepositoryAutoWiring.php

Doc Comments +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 {
     /**
      * RepositoryAutoWiring constructor.
-     * @param array|string[] $scanDirs
+     * @param string[] $scanDirs
      */
     public function __construct($scanDirs)
     {

src/Eccube/DI/DependencyBuilder.php

Braces +3 added lines, -1 removed lines

@@ -161,7 +161,9 @@
             }
 
             if (!empty($components)) {
-                if ($snippets) $snippets .= PHP_EOL;
+                if ($snippets) {
+                    $snippets .= PHP_EOL;
+                }
                 $snippets .= $wiring->generate($twig, $components);
                 $snippets .= $wiring->generateExtend($twig, $components);
             }

src/Eccube/Resource/config/path.php

Indentation +29 added lines, -29 removed lines

@@ -1,31 +1,31 @@
 <?php return [
-  'root_dir' => '%ROOT_DIR%',
-  'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null),
-  'template_code' => env('ECCUBE_TEMPLATE_CODE','default'),
-  'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'),
-  'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'),
-  'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/html',
-  'public_path_realdir' => '%ROOT_DIR%/html',
-  'image_save_realdir' => '%ROOT_DIR%/html/upload/save_image',
-  'image_temp_realdir' => '%ROOT_DIR%/html/upload/temp_image',
-  'user_data_realdir' => '%ROOT_DIR%/html/user_data',
-  'block_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default/Block',
-  'block_realdir' => '%ROOT_DIR%/app/template/default/Block',
-  'template_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default',
-  'template_default_html_realdir' => '%ROOT_DIR%/html/template/default',
-  'template_admin_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/admin',
-  'template_admin_html_realdir' => '%ROOT_DIR%/html/template/admin',
-  'template_realdir' => '%ROOT_DIR%/app/template/default',
-  'template_html_realdir' => '%ROOT_DIR%/html/template/default',
-  'template_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/template',
-  'csv_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/csv',
-  'plugin_realdir' => '%ROOT_DIR%/app/Plugin',
-  'plugin_temp_realdir' => '%ROOT_DIR%/app/cache/plugin',
-  'plugin_html_realdir' => '%ROOT_DIR%/html/plugin',
-  'admin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/admin',
-  'front_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/default',
-  'image_save_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/save_image',
-  'image_temp_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/temp_image',
-  'user_data_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/user_data',
-  'plugin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/plugin',
+    'root_dir' => '%ROOT_DIR%',
+    'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null),
+    'template_code' => env('ECCUBE_TEMPLATE_CODE','default'),
+    'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'),
+    'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'),
+    'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/html',
+    'public_path_realdir' => '%ROOT_DIR%/html',
+    'image_save_realdir' => '%ROOT_DIR%/html/upload/save_image',
+    'image_temp_realdir' => '%ROOT_DIR%/html/upload/temp_image',
+    'user_data_realdir' => '%ROOT_DIR%/html/user_data',
+    'block_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default/Block',
+    'block_realdir' => '%ROOT_DIR%/app/template/default/Block',
+    'template_default_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/default',
+    'template_default_html_realdir' => '%ROOT_DIR%/html/template/default',
+    'template_admin_realdir' => '%ROOT_DIR%/src/Eccube/Resource/template/admin',
+    'template_admin_html_realdir' => '%ROOT_DIR%/html/template/admin',
+    'template_realdir' => '%ROOT_DIR%/app/template/default',
+    'template_html_realdir' => '%ROOT_DIR%/html/template/default',
+    'template_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/template',
+    'csv_temp_realdir' => '%ROOT_DIR%/app/cache/eccube/csv',
+    'plugin_realdir' => '%ROOT_DIR%/app/Plugin',
+    'plugin_temp_realdir' => '%ROOT_DIR%/app/cache/plugin',
+    'plugin_html_realdir' => '%ROOT_DIR%/html/plugin',
+    'admin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/admin',
+    'front_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/template/default',
+    'image_save_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/save_image',
+    'image_temp_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/upload/temp_image',
+    'user_data_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/user_data',
+    'plugin_urlpath' => env('ECCUBE_ROOT_URLPATH', null).'/html/plugin',
 ];

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php return [
   'root_dir' => '%ROOT_DIR%',
   'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null),
-  'template_code' => env('ECCUBE_TEMPLATE_CODE','default'),
-  'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'),
+  'template_code' => env('ECCUBE_TEMPLATE_CODE', 'default'),
+  'admin_route' => env('ECCUBE_ADMIN_ROUTE', 'admin'),
   'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'),
   'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/html',
   'public_path_realdir' => '%ROOT_DIR%/html',

src/Eccube/Service/EntityProxyService.php

Doc Comments +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
 
     /**
      * EntityからTraitを削除.
-     * @param $entityTokens Tokens Entityのトークン
+     * @param Tokens $entityTokens Tokens Entityのトークン
      * @param $trait string 削除するTraitのFQCN
      */
     private function removeTrait($entityTokens, $trait)

src/Eccube/ServiceProvider/QueriesServiceProvider.php

Doc Comments -1 removed lines

@@ -16,7 +16,6 @@
      * This method should only be used to configure services and parameters.
      * It should not get services.
      *
-     * @param Container $pimple A container instance
      */
     public function register(Container $app)
     {

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 namespace Eccube\ServiceProvider;
 
 
-use Eccube\Entity\Event\EntityEventDispatcher;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      */
     public function register(Container $app)
     {
-        $app['eccube.queries'] = function () {
+        $app['eccube.queries'] = function() {
             return new \Eccube\Doctrine\Query\Queries();
         };
     }

src/Eccube/ServiceProvider/PagenatorServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 {
     public function register(Container $app)
     {
-        $app['paginator'] = $app->protect(function () {
+        $app['paginator'] = $app->protect(function() {
             $paginator = new Paginator();
             $paginator->subscribe(new PaginatorListener());
 

src/Eccube/ServiceProvider/TransactionServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     {
         $app['eccube.listener.transaction.enabled'] = true;
 
-        $app['eccube.listener.transaction'] = function (Container $app) {
+        $app['eccube.listener.transaction'] = function(Container $app) {
             $listener = new TransactionListener(
                 $app['orm.em'],
                 $app['logger'],