Merge pull request #35 from stefliekens/extra-crud-events

Added a before data hydration event

.gitignore

@@ -10,4 +10,5 @@ nbproject
 .DS_Store
 composer.phar
 composer.lock
-build
+build
+.php_cs.cache

composer.json

@@ -33,8 +33,8 @@
         "symfony/console":                   "2.*"
     },
     "require-dev": {
-        "phpspec/phpspec":                   "2.0.*@dev",
-        "fabpot/PHP-CS-Fixer":               "*",
+        "phpspec/phpspec":                   "~2.0.1",
+        "fabpot/PHP-CS-Fixer":               "~1.5.0",
 
         "doctrine/doctrine-orm-module":      "0.8.*",
         "doctrine/doctrine-mongo-odm-module":"0.8.*",

spec/Phpro/SmartCrud/Controller/CrudControllerSpec.php

@@ -193,8 +193,9 @@ public function it_should_handle_a_valid_post_to_an_update_action($request, $mvc
         $action = 'update';
         $smartResult->isSuccessFull()->shouldBeCalled()->willReturn(true);
         $smartService->run(Argument::any(), Argument::exact($postParameters))->shouldBeCalled()->willReturn($smartResult);
-        $pluginManager->get(Argument::exact('params'), null)->shouldBeCalled()->willReturn($params);
-        $params->fromRoute(Argument::exact('id'), null)->shouldBeCalled()->willReturn(1);
+        $params->__invoke()->willReturn($params);
+        $params->fromRoute('id', null)->willReturn(1);
+        $pluginManager->get('params', Argument::cetera())->willReturn($params);
         $pluginManager->get(Argument::exact('redirect'), null)->shouldBeCalled()->willReturn($redirectPlugin);
         $redirectPlugin->toRoute(Argument::exact(null), Argument::exact(array('action' => 'update', 'id' => '1')), true)->shouldBeCalled();
         $redirectPlugin->toRoute(Argument::exact(null), array('action' => 'update', 'id' => '1'), true)->willReturn('mockRedirect');
@@ -233,8 +234,9 @@ public function it_should_handle_valid_post_to_a_delete_action($request, $mvcEve
         $action = 'delete';
         $smartResult->isSuccessFull()->shouldBeCalled()->willReturn(true);
         $smartService->run(Argument::any(), Argument::exact($postParameters))->shouldBeCalled()->willReturn($smartResult);
-        $params->fromRoute(Argument::exact('id'), null)->shouldBeCalled()->willReturn(1);
         $pluginManager->get(Argument::exact('params'), null)->shouldBeCalled()->willReturn($params);
+        $params->__invoke()->willReturn($params);
+        $params->fromRoute(Argument::exact('id'), null)->shouldBeCalled()->willReturn(1);
         $pluginManager->get(Argument::exact('redirect'), null)->shouldBeCalled()->willReturn($redirectPlugin);
         $redirectPlugin->toRoute(Argument::exact(null), Argument::exact(array('action' => 'list')), true)
                        ->shouldBeCalled()

spec/Phpro/SmartCrud/Service/CreateServiceSpec.php

@@ -53,7 +53,8 @@ public function it_should_handle_no_data($gateway, $eventManager, $form, $result
         $this->setForm($form);
 
         $this->run(null, null)->shouldReturnAnInstanceOf('Phpro\SmartCrud\Service\SmartServiceResult');
-        ;
+
+        $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_DATA_HYDRATION))->shouldNotBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_DATA_VALIDATION))->shouldNotBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::INVALID_CREATE))->shouldNotBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_CREATE))->shouldNotBeCalled();
@@ -85,6 +86,7 @@ public function it_should_handle_invalid_data($gateway, $eventManager, $form, $r
 
         $this->run(null, $this->getMockPostData())->shouldReturnAnInstanceOf('Phpro\SmartCrud\Service\SmartServiceResult');
         ;
+        $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_DATA_HYDRATION))->shouldBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_DATA_VALIDATION))->shouldBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::INVALID_CREATE))->shouldBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_CREATE))->shouldNotBeCalled();
@@ -122,6 +124,7 @@ public function it_should_handle_valid_data($gateway, $eventManager, $form, $res
 
         $this->run(null, $this->getMockPostData())->shouldReturn($result);
         ;
+        $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_DATA_HYDRATION))->shouldBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_DATA_VALIDATION))->shouldBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::INVALID_CREATE))->shouldNotBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_CREATE))->shouldBeCalled();

spec/Phpro/SmartCrud/Service/UpdateServiceSpec.php

@@ -55,6 +55,7 @@ public function it_should_handle_no_data($gateway, $eventManager, $form, $result
 
         $this->run($entity->id, null)->shouldReturnAnInstanceOf('Phpro\SmartCrud\Service\SmartServiceResult');
         ;
+        $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_DATA_HYDRATION))->shouldNotBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_DATA_VALIDATION))->shouldNotBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::INVALID_UPDATE))->shouldNotBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_UPDATE))->shouldNotBeCalled();
@@ -92,7 +93,8 @@ public function it_should_handle_invalid_data($gateway, $eventManager, $form, $r
         $this->setForm($form);
 
         $this->run($entity->id, $this->getMockPostData())->shouldReturn($result);
-        ;
+
+        $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_DATA_HYDRATION))->shouldBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_DATA_VALIDATION))->shouldBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::INVALID_UPDATE))->shouldBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_UPDATE))->shouldNotBeCalled();
@@ -131,6 +133,7 @@ public function it_should_handle_valid_data($gateway, $eventManager, $form, $res
 
         $this->run($entity->id, $this->getMockPostData())->shouldReturn($result);
 
+        $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_DATA_HYDRATION))->shouldBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_DATA_VALIDATION))->shouldBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::INVALID_UPDATE))->shouldNotBeCalled();
         $eventManager->trigger(Argument::which('getName', CrudEvent::BEFORE_UPDATE))->shouldBeCalled();

src/Phpro/SmartCrud/Controller/AbstractCrudControllerFactory.php

@@ -23,8 +23,7 @@
  *
  * @package Phpro\SmartCrud\Controller
  */
-class AbstractCrudControllerFactory
-    implements AbstractFactoryInterface, ServiceLocatorAwareInterface
+class AbstractCrudControllerFactory implements AbstractFactoryInterface, ServiceLocatorAwareInterface
 {
     const FACTORY_NAMESPACE = 'phpro-smartcrud-controller';
     const CONFIG_DEFAULT = 'default';

src/Phpro/SmartCrud/Controller/CrudController.php

@@ -17,8 +17,7 @@
 /**
  * Class CrudController
  */
-class CrudController extends AbstractActionController
-    implements CrudControllerInterface
+class CrudController extends AbstractActionController implements CrudControllerInterface
 {
     /**
      * @var SmartServiceInterface

src/Phpro/SmartCrud/Event/CrudEvent.php

@@ -20,6 +20,7 @@ class CrudEvent extends Event
 {
     const BEFORE_LIST = 'before-list';
     const AFTER_LIST = 'after-list';
+    const BEFORE_DATA_HYDRATION = 'before-data-hydration';
     const BEFORE_DATA_VALIDATION = 'before-data-validation';
     const BEFORE_CREATE = 'before-create';
     const AFTER_CREATE = 'after-create';

src/Phpro/SmartCrud/Gateway/AbstractGatewayFactory.php

@@ -7,8 +7,7 @@
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
-class AbstractGatewayFactory
-    implements AbstractFactoryInterface
+class AbstractGatewayFactory implements AbstractFactoryInterface
 {
     const FACTORY_NAMESPACE = 'phpro-smartcrud-gateway';
 

src/Phpro/SmartCrud/Gateway/DoctrineCrudGateway.php

@@ -21,8 +21,7 @@
  *
  * @package Phpro\SmartCrud\Gateway
  */
-class DoctrineCrudGateway
-    implements ObjectManagerAwareInterface, CrudGatewayInterface
+class DoctrineCrudGateway implements ObjectManagerAwareInterface, CrudGatewayInterface
 {
     const TYPE_ORM = 'ORM';
     const TYPE_ODM = 'ODM';

src/Phpro/SmartCrud/Listener/BjyAuthorize.php

@@ -19,8 +19,7 @@
  *
  * @package Phpro\SmartCrud\Listener
  */
-class BjyAuthorize extends AbstractListenerAggregate
-    implements FactoryInterface
+class BjyAuthorize extends AbstractListenerAggregate implements FactoryInterface
 {
     /**
      * Set the priority of the listeners

src/Phpro/SmartCrud/Listener/FlashMessenger.php

@@ -13,8 +13,7 @@
  *
  * @package Phpro\SmartCrud
  */
-class FlashMessenger extends AbstractListenerAggregate
-    implements FactoryInterface
+class FlashMessenger extends AbstractListenerAggregate implements FactoryInterface
 {
     /**
      * Set the priority of the listeners

src/Phpro/SmartCrud/Service/AbstractSmartService.php

@@ -18,8 +18,7 @@
  *
  * @package Phpro\SmartCrud\Service
  */
-abstract class AbstractSmartService
-    implements SmartServiceInterface
+abstract class AbstractSmartService implements SmartServiceInterface
 {
     /**
      * @var ParametersService

src/Phpro/SmartCrud/Service/AbstractSmartServiceFactory.php

@@ -13,8 +13,7 @@
  *
  * @package Phpro\SmartCrud\Service
  */
-class AbstractSmartServiceFactory
-    implements AbstractFactoryInterface, ServiceLocatorAwareInterface
+class AbstractSmartServiceFactory implements AbstractFactoryInterface, ServiceLocatorAwareInterface
 {
     /**
      * The config key in the service manager

src/Phpro/SmartCrud/Service/CreateService.php

@@ -33,6 +33,7 @@ public function run($id = null, $data = null)
         if ($data === null) {
             $result->setSuccess(true);
         } else {
+            $em->trigger($this->createEvent(CrudEvent::BEFORE_DATA_HYDRATION, $entity, $data));
             $form->setData($data);
             $em->trigger($this->createEvent(CrudEvent::BEFORE_DATA_VALIDATION, $form, array('postData' => $data)));
             if ($form->isValid()) {

src/Phpro/SmartCrud/Service/ListService.php

@@ -20,10 +20,7 @@
  *
  * @package Phpro\SmartCrud\Service
  */
-class ListService extends AbstractSmartService
-    implements
-    PaginatorFactoryAwareInterface,
-    QueryProviderAwareInterface
+class ListService extends AbstractSmartService implements PaginatorFactoryAwareInterface, QueryProviderAwareInterface
 {
     /**
      * @var PaginatorServiceFactory

src/Phpro/SmartCrud/Service/UpdateService.php

@@ -33,6 +33,7 @@ public function run($id = null, $data = null)
         if ($data === null) {
             $result->setSuccess(true);
         } else {
+            $em->trigger($this->createEvent(CrudEvent::BEFORE_DATA_HYDRATION, $entity, $data));
             $form->setData($data);
             $em->trigger($this->createEvent(CrudEvent::BEFORE_DATA_VALIDATION, $form, array('postData' => $data)));
             if ($form->isValid()) {