adjust to feedback

dbu · dbu · commit 8cd4cbda1aca · 2013-05-27T13:55:24.000+02:00
diff --git a/CouchDocument/UserListener.php b/CouchDocument/UserListener.php
diff --git a/Doctrine/AbstractUserListener.php b/Doctrine/AbstractUserListener.php
@@ -26,7 +26,7 @@
  * @author Christophe Coevoet <stof@notk.org>
  * @author David Buchmann <mail@davidbu.ch>
  */
-abstract class UserListener implements EventSubscriber
+abstract class AbstractUserListener implements EventSubscriber
 {
     /**
      * @var \FOS\UserBundle\Model\UserManagerInterface
diff --git a/Doctrine/CouchDB/UserListener.php b/Doctrine/CouchDB/UserListener.php
@@ -1,13 +1,22 @@
 <?php
 
+/*
+ * This file is part of the FOSUserBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace FOS\UserBundle\Doctrine\CouchDB;
 
 use Doctrine\ODM\CouchDB\Event;
 use Doctrine\ODM\CouchDB\Event\LifecycleEventArgs;
 use FOS\UserBundle\Model\UserInterface;
-use FOS\UserBundle\Doctrine\UserListener;
+use FOS\UserBundle\Doctrine\AbstractUserListener;
 
-class CouchDBUserListener extends UserListener
+class UserListener extends AbstractUserListener
 {
     public function getSubscribedEvents()
     {
diff --git a/Doctrine/MongoDB/UserListener.php b/Doctrine/MongoDB/UserListener.php
@@ -15,7 +15,7 @@
 use Doctrine\ODM\MongoDB\Events;
 use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs;
 use Doctrine\ODM\MongoDB\Event\PreUpdateEventArgs;
-use FOS\UserBundle\Doctrine\UserListener;
+use FOS\UserBundle\Doctrine\AbstractUserListener;
 use FOS\UserBundle\Model\UserInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -24,7 +24,7 @@
  *
  * @author Christophe Coevoet <stof@notk.org>
  */
-class MongoDBUserListener extends UserListener
+class UserListener extends AbstractUserListener
 {
     public function getSubscribedEvents()
     {
diff --git a/Doctrine/Orm/UserListener.php b/Doctrine/Orm/UserListener.php
@@ -15,15 +15,15 @@
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 use FOS\UserBundle\Model\UserInterface;
-use FOS\UserBundle\Doctrine\UserListener;
+use FOS\UserBundle\Doctrine\AbstractUserListener;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Doctrine ORM listener updating the canonical fields and the password.
  *
  * @author Christophe Coevoet <stof@notk.org>
  */
-class OrmUserListener extends UserListener
+class UserListener extends AbstractUserListener
 {
     public function getSubscribedEvents()
     {
diff --git a/Document/UserListener.php b/Document/UserListener.php
diff --git a/Entity/UserListener.php b/Entity/UserListener.php
diff --git a/Resources/config/couchdb.xml b/Resources/config/couchdb.xml
@@ -21,7 +21,7 @@
             <argument>%fos_user.model_manager_name%</argument>
         </service>
 
-        <service id="fos_user.user_listener" class="FOS\UserBundle\Doctrine\CouchDB\CouchDBUserListener" public="false">
+        <service id="fos_user.user_listener" class="FOS\UserBundle\Doctrine\CouchDB\UserListener" public="false">
             <argument type="service" id="service_container" />
         </service>
     </services>
diff --git a/Resources/config/mongodb.xml b/Resources/config/mongodb.xml
@@ -17,7 +17,7 @@
             <argument>%fos_user.model_manager_name%</argument>
         </service>
 
-        <service id="fos_user.user_listener" class="FOS\UserBundle\Doctrine\MongoDB\MongoDBUserListener" public="false">
+        <service id="fos_user.user_listener" class="FOS\UserBundle\Doctrine\MongoDB\UserListener" public="false">
             <argument type="service" id="service_container" />
         </service>
     </services>
diff --git a/Resources/config/orm.xml b/Resources/config/orm.xml
@@ -17,7 +17,7 @@
             <argument>%fos_user.model_manager_name%</argument>
         </service>
 
-        <service id="fos_user.user_listener" class="FOS\UserBundle\Doctrine\Orm\OrmUserListener" public="false">
+        <service id="fos_user.user_listener" class="FOS\UserBundle\Doctrine\Orm\UserListener" public="false">
             <argument type="service" id="service_container" />
         </service>
     </services>

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`* @author Christophe Coevoet <[email protected]>`
`27`	`27`	`* @author David Buchmann <[email protected]>`
`28`	`28`	`*/`
`29`		`-abstract class UserListener implements EventSubscriber`
	`29`	`+abstract class AbstractUserListener implements EventSubscriber`
`30`	`30`	`{`
`31`	`31`	`/**`
`32`	`32`	`* @var \FOS\UserBundle\Model\UserManagerInterface`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`use Doctrine\ODM\MongoDB\Events;`
`16`	`16`	`use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs;`
`17`	`17`	`use Doctrine\ODM\MongoDB\Event\PreUpdateEventArgs;`
`18`		`-use FOS\UserBundle\Doctrine\UserListener;`
	`18`	`+use FOS\UserBundle\Doctrine\AbstractUserListener;`
`19`	`19`	`use FOS\UserBundle\Model\UserInterface;`
`20`	`20`	`use Symfony\Component\DependencyInjection\ContainerInterface;`
`21`	`21`
`@@ -24,7 +24,7 @@`
`24`	`24`	`*`
`25`	`25`	`* @author Christophe Coevoet <[email protected]>`
`26`	`26`	`*/`
`27`		`-class MongoDBUserListener extends UserListener`
	`27`	`+class UserListener extends AbstractUserListener`
`28`	`28`	`{`
`29`	`29`	`public function getSubscribedEvents()`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,15 +15,15 @@`
`15`	`15`	`use Doctrine\ORM\Event\LifecycleEventArgs;`
`16`	`16`	`use Doctrine\ORM\Event\PreUpdateEventArgs;`
`17`	`17`	`use FOS\UserBundle\Model\UserInterface;`
`18`		`-use FOS\UserBundle\Doctrine\UserListener;`
	`18`	`+use FOS\UserBundle\Doctrine\AbstractUserListener;`
`19`	`19`	`use Symfony\Component\DependencyInjection\ContainerInterface;`
`20`	`20`
`21`	`21`	`/**`
`22`	`22`	`* Doctrine ORM listener updating the canonical fields and the password.`
`23`	`23`	`*`
`24`	`24`	`* @author Christophe Coevoet <[email protected]>`
`25`	`25`	`*/`
`26`		`-class OrmUserListener extends UserListener`
	`26`	`+class UserListener extends AbstractUserListener`
`27`	`27`	`{`
`28`	`28`	`public function getSubscribedEvents()`
`29`	`29`	`{`