EC-CUBE / ec-cube

index.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 $loader = require __DIR__.'/autoload.php';
 
 ini_set('display_errors', 'Off');
-error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
+error_reporting(E_ALL&~E_DEPRECATED&~E_STRICT);
 
 // see http://silex.sensiolabs.org/doc/web_servers.html#php-5-4
 $filename = __DIR__.preg_replace('#(\?.*)$#', '', $_SERVER['REQUEST_URI']);

src/Eccube/Application.php

Indentation +7 added lines, -7 removed lines

@@ -660,13 +660,13 @@
         $pluginConfigs = PluginConfigManager::getPluginConfigAll($this['debug']);
         $ormMappings = array();
         $ormMappings[] = array(
-             'type' => 'annotation',
-             'namespace' => 'Eccube\Entity',
-             'path' => array(
-                 __DIR__.'/Entity'
-             ),
-             'use_simple_annotation_reader' => false,
-         );
+                'type' => 'annotation',
+                'namespace' => 'Eccube\Entity',
+                'path' => array(
+                    __DIR__.'/Entity'
+                ),
+                'use_simple_annotation_reader' => false,
+            );
 
         if (isset($this['config']['vendor_dir']) && file_exists($this['config']['vendor_dir'].'/Entity')) {
 

Spacing +27 added lines, -27 removed lines

@@ -206,7 +206,7 @@ 
         $this->register(new MobileDetectServiceProvider());
         $this->register(new TwigLintServiceProvider());
 
-        $this->error(function (\Exception $e, Request $request, $code) {
+        $this->error(function(\Exception $e, Request $request, $code) {
             if ($this['debug']) {
                 return;
             }
@@ -273,7 +273,7 @@ 
 
         $pluginSubDirs = (function($dirName) use ($enabledPluginDirs) {
             return array_map(function($pluginDir) use ($dirName) {
-                return $pluginDir . '/' . $dirName;
+                return $pluginDir.'/'.$dirName;
             }, $enabledPluginDirs);
         });
 
@@ -340,7 +340,7 @@ 
             return $router;
         });
 
-        $this['eccube.router.origin'] = function ($app) {
+        $this['eccube.router.origin'] = function($app) {
             $resource = __DIR__.'/Controller';
             $cachePrefix = 'Origin';
 
@@ -350,7 +350,7 @@ 
         $this['eccube.routers.plugin'] = [];
 
         if (isset($this['config']['vendor_dir']) && file_exists($this['config']['vendor_dir'].'/Controller')) {
-            $this['eccube.router.extend'] = function ($app) {
+            $this['eccube.router.extend'] = function($app) {
                 $resource = $app['config']['vendor_dir'].'/Controller';
                 $cachePrefix = 'Extend';
 
@@ -359,7 +359,7 @@ 
                 return $router;
             };
         }
-        $this->extend('request_matcher', function ($matcher, $app) {
+        $this->extend('request_matcher', function($matcher, $app) {
             $matchers = [];
             if (isset($app['eccube.router.extend'])) {
                 $matchers[] = $app['eccube.router.extend'];
@@ -373,7 +373,7 @@ 
             return new ChainUrlMatcher($matchers, $app['request_context']);
         });
 
-        $this->extend('url_generator', function ($generator, $app) {
+        $this->extend('url_generator', function($generator, $app) {
             $generators = [];
             if (isset($app['eccube.router.extend'])) {
                 $generators[] = $app['eccube.router.extend'];
@@ -388,7 +388,7 @@ 
         });
 
         // Route CollectionにEC-CUBEで定義したルーティングを追加(debug tool barに出力するため)
-        $this->extend('routes', function ($routes, $app) {
+        $this->extend('routes', function($routes, $app) {
             if (isset($app['eccube.router.extend'])) {
                 $routes->addCollection($app['eccube.router.extend']->getRouteCollection());
             }
@@ -423,7 +423,7 @@ 
             'translator.cache_dir' => $this['debug'] ? null : $this['config']['root_dir'].'/app/cache/translator',
             'locale_fallbacks' => ['ja', 'en'],
         ));
-        $this->extend('translator', function ($translator, \Silex\Application $app) {
+        $this->extend('translator', function($translator, \Silex\Application $app) {
             $translator->addLoader('php', new \Symfony\Component\Translation\Loader\PhpFileLoader());
 
             $file = __DIR__.'/Resource/locale/messages.'.$app['locale'].'.php';
@@ -466,14 +466,14 @@ 
         $this->register(new \Silex\Provider\TwigServiceProvider(), array(
             'twig.form.templates' => array('Form/form_layout.twig'),
         ));
-        $this->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) {
+        $this->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) {
             $twig->addExtension(new \Eccube\Twig\Extension\EccubeExtension($app));
             $twig->addExtension(new \Twig_Extension_StringLoader());
 
             return $twig;
         });
 
-        $this->before(function (Request $request, \Silex\Application $app) {
+        $this->before(function(Request $request, \Silex\Application $app) {
             $app['admin'] = $app['front'] = false;
             $pathinfo = rawurldecode($request->getPathInfo());
             if (strpos($pathinfo, '/'.trim($app['config']['admin_route'], '/').'/') === 0) {
@@ -489,7 +489,7 @@ 
                 }
                 $paths[] = $app['config']['template_admin_realdir'];
                 $paths[] = __DIR__.'/../../app/Plugin';
-                $cacheDir =  __DIR__.'/../../app/cache/twig/admin';
+                $cacheDir = __DIR__.'/../../app/cache/twig/admin';
             } else {
                 // モバイル端末時、smartphoneディレクトリを探索パスに追加する.
                 if ($app['mobile_detect.device_type'] == \Eccube\Entity\Master\DeviceType::DEVICE_TYPE_SP) {
@@ -504,7 +504,7 @@ 
                 }
                 $paths[] = $app['config']['template_default_realdir'];
                 $paths[] = __DIR__.'/../../app/Plugin';
-                $cacheDir =  __DIR__.'/../../app/cache/twig/'.$app['config']['template_code'];
+                $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code'];
             }
             $app['twig']->setCache($app['debug'] ? null : $cacheDir);
             $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths));
@@ -522,7 +522,7 @@ 
         }, self::EARLY_EVENT);
 
         // twigのグローバル変数を定義.
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) {
             // 未ログイン時にマイページや管理画面以下にアクセスするとSubRequestで実行されるため,
             // $event->isMasterRequest()ではなく、グローバル変数が初期化済かどうかの判定を行う
             if (isset($this['twig_global_initialized']) && $this['twig_global_initialized'] === true) {
@@ -607,7 +607,7 @@ 
         // メール送信時の文字エンコード指定(デフォルトはUTF-8)
         if (isset($this['config']['mail']['charset_iso_2022_jp']) && is_bool($this['config']['mail']['charset_iso_2022_jp'])) {
             if ($this['config']['mail']['charset_iso_2022_jp'] === true) {
-                \Swift::init(function () {
+                \Swift::init(function() {
                     \Swift_DependencyContainer::getInstance()
                         ->register('mime.qpheaderencoder')
                         ->asAliasOf('mime.base64headerencoder');
@@ -642,7 +642,7 @@ 
         $this->register(new \Saxulum\DoctrineOrmManagerRegistry\Provider\DoctrineOrmManagerRegistryProvider());
 
         $app = $this;
-        $this->extend('db.event_manager', function ($evm) use ($app) {
+        $this->extend('db.event_manager', function($evm) use ($app) {
             $initSubscriber = new InitSubscriber($app);
             $evm->addEventSubscriber($initSubscriber);
 
@@ -759,7 +759,7 @@ 
 
         $this->extend(
             'orm.em.config',
-            function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
+            function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
 
                 /** @var $chain \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain */
                 $chain = $config->getMetadataDriverImpl();
@@ -781,7 +781,7 @@ 
             }
         );
 
-        $this->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
+        $this->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
             // save
             $saveEventSubscriber = new \Eccube\Doctrine\EventSubscriber\SaveEventSubscriber($app);
             $em->getEventManager()->addEventSubscriber($saveEventSubscriber);
@@ -806,7 +806,7 @@ 
             // second level cacheの設定.
             $this->extend(
                 'orm.em.config',
-                function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
+                function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
                     $config->setSecondLevelCacheEnabled();
                     $cacheConfig = $config->getSecondLevelCacheConfiguration();
                     $regionConfig = $cacheConfig->getRegionsConfiguration();
@@ -895,31 +895,31 @@ 
             array('^/mypage', 'ROLE_USER', $channel),
         );
 
-        $this['eccube.password_encoder'] = function ($app) {
+        $this['eccube.password_encoder'] = function($app) {
             return new \Eccube\Security\Core\Encoder\PasswordEncoder($app['config']);
         };
-        $this['security.encoder_factory'] = function ($app) {
+        $this['security.encoder_factory'] = function($app) {
             return new \Symfony\Component\Security\Core\Encoder\EncoderFactory(array(
                 'Eccube\Entity\Customer' => $app['eccube.password_encoder'],
                 'Eccube\Entity\Member' => $app['eccube.password_encoder'],
             ));
         };
-        $this['eccube.event_listner.security'] = function ($app) {
+        $this['eccube.event_listner.security'] = function($app) {
             return new \Eccube\EventListener\SecurityEventListener($app['orm.em']);
         };
 
         // Voterの設定
-        $this['authority_voter'] = function ($app) {
+        $this['authority_voter'] = function($app) {
             return new \Eccube\Security\Voter\AuthorityVoter($app);
         };
 
-        $this->extend('security.voters', function ($voters, \Silex\Application $app) {
+        $this->extend('security.voters', function($voters, \Silex\Application $app) {
             $voters[] = $app['authority_voter'];
 
             return $voters;
         });
 
-        $this['security.access_manager'] = function ($app) {
+        $this['security.access_manager'] = function($app) {
             return new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager($app['security.voters'], 'unanimous');
         };
 
@@ -933,7 +933,7 @@ 
     {
         $config = $this['config'];
         if (isset($config['trusted_proxies_connection_only']) && !empty($config['trusted_proxies_connection_only'])) {
-            $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($config) {
+            $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($config) {
                 // サブリクエストのREMOTE_ADDRも動的に設定を行う必要があるため、KernelEvents::REQUESTを使用する
                 Request::setTrustedProxies(array_merge(array($event->getRequest()->server->get('REMOTE_ADDR')), $config['trusted_proxies']));
             }, self::EARLY_EVENT);
@@ -950,7 +950,7 @@ 
         $this->register(new ServiceProvider\EccubePluginServiceProvider());
 
         // TODO Acme\ServiceProvider の初期化はここで OK?
-        if (array_key_exists('service',$this['config'])) {
+        if (array_key_exists('service', $this['config'])) {
             foreach ($this['config']['service'] as $service) {
                 $this->register(new $service);
             }
@@ -1092,7 +1092,7 @@ 
         $app = $this;
 
         // Response Event(http cache対応、event実行は一番遅く設定)
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
 
             if (!$event->isMasterRequest()) {
                 return;

Unused Use Statements -1 removed lines

@@ -23,7 +23,6 @@
 
 namespace Eccube;
 
-use Composer\Autoload\ClassLoader;
 use Doctrine\DBAL\Types\Type;
 use Eccube\DI\AutoWiring\EntityEventAutowiring;
 use Eccube\DI\AutoWiring\FormExtensionAutoWiring;

src/Eccube/Controller/Install/InstallController.php

Unused Use Statements -1 removed lines

@@ -40,7 +40,6 @@
 use Eccube\InstallApplication;
 use Eccube\Security\Core\Encoder\PasswordEncoder;
 use Eccube\Util\Str;
-use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpFoundation\Request;

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',