support Symfony 2.4

Author: reecefowell

Controller/BaseController.php

@@ -58,7 +58,7 @@ class BaseController extends ContainerAware
 
     /**
      *
-     * @var \Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher $dispatcher
+     * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
      */
     protected $dispatcher;
 

Form/Handler/Admin/UpdateAccountFormHandler.php

@@ -13,7 +13,7 @@
 
 namespace CCDNUser\AdminBundle\Form\Handler\Admin;
 
-use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormFactory;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -52,12 +52,12 @@ class UpdateAccountFormHandler extends BaseFormHandler
     /**
      *
      * @access public
-     * @param \Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher $dispatcher
+     * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
      * @param \Symfony\Component\Form\FormFactory                              $factory
      * @param \CCDNUser\AdminBundle\Form\Type\UpdateAccountFormType            $updateAccountFormType
      * @param \CCDNUser\AdminBundle\Model\FrontModel\ModelInterface            $userModel
      */
-    public function __construct(ContainerAwareEventDispatcher $dispatcher, FormFactory $factory, $updateAccountFormType, ModelInterface $userModel)
+    public function __construct(EventDispatcherInterface $dispatcher, FormFactory $factory, $updateAccountFormType, ModelInterface $userModel)
     {
         $this->dispatcher = $dispatcher;
         $this->factory = $factory;

Form/Handler/Admin/UpdateRolesFormHandler.php

@@ -13,7 +13,7 @@
 
 namespace CCDNUser\AdminBundle\Form\Handler\Admin;
 
-use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormFactory;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -59,12 +59,12 @@ class UpdateRolesFormHandler extends BaseFormHandler
     /**
      *
      * @access public
-     * @param \Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher $dispatcher
+     * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
      * @param \Symfony\Component\Form\FormFactory                              $factory
      * @param \CCDNUser\AdminBundle\Form\Type\UpdateRolesFormType              $updateRolesFormType
      * @param \CCDNUser\AdminBundle\Model\FrontModel\ModelInterface            $userModel
      */
-    public function __construct(ContainerAwareEventDispatcher $dispatcher, FormFactory $factory, $updateRolesFormType, ModelInterface $userModel)
+    public function __construct(EventDispatcherInterface $dispatcher, FormFactory $factory, $updateRolesFormType, ModelInterface $userModel)
     {
         $this->dispatcher = $dispatcher;
         $this->factory = $factory;

Form/Handler/BaseFormHandler.php

@@ -46,7 +46,7 @@ class BaseFormHandler
     /**
      *
      * @access protected
-     * @var \Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher  $dispatcher
+     * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface  $dispatcher
      */
     protected $dispatcher;
 

Model/FrontModel/BaseModel.php

@@ -13,7 +13,7 @@
 
 namespace CCDNUser\AdminBundle\Model\FrontModel;
 
-use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use CCDNUser\AdminBundle\Model\Component\Manager\ManagerInterface;
 use CCDNUser\AdminBundle\Model\Component\Repository\RepositoryInterface;
 
@@ -48,18 +48,18 @@ abstract class BaseModel
     /**
      *
      * @access protected
-     * @var \Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher $dispatcher
+     * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
      */
     protected $dispatcher;
 
     /**
      *
      * @access public
-     * @param \Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher     $dispatcher
+     * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface     $dispatcher
      * @param \CCDNUser\AdminBundle\Model\Component\Repository\RepositoryInterface $repository
      * @param \CCDNUser\AdminBundle\Model\Component\Manager\ManagerInterface       $manager
      */
-    public function __construct(ContainerAwareEventDispatcher $dispatcher, RepositoryInterface $repository, ManagerInterface $manager)
+    public function __construct(EventDispatcherInterface $dispatcher, RepositoryInterface $repository, ManagerInterface $manager)
     {
         $this->dispatcher = $dispatcher;
 

Model/FrontModel/ModelInterface.php

@@ -13,7 +13,7 @@
 
 namespace CCDNUser\AdminBundle\Model\FrontModel;
 
-use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use CCDNUser\AdminBundle\Model\Component\Manager\ManagerInterface;
 use CCDNUser\AdminBundle\Model\Component\Repository\RepositoryInterface;
 
@@ -34,11 +34,11 @@ interface ModelInterface
     /**
      *
      * @access public
-     * @param \Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher     $dispatcher
+     * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface     $dispatcher
      * @param \CCDNUser\AdminBundle\Model\Component\Repository\RepositoryInterface $repository
      * @param \CCDNUser\AdminBundle\Model\Component\Manager\ManagerInterface       $manager
      */
-    public function __construct(ContainerAwareEventDispatcher $dispatcher, RepositoryInterface $repository, ManagerInterface $manager);
+    public function __construct(EventDispatcherInterface $dispatcher, RepositoryInterface $repository, ManagerInterface $manager);
 
     /**
      *

composer.json

@@ -21,10 +21,10 @@
         "knplabs/knp-paginator-bundle": "2.3.*"
     },
     "require-dev": {
-        "symfony/swiftmailer-bundle": "2.3.*",
-        "symfony/monolog-bundle": "2.3.*",
+        "symfony/swiftmailer-bundle": "~2.3",
+        "symfony/monolog-bundle": "~2.4",
         "doctrine/doctrine-fixtures-bundle": "dev-master",
-        "behat/behat": "2.4.*@stable",
+        "behat/behat": "2.5.*@stable",
         "behat/mink": "v1.5.0",
         "behat/mink-goutte-driver": "*",
         "behat/mink-browserkit-driver": "*",