|
@@ -26,7 +26,7 @@ discard block |
|
|
block discarded – undo |
|
26
|
26
|
public function register(Container $app) |
|
27
|
27
|
{ |
|
28
|
28
|
// EventDispatcher |
|
29
|
|
- $app['eccube.event.dispatcher'] = function () use ($app) { |
|
|
29
|
+ $app['eccube.event.dispatcher'] = function() use ($app) { |
|
30
|
30
|
return $app['dispatcher']; |
|
31
|
31
|
}; |
|
32
|
32
|
|
|
@@ -35,7 +35,7 @@ discard block |
|
|
block discarded – undo |
|
35
|
35
|
|
|
36
|
36
|
$enabledPlugins = $app['orm.em']->getRepository('Eccube\Entity\Plugin')->findAllEnabled(); |
|
37
|
37
|
|
|
38
|
|
- $app['eccube.routers.plugin'] = function ($app) use ($enabledPlugins) { |
|
|
38
|
+ $app['eccube.routers.plugin'] = function($app) use ($enabledPlugins) { |
|
39
|
39
|
$pluginDirs = array_map(function($plugin) use ($app) { |
|
40
|
40
|
return $app['config']['root_dir'].'/app/Plugin/'.$plugin->getCode(); |
|
41
|
41
|
}, $enabledPlugins); |
|
@@ -62,7 +62,7 @@ discard block |
|
|
block discarded – undo |
|
62
|
62
|
$config = $pluginConfig['config']; |
|
63
|
63
|
|
|
64
|
64
|
if (isset($config['const'])) { |
|
65
|
|
- $app->extend('config', function ($eccubeConfig) use ($config) { |
|
|
65
|
+ $app->extend('config', function($eccubeConfig) use ($config) { |
|
66
|
66
|
$eccubeConfig[$config['code']] = array( |
|
67
|
67
|
'const' => $config['const'], |
|
68
|
68
|
); |
|
@@ -84,7 +84,7 @@ discard block |
|
|
block discarded – undo |
|
84
|
84
|
public function initPluginEventDispatcher(Application $app) |
|
85
|
85
|
{ |
|
86
|
86
|
// hook point |
|
87
|
|
- $app->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) { |
|
|
87
|
+ $app->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) { |
|
88
|
88
|
if (!$event->isMasterRequest()) { |
|
89
|
89
|
return; |
|
90
|
90
|
} |
|
@@ -92,7 +92,7 @@ discard block |
|
|
block discarded – undo |
|
92
|
92
|
$app['eccube.event.dispatcher']->dispatch($hookpoint, $event); |
|
93
|
93
|
}, Application::EARLY_EVENT); |
|
94
|
94
|
|
|
95
|
|
- $app->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) { |
|
|
95
|
+ $app->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) { |
|
96
|
96
|
if (!$event->isMasterRequest()) { |
|
97
|
97
|
return; |
|
98
|
98
|
} |
|
@@ -101,7 +101,7 @@ discard block |
|
|
block discarded – undo |
|
101
|
101
|
$app['eccube.event.dispatcher']->dispatch($hookpoint, $event); |
|
102
|
102
|
}); |
|
103
|
103
|
|
|
104
|
|
- $app->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) { |
|
|
104
|
+ $app->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) { |
|
105
|
105
|
if (!$event->isMasterRequest()) { |
|
106
|
106
|
return; |
|
107
|
107
|
} |
|
@@ -110,7 +110,7 @@ discard block |
|
|
block discarded – undo |
|
110
|
110
|
$app['eccube.event.dispatcher']->dispatch($hookpoint, $event); |
|
111
|
111
|
}); |
|
112
|
112
|
|
|
113
|
|
- $app->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) { |
|
|
113
|
+ $app->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) { |
|
114
|
114
|
if (!$event->isMasterRequest()) { |
|
115
|
115
|
return; |
|
116
|
116
|
} |
|
@@ -118,13 +118,13 @@ discard block |
|
|
block discarded – undo |
|
118
|
118
|
$app['eccube.event.dispatcher']->dispatch($hookpoint, $event); |
|
119
|
119
|
}, Application::LATE_EVENT); |
|
120
|
120
|
|
|
121
|
|
- $app->on(KernelEvents::TERMINATE, function (PostResponseEvent $event) use ($app) { |
|
|
121
|
+ $app->on(KernelEvents::TERMINATE, function(PostResponseEvent $event) use ($app) { |
|
122
|
122
|
$route = $event->getRequest()->attributes->get('_route'); |
|
123
|
123
|
$hookpoint = "eccube.event.controller.$route.finish"; |
|
124
|
124
|
$app['eccube.event.dispatcher']->dispatch($hookpoint, $event); |
|
125
|
125
|
}); |
|
126
|
126
|
|
|
127
|
|
- $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
|
127
|
+ $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
128
|
128
|
if (!$event->isMasterRequest()) { |
|
129
|
129
|
return; |
|
130
|
130
|
} |
|
@@ -133,7 +133,7 @@ discard block |
|
|
block discarded – undo |
|
133
|
133
|
}); |
|
134
|
134
|
|
|
135
|
135
|
// Request Event |
|
136
|
|
- $app->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function (\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) { |
|
|
136
|
+ $app->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function(\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) { |
|
137
|
137
|
|
|
138
|
138
|
if (!$event->isMasterRequest()) { |
|
139
|
139
|
return; |
|
@@ -164,7 +164,7 @@ discard block |
|
|
block discarded – undo |
|
164
|
164
|
}, 30); // Routing(32)が解決し, 認証判定(8)が実行される前のタイミング. |
|
165
|
165
|
|
|
166
|
166
|
// Controller Event |
|
167
|
|
- $app->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) { |
|
|
167
|
+ $app->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) { |
|
168
|
168
|
|
|
169
|
169
|
if (!$event->isMasterRequest()) { |
|
170
|
170
|
return; |
|
@@ -193,7 +193,7 @@ discard block |
|
|
block discarded – undo |
|
193
|
193
|
}); |
|
194
|
194
|
|
|
195
|
195
|
// Response Event |
|
196
|
|
- $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
|
196
|
+ $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
197
|
197
|
if (!$event->isMasterRequest()) { |
|
198
|
198
|
return; |
|
199
|
199
|
} |
|
@@ -222,7 +222,7 @@ discard block |
|
|
block discarded – undo |
|
222
|
222
|
}); |
|
223
|
223
|
|
|
224
|
224
|
// Exception Event |
|
225
|
|
- $app->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function (\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) { |
|
|
225
|
+ $app->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function(\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) { |
|
226
|
226
|
|
|
227
|
227
|
if (!$event->isMasterRequest()) { |
|
228
|
228
|
return; |
|
@@ -252,7 +252,7 @@ discard block |
|
|
block discarded – undo |
|
252
|
252
|
}); |
|
253
|
253
|
|
|
254
|
254
|
// Terminate Event |
|
255
|
|
- $app->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function (\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) { |
|
|
255
|
+ $app->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function(\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) { |
|
256
|
256
|
|
|
257
|
257
|
$route = $event->getRequest()->attributes->get('_route'); |
|
258
|
258
|
|