Updated to follow the new bundle syntax and remove the Bundle namespace

This commit change the namespace from Bundle\FOS\UserBundle to FOS\UserBundle as the Bundle part is now useless (and would mean naming the bundle BundleFOSUserBundle). It will require you to change your submodules and to register the FOS namespace in the autoloader. It also fixes the FOSUserBundle class to use the new BundleInterface.
KnpLabs · Jan 20, 2011 · 2d38f54 · 2d38f54
1 parent 282c2f7
commit 2d38f54
Show file tree

Hide file tree

Showing 69 changed files with 179 additions and 159 deletions.
diff --git a/Command/ActivateUserCommand.php b/Command/ActivateUserCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Command;
+namespace FOS\UserBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\Command as BaseCommand;
 use Symfony\Component\Console\Input\InputArgument;
@@ -9,7 +9,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\Output;
 use Symfony\Component\Security\Authentication\Token\UsernamePasswordToken;
-use Bundle\FOS\UserBundle\Model\User;
+use FOS\UserBundle\Model\User;
 
 /*
  * This file is part of the FOS\UserBundle

diff --git a/Command/ChangePasswordCommand.php b/Command/ChangePasswordCommand.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Command;
+namespace FOS\UserBundle\Command;
 
-use Bundle\FOS\UserBundle\Model\User;
+use FOS\UserBundle\Model\User;
 use Symfony\Component\Security\Authentication\Token\UsernamePasswordToken;
 use Symfony\Bundle\FrameworkBundle\Command\Command as BaseCommand;
 use Symfony\Component\Console\Input\InputArgument;

diff --git a/Command/CreateUserCommand.php b/Command/CreateUserCommand.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Command;
+namespace FOS\UserBundle\Command;
 
 use Symfony\Component\Security\Acl\Permission\MaskBuilder;
 
 use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
 
 use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
 
-use Bundle\FOS\UserBundle\Model\User;
+use FOS\UserBundle\Model\User;
 use Symfony\Component\Security\Authentication\Token\UsernamePasswordToken;
 use Symfony\Bundle\FrameworkBundle\Command\Command as BaseCommand;
 use Symfony\Component\Console\Input\InputArgument;

diff --git a/Command/DeactivateUserCommand.php b/Command/DeactivateUserCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Command;
+namespace FOS\UserBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\Command as BaseCommand;
 use Symfony\Component\Console\Input\InputArgument;
@@ -9,7 +9,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\Output;
 use Symfony\Component\Security\Authentication\Token\UsernamePasswordToken;
-use Bundle\FOS\UserBundle\Model\User;
+use FOS\UserBundle\Model\User;
 
 /*
  * This file is part of the FOS\UserBundle

diff --git a/Command/DemoteSuperAdminCommand.php b/Command/DemoteSuperAdminCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Command;
+namespace FOS\UserBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\Command as BaseCommand;
 use Symfony\Component\Console\Input\InputArgument;
@@ -9,7 +9,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\Output;
 use Symfony\Component\Security\Authentication\Token\UsernamePasswordToken;
-use Bundle\FOS\UserBundle\Model\User;
+use FOS\UserBundle\Model\User;
 
 /*
  * This file is part of the FOS\UserBundle

diff --git a/Command/InstallAcesCommand.php b/Command/InstallAcesCommand.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Command;
+namespace FOS\UserBundle\Command;
 
 use Symfony\Component\Security\Acl\Exception\AclAlreadyExistsException;
 use Symfony\Component\Security\Acl\Permission\MaskBuilder;
-use Bundle\FOS\UserBundle\Model\User;
+use FOS\UserBundle\Model\User;
 use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
 use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
 use Symfony\Bundle\FrameworkBundle\Command\Command as BaseCommand;

diff --git a/Command/PromoteSuperAdminCommand.php b/Command/PromoteSuperAdminCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Command;
+namespace FOS\UserBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\Command as BaseCommand;
 use Symfony\Component\Console\Input\InputArgument;
@@ -9,7 +9,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\Output;
 use Symfony\Component\Security\Authentication\Token\UsernamePasswordToken;
-use Bundle\FOS\UserBundle\Model\User;
+use FOS\UserBundle\Model\User;
 
 /*
  * This file is part of the FOS\UserBundle

diff --git a/Controller/GroupController.php b/Controller/GroupController.php
@@ -8,11 +8,11 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Bundle\FOS\UserBundle\Controller;
+namespace FOS\UserBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller as Controller;
-use Bundle\FOS\UserBundle\Model\Group;
-use Bundle\FOS\UserBundle\Form\ChangePassword;
+use FOS\UserBundle\Model\Group;
+use FOS\UserBundle\Form\ChangePassword;
 
 /**
  * RESTful controller managing group CRUD
@@ -145,7 +145,7 @@ protected function findGroupBy($key, $value)
      * Create a GroupForm instance and returns it
      *
      * @param Group $object
-     * @return Bundle\FOS\UserBundle\Form\GroupForm
+     * @return FOS\UserBundle\Form\GroupForm
      */
     protected function createForm($object = null)
     {

diff --git a/Controller/SecurityController.php b/Controller/SecurityController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Controller;
+namespace FOS\UserBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Security\SecurityContext;

diff --git a/Controller/UserController.php b/Controller/UserController.php
@@ -7,15 +7,15 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Bundle\FOS\UserBundle\Controller;
+namespace FOS\UserBundle\Controller;
 
 use Symfony\Component\Security\Acl\Permission\MaskBuilder;
 use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
 use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Bundle\FOS\UserBundle\Model\User;
-use Bundle\FOS\UserBundle\Form\ChangePassword;
-use Bundle\FOS\UserBundle\Form\ResetPassword;
+use FOS\UserBundle\Model\User;
+use FOS\UserBundle\Form\ChangePassword;
+use FOS\UserBundle\Form\ResetPassword;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Security\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Exception\AccessDeniedException;
@@ -377,7 +377,7 @@ protected function authenticateUser(User $user, $reAuthenticate = false)
      * Create a UserForm instance and returns it
      *
      * @param User $object
-     * @return Bundle\FOS\UserBundle\Form\UserForm
+     * @return FOS\UserBundle\Form\UserForm
      */
     protected function createForm($object = null)
     {

diff --git a/DependencyInjection/UserExtension.php b/DependencyInjection/UserExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\DependencyInjection;
+namespace FOS\UserBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\Reference;
 

diff --git a/Document/Group.php b/Document/Group.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Document;
+namespace FOS\UserBundle\Document;
 
-use Bundle\FOS\UserBundle\Model\Group as BaseGroup;
+use FOS\UserBundle\Model\Group as BaseGroup;
 
 class Group extends BaseGroup
 {

diff --git a/Document/GroupManager.php b/Document/GroupManager.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Document;
+namespace FOS\UserBundle\Document;
 
-use Bundle\FOS\UserBundle\Model\GroupInterface;
+use FOS\UserBundle\Model\GroupInterface;
 use Doctrine\ODM\MongoDB\DocumentManager;
-use Bundle\FOS\UserBundle\Model\GroupManager as BaseGroupManager;
+use FOS\UserBundle\Model\GroupManager as BaseGroupManager;
 
 class GroupManager extends BaseGroupManager
 {

diff --git a/Document/User.php b/Document/User.php
@@ -8,9 +8,9 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Bundle\FOS\UserBundle\Document;
+namespace FOS\UserBundle\Document;
 
-use Bundle\FOS\UserBundle\Model\User as AbstractUser;
+use FOS\UserBundle\Model\User as AbstractUser;
 
 abstract class User extends AbstractUser
 {

diff --git a/Document/UserManager.php b/Document/UserManager.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Document;
+namespace FOS\UserBundle\Document;
 
-use Bundle\FOS\UserBundle\Util\CanonicalizerInterface;
-use Bundle\FOS\UserBundle\Model\UserInterface;
+use FOS\UserBundle\Util\CanonicalizerInterface;
+use FOS\UserBundle\Model\UserInterface;
 use Doctrine\ODM\MongoDB\DocumentManager;
-use Bundle\FOS\UserBundle\Model\UserManager as BaseUserManager;
+use FOS\UserBundle\Model\UserManager as BaseUserManager;
 use Doctrine\ODM\MongoDB\Proxy\Proxy;
 use Symfony\Component\Validator\Constraint;
 

diff --git a/Entity/Group.php b/Entity/Group.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Entity;
+namespace FOS\UserBundle\Entity;
 
-use Bundle\FOS\UserBundle\Model\Group as BaseGroup;
+use FOS\UserBundle\Model\Group as BaseGroup;
 
 class Group extends BaseGroup
 {

diff --git a/Entity/GroupManager.php b/Entity/GroupManager.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Entity;
+namespace FOS\UserBundle\Entity;
 
-use Bundle\FOS\UserBundle\Model\GroupInterface;
+use FOS\UserBundle\Model\GroupInterface;
 use Doctrine\ORM\EntityManager;
-use Bundle\FOS\UserBundle\Model\GroupManager as BaseGroupManager;
+use FOS\UserBundle\Model\GroupManager as BaseGroupManager;
 
 class GroupManager extends BaseGroupManager
 {

diff --git a/Entity/User.php b/Entity/User.php
@@ -8,9 +8,9 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Bundle\FOS\UserBundle\Entity;
+namespace FOS\UserBundle\Entity;
 
-use Bundle\FOS\UserBundle\Model\User as AbstractUser;
+use FOS\UserBundle\Model\User as AbstractUser;
 
 abstract class User extends AbstractUser
 {

diff --git a/Entity/UserManager.php b/Entity/UserManager.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Entity;
+namespace FOS\UserBundle\Entity;
 
-use Bundle\FOS\UserBundle\Util\CanonicalizerInterface;
-use Bundle\FOS\UserBundle\Model\UserInterface;
+use FOS\UserBundle\Util\CanonicalizerInterface;
+use FOS\UserBundle\Model\UserInterface;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Constraint;
-use Bundle\FOS\UserBundle\Model\UserManager as BaseUserManager;
+use FOS\UserBundle\Model\UserManager as BaseUserManager;
 
 class UserManager extends BaseUserManager
 {

diff --git a/FOSUserBundle.php b/FOSUserBundle.php
@@ -8,15 +8,25 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Bundle\FOS\UserBundle;
+namespace FOS\UserBundle;
 
-use Symfony\Component\HttpKernel\Bundle\Bundle as BaseBundle;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class FOSUserBundle extends BaseBundle
+class FOSUserBundle extends Bundle
 {
     public function boot()
     {
         $class = $this->container->get('fos_user.user_manager')->getClass();
         call_user_func(array($class, 'setCanonicalizer'), $this->container->get('fos_user.util.canonicalizer'));
     }
+
+    public function getNamespace()
+    {
+        return __NAMESPACE__;
+    }
+
+    public function getPath()
+    {
+        return strtr(__DIR__, '\\', '/');
+    }
 }
diff --git a/Form/ChangePassword.php b/Form/ChangePassword.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Form;
-use Bundle\FOS\UserBundle\Model\User;
+namespace FOS\UserBundle\Form;
+use FOS\UserBundle\Model\User;
 
 class ChangePassword extends ResetPassword
 {

diff --git a/Form/ChangePasswordForm.php b/Form/ChangePasswordForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Form;
+namespace FOS\UserBundle\Form;
 
 use Symfony\Component\Form\RepeatedField;
 use Symfony\Component\Form\PasswordField;

diff --git a/Form/GroupForm.php b/Form/GroupForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Form;
+namespace FOS\UserBundle\Form;
 
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\TextField;

diff --git a/Form/ResetPassword.php b/Form/ResetPassword.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Form;
-use Bundle\FOS\UserBundle\Model\User;
+namespace FOS\UserBundle\Form;
+use FOS\UserBundle\Model\User;
 
 class ResetPassword
 {

diff --git a/Form/ResetPasswordForm.php b/Form/ResetPasswordForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Form;
+namespace FOS\UserBundle\Form;
 
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\RepeatedField;

diff --git a/Form/UserForm.php b/Form/UserForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Form;
+namespace FOS\UserBundle\Form;
 
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\TextField;

diff --git a/Model/Group.php b/Model/Group.php
@@ -7,7 +7,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Bundle\FOS\UserBundle\Model;
+namespace FOS\UserBundle\Model;
 
 abstract class Group implements GroupInterface
 {

diff --git a/Model/GroupInterface.php b/Model/GroupInterface.php
@@ -8,7 +8,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Bundle\FOS\UserBundle\Model;
+namespace FOS\UserBundle\Model;
 
 interface GroupInterface
 {

diff --git a/Model/GroupManager.php b/Model/GroupManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Bundle\FOS\UserBundle\Model;
+namespace FOS\UserBundle\Model;
 
 /**
  * Abstract Group Manager implementation which can be used as base class for your