EC-CUBE / ec-cube

src/Eccube/Application.php

Doc Comments +1 added lines, -11 removed lines

@@ -1117,14 +1117,4 @@
                         ));
 
                         if ($response->isNotModified($request)) {
-                            return $response;
-                        }
-                    }
-                }
-            }
-
-        }, -1024);
-
->>>>>>> k-yamamura/feature-httpcache
-    }
-}
+                            return $response
\ No newline at end of file

Unused Use Statements +1 added lines, -11 removed lines

@@ -1117,14 +1117,4 @@
                         ));
 
                         if ($response->isNotModified($request)) {
-                            return $response;
-                        }
-                    }
-                }
-            }
-
-        }, -1024);
-
->>>>>>> k-yamamura/feature-httpcache
-    }
-}
+                            return $response
\ No newline at end of file

Indentation +1 added lines, -11 removed lines

@@ -1117,14 +1117,4 @@
                         ));
 
                         if ($response->isNotModified($request)) {
-                            return $response;
-                        }
-                    }
-                }
-            }
-
-        }, -1024);
-
->>>>>>> k-yamamura/feature-httpcache
-    }
-}
+                            return $response
\ No newline at end of file

Switch Indentation +1 added lines, -11 removed lines

@@ -1117,14 +1117,4 @@
                         ));
 
                         if ($response->isNotModified($request)) {
-                            return $response;
-                        }
-                    }
-                }
-            }
-
-        }, -1024);
-
->>>>>>> k-yamamura/feature-httpcache
-    }
-}
+                            return $response
\ No newline at end of file

Spacing +30 added lines, -40 removed lines

@@ -81,7 +81,7 @@ 
     public function initConfig()
     {
         // load config
-        $this['config'] = $this->share(function () {
+        $this['config'] = $this->share(function() {
             $ymlPath = __DIR__.'/../../app/config/eccube';
             $distPath = __DIR__.'/../../src/Eccube/Resource/config';
 
@@ -223,7 +223,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;
             }
@@ -287,7 +287,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');
@@ -331,16 +331,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を分離する
@@ -392,7 +392,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);
@@ -452,7 +452,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');
@@ -618,19 +618,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;
@@ -641,17 +641,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');
         });
 
@@ -675,14 +675,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;
             }
@@ -690,7 +690,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;
             }
@@ -699,7 +699,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;
             }
@@ -708,7 +708,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;
             }
@@ -716,19 +716,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;
@@ -759,7 +759,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;
@@ -790,7 +790,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;
@@ -820,7 +820,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;
@@ -850,7 +850,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');
 
@@ -929,7 +929,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'],
                     );
@@ -1045,7 +1045,7 @@ 
         return true;
     }
 
-<<<<<<< HEAD
+<< << <<< HEAD
     /**
      * セッションが開始されているかどうか.
      *
@@ -1117,14 +1117,4 @@ 
                         ));
 
                         if ($response->isNotModified($request)) {
-                            return $response;
-                        }
-                    }
-                }
-            }
-
-        }, -1024);
-
->>>>>>> k-yamamura/feature-httpcache
-    }
-}
+                            return $response
\ No newline at end of file

Braces +1 added lines, -11 removed lines

@@ -1117,14 +1117,4 @@
                         ));
 
                         if ($response->isNotModified($request)) {
-                            return $response;
-                        }
-                    }
-                }
-            }
-
-        }, -1024);
-
->>>>>>> k-yamamura/feature-httpcache
-    }
-}
+                            return $response
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -11 removed lines

@@ -1117,14 +1117,4 @@
                         ));
 
                         if ($response->isNotModified($request)) {
-                            return $response;
-                        }
-                    }
-                }
-            }
-
-        }, -1024);
-
->>>>>>> k-yamamura/feature-httpcache
-    }
-}
+                            return $response
\ No newline at end of file