change action implementation

core/lib/Thelia/Action/BaseAction.php

@@ -1,59 +0,0 @@
-<?php
-/*************************************************************************************/
-/*                                                                                   */
-/*      Thelia	                                                                     */
-/*                                                                                   */
-/*      Copyright (c) OpenStudio                                                     */
-/*	email : info@thelia.net                                                      */
-/*      web : http://www.thelia.net                                                  */
-/*                                                                                   */
-/*      This program is free software; you can redistribute it and/or modify         */
-/*      it under the terms of the GNU General Public License as published by         */
-/*      the Free Software Foundation; either version 3 of the License                */
-/*                                                                                   */
-/*      This program is distributed in the hope that it will be useful,              */
-/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
-/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
-/*      GNU General Public License for more details.                                 */
-/*                                                                                   */
-/*      You should have received a copy of the GNU General Public License            */
-/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.     */
-/*                                                                                   */
-/*************************************************************************************/
-
-namespace Thelia\Action;
-
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-/**
- *
- *
- * @author Manuel Raynaud <mraynaud@openstudio.fr>
- */
-
-abstract class BaseAction
-{
-    /**
-     *
-     * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
-     */
-    protected $dispatcher;
-
-    /**
-     *
-     * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
-     */
-    public function __construct(EventDispatcherInterface $dispatcher)
-    {
-        $this->dispatcher = $dispatcher;
-    }
-
-    /**
-     *
-     * @return \Symfony\Component\EventDispatcher\EventDispatcherInterface
-     */
-    public function getDispatcher()
-    {
-        return $this->dispatcher;
-    }
-}

core/lib/Thelia/Action/Cart.php

@@ -24,17 +24,19 @@
 namespace Thelia\Action;
 
 use Symfony\Component\HttpFoundation\Request;
-use Thelia\Action\BaseAction;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Thelia\Core\Event\ActionEvent;
 
-class Cart extends BaseAction
+
+class Cart implements EventSubscriberInterface
 {
     /**
      *
      * add an article to cart
      *
-     * @param \Symfony\Component\HttpFoundation\Request $request
+     * @param \Thelia\Core\Event\ActionEvent $event
      */
-    public function addCart(Request $request)
+    public function addArticle(ActionEvent $event)
     {
 
     }
@@ -43,9 +45,9 @@ class Cart extends BaseAction
      *
      * Delete specify article present into cart
      *
-     * @param \Symfony\Component\HttpFoundation\Request $request
+     * @param \Thelia\Core\Event\ActionEvent $event
      */
-    public function deleteArticle(Request $request)
+    public function deleteArticle(ActionEvent $event)
     {
 
     }
@@ -54,10 +56,39 @@ class Cart extends BaseAction
      *
      * Modify article's quantity
      *
-     * @param \Symfony\Component\HttpFoundation\Request $request
+     * @param \Thelia\Core\Event\ActionEvent $event
      */
-    public function modifyArticle(Request $request)
+    public function modifyArticle(ActionEvent $event)
     {
 
     }
+
+    /**
+     * Returns an array of event names this subscriber wants to listen to.
+     *
+     * The array keys are event names and the value can be:
+     *
+     *  * The method name to call (priority defaults to 0)
+     *  * An array composed of the method name to call and the priority
+     *  * An array of arrays composed of the method names to call and respective
+     *    priorities, or 0 if unset
+     *
+     * For instance:
+     *
+     *  * array('eventName' => 'methodName')
+     *  * array('eventName' => array('methodName', $priority))
+     *  * array('eventName' => array(array('methodName1', $priority), array('methodName2'))
+     *
+     * @return array The event names to listen to
+     *
+     * @api
+     */
+    public static function getSubscribedEvents()
+    {
+        return array(
+            "action.addArticle" => array("addArticle", 128),
+            "action.deleteArticle" => array("deleteArticle", 128),
+            "action.modifyArticle" => array("modifyArticle", 128),
+        );
+    }
 }

core/lib/Thelia/Action/Customer.php

@@ -23,23 +23,54 @@
 
 namespace Thelia\Action;
 
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Thelia\Core\Event\ActionEvent;
 
-class Customer
+class Customer implements EventSubscriberInterface
 {
 
-    public function create(Request $request)
+    public function create(ActionEvent $event)
     {
 
     }
 
-    public function modify(Request $request)
+    public function modify(ActionEvent $event)
     {
 
     }
 
-    public function modifyPassword(Request $request)
+    public function modifyPassword(ActionEvent $event)
     {
 
     }
+
+    /**
+     * Returns an array of event names this subscriber wants to listen to.
+     *
+     * The array keys are event names and the value can be:
+     *
+     *  * The method name to call (priority defaults to 0)
+     *  * An array composed of the method name to call and the priority
+     *  * An array of arrays composed of the method names to call and respective
+     *    priorities, or 0 if unset
+     *
+     * For instance:
+     *
+     *  * array('eventName' => 'methodName')
+     *  * array('eventName' => array('methodName', $priority))
+     *  * array('eventName' => array(array('methodName1', $priority), array('methodName2'))
+     *
+     * @return array The event names to listen to
+     *
+     * @api
+     */
+    public static function getSubscribedEvents()
+    {
+        return array(
+            "action.createCustomer" => array("create", 128),
+            "action.modifyCustomer" => array("modify", 128)
+        );
+    }
+
 }

core/lib/Thelia/Core/Event/ActionEvent.php

@@ -47,12 +47,6 @@ class ActionEvent extends Event
      */
     protected $action;
     
-    /**
-     *
-     * @var string
-     */
-    protected $controller;
-    
     /**
      * 
      * @param \Symfony\Component\HttpFoundation\Request $request
@@ -80,25 +74,4 @@ class ActionEvent extends Event
     {
         return $this->request;
     }
-    
-    /**
-     * 
-     * @param string $controller
-     */
-    public function setController($controller)
-    {
-        $this->controller = $controller;
-    }
-    
-    public function getController()
-    {
-        return $this->controller;
-    }
-    
-    public function hasController()
-    {
-        return null !== $this->controller;
-    }
-    
-    
 }

core/lib/Thelia/Core/EventListener/RequestListener.php

@@ -25,25 +25,29 @@ namespace Thelia\Core\EventListener;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Thelia\Core\Event\ActionEvent;
+use Thelia\Core\Event\TheliaEvents;
 
 class RequestListener implements EventSubscriberInterface
 {
-   protected $container;
 
-   public function __construct(ContainerInterface $container)
-   {
-       $this->container = $container;
-   }
 
-   public function onKernelRequest(GetResponseEvent $event)
+    public function onKernelRequest(GetResponseEvent $event)
-   {
+    {
-   }
+        $dispatcher = $event->getDispatcher();
+        $request = $event->getRequest();
+        if (false !== $action = $request->get("action")) {
+           //search corresponding action
+            $event = new ActionEvent($request, $action);
+            $dispatcher->dispatch("action.".$action, $event);
+        }
+
+    }
 
    public static function getSubscribedEvents()
    {
-       return array(
+        return array(
-        KernelEvents::REQUEST => array('onKernelRequest', 30)
+            KernelEvents::REQUEST => array('onKernelRequest', 0)
-       );
+        );
    }
 }

core/lib/Thelia/config.xml

@@ -28,21 +28,21 @@
             <argument type="service" id="controller.default"/>
         </service>
 
-        <service id="matcher.action" class="Thelia\Routing\Matcher\ActionMatcher">
+<!--        <service id="matcher.action" class="Thelia\Routing\Matcher\ActionMatcher">
             <call method="setDispatcher">
                 <argument type="service" id="event_dispatcher"/>
             </call>
-        </service>
+        </service>-->
 
         <service id="matcher" class="Thelia\Routing\TheliaMatcherCollection">
             <call method="add">
                 <argument type="service" id="matcher.default"/>
                 <argument>-255</argument>
             </call>
-            <call method="add">
+<!--            <call method="add">
                 <argument type="service" id="matcher.action"/>
                 <argument>-200</argument>
-            </call>
+            </call>-->
         </service>
 
         <service id="listener.router" class="Symfony\Component\HttpKernel\EventListener\RouterListener">
@@ -50,6 +50,17 @@
             <argument type="service" id="matcher"/>
         </service>
 
+        <service id="thelia.request_listener" class="Thelia\Core\EventListener\RequestListener">
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
+        <service id="thelia.action.cart" class="Thelia\Action\Cart">
+            <tag name="kernel.event_subscriber"/>
+        </service>
+        <service id="thelia.action.customer" class="Thelia\Action\Customer">
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
         <service id="controller_resolver" class="Symfony\Component\HttpKernel\Controller\ControllerResolver"/>
 
         <service id="parser" class="Thelia\Core\Template\Parser">