nanasess / ec-cube

src/Eccube/Controller/Admin/Content/BlockController.php

Spacing +3 added lines, -3 removed lines

@@ -113,13 +113,13 @@ 
                 // ファイル生成・更新
                 $tplDir = $app['config']['block_realdir'];
 
-                $filePath = $tplDir . '/' . $Block->getFileName() . '.twig';
+                $filePath = $tplDir.'/'.$Block->getFileName().'.twig';
 
                 $fs = new Filesystem();
                 $fs->dumpFile($filePath, $form->get('block_html')->getData());
                 // 更新でファイル名を変更した場合、以前のファイルを削除
                 if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) {
-                    $oldFilePath = $tplDir . '/' . $previous_filename . '.twig';
+                    $oldFilePath = $tplDir.'/'.$previous_filename.'.twig';
                     if ($fs->exists($oldFilePath)) {
                         $fs->remove($oldFilePath);
                     }
@@ -171,7 +171,7 @@ 
         // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る
         if ($Block->getDeletableFlg() > 0) {
             $tplDir = $app['config']['block_realdir'];
-            $file = $tplDir . '/' . $Block->getFileName() . '.twig';
+            $file = $tplDir.'/'.$Block->getFileName().'.twig';
             $fs = new Filesystem();
             if ($fs->exists($file)) {
                 $fs->remove($file);

src/Eccube/Controller/Admin/Setting/System/SecurityController.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
             if (count($allowHost) > 0) {
                 $form->get('admin_allow_host')->setData(Str::convertLineFeed(implode("\n", $allowHost)));
             }
-            $form->get('force_ssl')->setData((bool)$app['config']['force_ssl']);
+            $form->get('force_ssl')->setData((bool) $app['config']['force_ssl']);
         }
 
         return $app->render('Setting/System/security.twig', array(

src/Eccube/Service/ShoppingService.php

Spacing +1 added lines, -1 removed lines

@@ -920,7 +920,7 @@
 
         // 配送日数が設定されている
         if ($deliveryDateFlag) {
-            $period = new \DatePeriod (
+            $period = new \DatePeriod(
                 new \DateTime($minDate.' day'),
                 new \DateInterval('P1D'),
                 new \DateTime($minDate + $this->app['config']['deliv_date_end_max'].' day')

src/Eccube/Controller/Admin/Order/MailController.php

Spacing +2 added lines, -2 removed lines

@@ -336,10 +336,10 @@
                 }
             }
         } else {
-            $filter = function ($v) {
+            $filter = function($v) {
                 return preg_match('/^ids\d+$/', $v);
             };
-            $map = function ($v) {
+            $map = function($v) {
                 return preg_replace('/[^\d+]/', '', $v);
             };
             $keys = array_keys($request->query->all());

src/Eccube/Resource/doctrine/migration/Version20160413151321.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
         // path.ymlの更新
         $app = Application::getInstance();
-        $file = $app['config']['root_dir'] . '/app/config/eccube/path.yml';
+        $file = $app['config']['root_dir'].'/app/config/eccube/path.yml';
         $config = Yaml::parse(file_get_contents($file));
 
         if (!array_key_exists('public_path', $config)) {

src/Eccube/ServiceProvider/DebugServiceProvider.php

Spacing +9 added lines, -9 removed lines

@@ -66,7 +66,7 @@ 
 {
     public function register(Application $app)
     {
-        $app['var_dumper.cloner'] = $app->share(function ($app) {
+        $app['var_dumper.cloner'] = $app->share(function($app) {
             $cloner = new VarCloner();
 
             if (isset($app['debug.max_items'])) {
@@ -80,23 +80,23 @@ 
             return $cloner;
         });
 
-        $app['data_collector.templates'] = $app->share($app->extend('data_collector.templates', function ($templates) {
+        $app['data_collector.templates'] = $app->share($app->extend('data_collector.templates', function($templates) {
             return array_merge($templates, array(array('dump', '@Debug/Profiler/dump.html.twig')));
         }));
 
-        $app['data_collector.dump'] = $app->share(function ($app) {
+        $app['data_collector.dump'] = $app->share(function($app) {
             return new DumpDataCollector($app['stopwatch'], $app['code.file_link_format']);
         });
 
-        $app['data_collectors'] = $app->share($app->extend('data_collectors', function ($collectors, $app) {
-            $collectors['dump'] = $app->share(function ($app) {
+        $app['data_collectors'] = $app->share($app->extend('data_collectors', function($collectors, $app) {
+            $collectors['dump'] = $app->share(function($app) {
                 return $app['data_collector.dump'];
             });
 
             return $collectors;
         }));
 
-        $app['twig'] = $app->share($app->extend('twig', function ($twig, $app) {
+        $app['twig'] = $app->share($app->extend('twig', function($twig, $app) {
             if (class_exists('\Symfony\Bridge\Twig\Extension\DumpExtension')) {
                 $twig->addExtension(new DumpExtension($app['var_dumper.cloner']));
             }
@@ -104,13 +104,13 @@ 
             return $twig;
         }));
 
-        $app['twig.loader.filesystem'] = $app->share($app->extend('twig.loader.filesystem', function ($loader, $app) {
+        $app['twig.loader.filesystem'] = $app->share($app->extend('twig.loader.filesystem', function($loader, $app) {
             $loader->addPath($app['debug.templates_path'], 'Debug');
 
             return $loader;
         }));
 
-        $app['debug.templates_path'] = function () {
+        $app['debug.templates_path'] = function() {
             $r = new \ReflectionClass('Symfony\Bundle\DebugBundle\DependencyInjection\Configuration');
 
             return dirname(dirname($r->getFileName())).'/Resources/views';
@@ -122,7 +122,7 @@ 
         // This code is here to lazy load the dump stack. This default
         // configuration for CLI mode is overridden in HTTP mode on
         // 'kernel.request' event
-        VarDumper::setHandler(function ($var) use ($app) {
+        VarDumper::setHandler(function($var) use ($app) {
             $dumper = new CliDumper();
             $dumper->dump($app['var_dumper.cloner']->cloneVar($var));
         });

src/Eccube/Application.php

Spacing +28 added lines, -28 removed lines

@@ -133,7 +133,7 @@ 
         $this->register(new \Eccube\ServiceProvider\ValidatorServiceProvider());
 
         $app = $this;
-        $this->error(function (\Exception $e, $code) use ($app) {
+        $this->error(function(\Exception $e, $code) use ($app) {
             if ($app['debug']) {
                 return;
             }
@@ -197,7 +197,7 @@ 
         $this->register(new \Silex\Provider\TranslationServiceProvider(), array(
             'locale' => $this['config']['locale'],
         ));
-        $this['translator'] = $this->share($this->extend('translator', function ($translator, \Silex\Application $app) {
+        $this['translator'] = $this->share($this->extend('translator', function($translator, \Silex\Application $app) {
             $translator->addLoader('yaml', new \Symfony\Component\Translation\Loader\YamlFileLoader());
 
             $r = new \ReflectionClass('Symfony\Component\Validator\Validator');
@@ -241,16 +241,16 @@ 
         $this->register(new \Silex\Provider\TwigServiceProvider(), array(
             'twig.form.templates' => array('Form/form_layout.twig'),
         ));
-        $this['twig'] = $this->share($this->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) {
+        $this['twig'] = $this->share($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) {
             // フロント or 管理画面ごとにtwigの探索パスを切り替える.
-            $app['twig'] = $app->share($app->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) {
+            $app['twig'] = $app->share($app->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) {
                 $paths = array();
 
                 // 互換性がないのでprofiler とproduction 時のcacheを分離する
@@ -302,7 +302,7 @@ 
 
         // twigのグローバル変数を定義.
         $app = $this;
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
             // ショップ基本情報
             $BaseInfo = $app['eccube.repository.base_info']->get();
             $app['twig']->addGlobal('BaseInfo', $BaseInfo);
@@ -362,7 +362,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');
@@ -529,19 +529,19 @@ 
             array('^/mypage', 'ROLE_USER'),
         );
 
-        $this['eccube.password_encoder'] = $this->share(function ($app) {
+        $this['eccube.password_encoder'] = $this->share(function($app) {
             return new \Eccube\Security\Core\Encoder\PasswordEncoder($app['config']);
         });
-        $this['security.encoder_factory'] = $this->share(function ($app) {
+        $this['security.encoder_factory'] = $this->share(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'] = $this->share(function ($app) {
+        $this['eccube.event_listner.security'] = $this->share(function($app) {
             return new \Eccube\EventListener\SecurityEventListener($app['orm.em']);
         });
-        $this['user'] = function ($app) {
+        $this['user'] = function($app) {
             $token = $app['security']->getToken();
 
             return ($token !== null) ? $token->getUser() : null;
@@ -552,17 +552,17 @@ 
 
         // Voterの設定
         $app = $this;
-        $this['authority_voter'] = $this->share(function ($app) {
+        $this['authority_voter'] = $this->share(function($app) {
             return new \Eccube\Security\Voter\AuthorityVoter($app);
         });
 
-        $app['security.voters'] = $app->extend('security.voters', function ($voters) use ($app) {
+        $app['security.voters'] = $app->extend('security.voters', function($voters) use ($app) {
             $voters[] = $app['authority_voter'];
 
             return $voters;
         });
 
-        $this['security.access_manager'] = $this->share(function ($app) {
+        $this['security.access_manager'] = $this->share(function($app) {
             return new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager($app['security.voters'], 'unanimous');
         });
 
@@ -586,14 +586,14 @@ 
     public function initPluginEventDispatcher()
     {
         // EventDispatcher
-        $this['eccube.event.dispatcher'] = $this->share(function () {
+        $this['eccube.event.dispatcher'] = $this->share(function() {
             return new EventDispatcher();
         });
 
         $app = $this;
 
         // hook point
-        $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) {
+        $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -601,7 +601,7 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         }, self::EARLY_EVENT);
 
-        $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) {
+        $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -610,7 +610,7 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         });
 
-        $this->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) {
+        $this->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -619,7 +619,7 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         });
 
-        $this->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) {
+        $this->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -627,19 +627,19 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         }, self::LATE_EVENT);
 
-        $this->on(KernelEvents::TERMINATE, function (PostResponseEvent $event) use ($app) {
+        $this->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);
         });
 
-        $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) {
             $route = $event->getRequest()->attributes->get('_route');
             $app['eccube.event.dispatcher']->dispatch('eccube.event.render.'.$route.'.before', $event);
         });
 
         // Request Event
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function (\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function(\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) {
 
             if (\Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
                 return;
@@ -670,7 +670,7 @@ 
         }, 30); // Routing(32)が解決しし, 認証判定(8)が実行される前のタイミング.
 
         // Controller Event
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
 
             if (\Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
                 return;
@@ -701,7 +701,7 @@ 
         });
 
         // Response 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 (\Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
                 return;
@@ -731,7 +731,7 @@ 
         });
 
         // Exception Event
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function (\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function(\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) {
 
             if (\Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
                 return;
@@ -761,7 +761,7 @@ 
         });
 
         // Terminate Event
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function (\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function(\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) {
 
             $route = $event->getRequest()->attributes->get('_route');
 
@@ -840,7 +840,7 @@ 
 
             // const
             if (isset($config['const'])) {
-                $this['config'] = $this->share($this->extend('config', function ($eccubeConfig) use ($config) {
+                $this['config'] = $this->share($this->extend('config', function($eccubeConfig) use ($config) {
                     $eccubeConfig[$config['code']] = array(
                         'const' => $config['const'],
                     );
@@ -982,7 +982,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 ($app['config']['http_cache']['enabled']) {
                 // httpキャッシュが有効の場合

src/Eccube/Controller/Admin/Store/TemplateController.php

Spacing +23 added lines, -23 removed lines

@@ -77,7 +77,7 @@ 
                 $config['template_realdir'] = $config['root_dir'].'/app/template/'.$templateCode;
                 $config['template_html_realdir'] = $config['public_path_realdir'].'/template/'.$templateCode;
                 $config['front_urlpath'] = $config['root_urlpath'].'/template/'.$templateCode;
-                $config['block_realdir'] =$config['template_realdir'].'/Block';
+                $config['block_realdir'] = $config['template_realdir'].'/Block';
 
                 if (file_exists($file.'.php')) {
                     file_put_contents($file.'.php', sprintf('<?php return %s', var_export($config, true)).';');
@@ -117,19 +117,19 @@ 
         // 該当テンプレートのディレクトリ
         $config = $app['config'];
         $templateCode = $Template->getCode();
-        $targetRealDir = $config['root_dir'] . '/app/template/' . $templateCode;
-        $targetHtmlRealDir = $config['root_dir'] . '/html/template/' . $templateCode;
+        $targetRealDir = $config['root_dir'].'/app/template/'.$templateCode;
+        $targetHtmlRealDir = $config['root_dir'].'/html/template/'.$templateCode;
 
         // 一時ディレクトリ
         $uniqId = sha1(Str::random(32));
-        $tmpDir = $config['template_temp_realdir'] . '/' . $uniqId;
-        $appDir = $tmpDir . '/app';
-        $htmlDir = $tmpDir . '/html';
+        $tmpDir = $config['template_temp_realdir'].'/'.$uniqId;
+        $appDir = $tmpDir.'/app';
+        $htmlDir = $tmpDir.'/html';
 
         // ファイル名
-        $tarFile = $config['template_temp_realdir'] . '/' . $uniqId . '.tar';
-        $tarGzFile = $tarFile . '.gz';
-        $downloadFileName = $Template->getCode() . '.tar.gz';
+        $tarFile = $config['template_temp_realdir'].'/'.$uniqId.'.tar';
+        $tarGzFile = $tarFile.'.gz';
+        $downloadFileName = $Template->getCode().'.tar.gz';
 
         // 該当テンプレートを一時ディレクトリへコピーする.
         $fs = new Filesystem();
@@ -149,14 +149,14 @@ 
 
         // ダウンロード完了後にファイルを削除する.
         // http://stackoverflow.com/questions/15238897/removing-file-after-delivering-response-with-silex-symfony
-        $app->finish(function (Request $request, Response $response, \Silex\Application $app) use (
+        $app->finish(function(Request $request, Response $response, \Silex\Application $app) use (
             $tmpDir,
             $tarFile,
             $tarGzFile
         ) {
-            $app['monolog']->addDebug('remove temp file: ' . $tmpDir);
-            $app['monolog']->addDebug('remove temp file: ' . $tarFile);
-            $app['monolog']->addDebug('remove temp file: ' . $tarGzFile);
+            $app['monolog']->addDebug('remove temp file: '.$tmpDir);
+            $app['monolog']->addDebug('remove temp file: '.$tarFile);
+            $app['monolog']->addDebug('remove temp file: '.$tarGzFile);
             $fs = new Filesystem();
             $fs->remove($tmpDir);
             $fs->remove($tarFile);
@@ -197,8 +197,8 @@ 
         // テンプレートディレクトリの削除
         $config = $app['config'];
         $templateCode = $Template->getCode();
-        $targetRealDir = $config['root_dir'] . '/app/template/' . $templateCode;
-        $targetHtmlRealDir = $config['root_dir'] . '/html/template/' . $templateCode;
+        $targetRealDir = $config['root_dir'].'/app/template/'.$templateCode;
+        $targetHtmlRealDir = $config['root_dir'].'/html/template/'.$templateCode;
 
         $fs = new Filesystem();
         $fs->remove($targetRealDir);
@@ -241,18 +241,18 @@ 
                 // 該当テンプレートのディレクトリ
                 $config = $app['config'];
                 $templateCode = $Template->getCode();
-                $targetRealDir = $config['root_dir'] . '/app/template/' . $templateCode;
-                $targetHtmlRealDir = $config['root_dir'] . '/html/template/' . $templateCode;
+                $targetRealDir = $config['root_dir'].'/app/template/'.$templateCode;
+                $targetHtmlRealDir = $config['root_dir'].'/html/template/'.$templateCode;
 
                 // 一時ディレクトリ
                 $uniqId = sha1(Str::random(32));
-                $tmpDir = $config['template_temp_realdir'] . '/' . $uniqId;
-                $appDir = $tmpDir . '/app';
-                $htmlDir = $tmpDir . '/html';
+                $tmpDir = $config['template_temp_realdir'].'/'.$uniqId;
+                $appDir = $tmpDir.'/app';
+                $htmlDir = $tmpDir.'/html';
 
                 $formFile = $form['file']->getData();
                 // ファイル名
-                $archive = $templateCode . '.' . $formFile->getClientOriginalExtension();
+                $archive = $templateCode.'.'.$formFile->getClientOriginalExtension();
 
                 // ファイルを一時ディレクトリへ移動.
                 $formFile->move($tmpDir, $archive);
@@ -261,11 +261,11 @@ 
                 try {
                     if ($formFile->getClientOriginalExtension() == 'zip') {
                         $zip = new \ZipArchive();
-                        $zip->open($tmpDir . '/' . $archive);
+                        $zip->open($tmpDir.'/'.$archive);
                         $zip->extractTo($tmpDir);
                         $zip->close();
                     } else {
-                        $phar = new \PharData($tmpDir . '/' . $archive);
+                        $phar = new \PharData($tmpDir.'/'.$archive);
                         $phar->extractTo($tmpDir, null, true);
                     }
                 } catch (\Exception $e) {

src/Eccube/Controller/Admin/Content/CacheController.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
                 }
                 if ($dir == 'doctrine') {
                     // doctrineが指定された場合は, cache driver経由で削除.
-                    $config =  $app['orm.em']->getConfiguration();
+                    $config = $app['orm.em']->getConfiguration();
                     $this->deleteDoctrineCache($config->getMetadataCacheImpl());
                     $this->deleteDoctrineCache($config->getQueryCacheImpl());
                     $this->deleteDoctrineCache($config->getResultCacheImpl());