TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

action are now in controller event

Browse Source
This commit is contained in:
Manuel Raynaud
2013-05-16 17:11:06 +02:00
parent 079168c0f2
commit 97817d6885
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
composer.lock generated
View File

@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
], ],
"hash": "01f45cf9b2249fce35b127051f36f68d", "hash": "d0aa87e405dbeb21f65d8d8321b7cca7",
"packages": [ "packages": [
{ {
"name": "ezyang/htmlpurifier", "name": "ezyang/htmlpurifier",
@@ -55,12 +55,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/ircmaxell/password_compat.git", "url": "https://github.com/ircmaxell/password_compat.git",
"reference": "733c06c599bfeb511f54253ddb127701bce0917d" "reference": "6925da603b31bfff9488480c0a9db48a0feeadf1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/733c06c599bfeb511f54253ddb127701bce0917d", "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/6925da603b31bfff9488480c0a9db48a0feeadf1",
"reference": "733c06c599bfeb511f54253ddb127701bce0917d", "reference": "6925da603b31bfff9488480c0a9db48a0feeadf1",
"shasum": "" "shasum": ""
}, },
"type": "library", "type": "library",
@@ -76,7 +76,7 @@
"authors": [ "authors": [
{ {
"name": "Anthony Ferrara", "name": "Anthony Ferrara",
"email": "ircmaxell@php.net", "email": "ircmaxell@ircmaxell.com",
"homepage": "http://blog.ircmaxell.com" "homepage": "http://blog.ircmaxell.com"
} }
], ],
@@ -86,7 +86,7 @@
"hashing", "hashing",
"password" "password"
], ],
"time": "2013-02-13 16:58:34" "time": "2013-05-10 11:19:13"
}, },
{ {
"name": "phing/phing", "name": "phing/phing",
@@ -772,12 +772,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fzaninotto/Faker.git", "url": "https://github.com/fzaninotto/Faker.git",
"reference": "a9c1c8b76abe4622b285dcd7aa342cab9dfb6de6" "reference": "c2b06f9741106c35eb7e21dda4c72a54415277dd"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/fzaninotto/Faker/zipball/a9c1c8b76abe4622b285dcd7aa342cab9dfb6de6", "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/c2b06f9741106c35eb7e21dda4c72a54415277dd",
"reference": "a9c1c8b76abe4622b285dcd7aa342cab9dfb6de6", "reference": "c2b06f9741106c35eb7e21dda4c72a54415277dd",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -809,7 +809,7 @@
"faker", "faker",
"fixtures" "fixtures"
], ],
"time": "2013-04-23 12:35:55" "time": "2013-05-13 07:57:43"
} }
], ],
"aliases": [ "aliases": [
@@ -822,7 +822,7 @@
"fzaninotto/faker": 20 "fzaninotto/faker": 20
}, },
"platform": { "platform": {
"php": ">=5.3.7" "php": ">=5.4"
}, },
"platform-dev": [ "platform-dev": [

2
core/lib/Thelia/Config/Resources/config.xml
View File

@@ -17,7 +17,7 @@
<argument type="service" id="service_container" /> <argument type="service" id="service_container" />
</service> </service>
<service id="thelia.request_listener" class="Thelia\Core\EventListener\RequestListener"> <service id="thelia.controller_listener" class="Thelia\Core\EventListener\ControllerListener">
<tag name="kernel.event_subscriber"/> <tag name="kernel.event_subscriber"/>
</service> </service>

8
core/lib/Thelia/Core/EventListener/RequestListener.php → core/lib/Thelia/Core/EventListener/ControllerListener.php
View File

@@ -24,15 +24,15 @@ namespace Thelia\Core\EventListener;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
use Thelia\Core\Event\ActionEvent; use Thelia\Core\Event\ActionEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
class RequestListener implements EventSubscriberInterface class ControllerListener implements EventSubscriberInterface
{ {
public function onKernelRequest(GetResponseEvent $event) public function onKernelController(FilterControllerEvent $event)
{ {
$dispatcher = $event->getDispatcher(); $dispatcher = $event->getDispatcher();
$request = $event->getRequest(); $request = $event->getRequest();
@@ -47,7 +47,7 @@ class RequestListener implements EventSubscriberInterface
public static function getSubscribedEvents() public static function getSubscribedEvents()
{ {
return array( return array(
KernelEvents::REQUEST => array('onKernelRequest', 0) KernelEvents::CONTROLLER => array('onKernelController', 0)
); );
} }
} }