Fix namespace

Command/LoadDataFixturesDoctrineCommand.php

@@ -12,7 +12,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Doctrine\Bundle\DoctrineFixturesBundle\Command;
+namespace Doctrine\Bundle\FixturesBundle\Command;
 
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
@@ -21,7 +21,7 @@
 use Symfony\Component\Console\Output\Output;
 use Symfony\Component\Finder\Finder;
 use Doctrine\Bundle\FrameworkBundle\Util\Filesystem;
-use Doctrine\Bundle\DoctrineFixturesBundle\Common\DataFixtures\Loader as DataFixturesLoader;
+use Doctrine\Bundle\FixturesBundle\Common\DataFixtures\Loader as DataFixturesLoader;
 use Doctrine\Bundle\DoctrineBundle\Command\DoctrineCommand;
 use Doctrine\Common\DataFixtures\Executor\ORMExecutor;
 use Doctrine\Common\DataFixtures\Purger\ORMPurger;

Common/DataFixtures/Loader.php

@@ -12,7 +12,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Doctrine\Bundle\DoctrineFixturesBundle\Common\DataFixtures;
+namespace Doctrine\Bundle\FixturesBundle\Common\DataFixtures;
 
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\DataFixtures\Loader as BaseLoader;

DoctrineFixturesBundle.php

@@ -12,7 +12,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Doctrine\Bundle\DoctrineFixturesBundle;
+namespace Doctrine\Bundle\FixturesBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 

README.markdown

@@ -6,3 +6,12 @@ into Symfony so that you can load data fixtures programmatically into the Doctri
 
 Documentation on how to install and use this bundle is available in the
 Symfony2 [documentation](http://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html).
+
+WARNING: Namespace changed
+==========================
+
+This bundle was previously under the `Symfony\Bundle` namespace and is now moved to the
+`Doctrine\Bundle` namespace.
+
+See the Resources/docs/index.rst for more information about the required changes in `deps`,
+`AppKernel.php` and `autoload.php` to accomodate for this change.

Resources/doc/index.rst

@@ -41,6 +41,7 @@ Register the ``Doctrine\Common\DataFixtures`` namespace in ``app/autoload.php``.
     // ...
     $loader->registerNamespaces(array(
         // ...
+        'Doctrine\\Bundle' => __DIR__.'/../vendor/bundles',
         'Doctrine\\Common\\DataFixtures' => __DIR__.'/../vendor/doctrine-fixtures/lib',
         'Doctrine\\Common' => __DIR__.'/../vendor/doctrine-common/lib',
         // ...
@@ -63,7 +64,7 @@ Finally, register the Bundle ``DoctrineFixturesBundle`` in ``app/AppKernel.php``
     {
         $bundles = array(
             // ...
-            new Doctrine\Bundle\DoctrineFixturesBundle\DoctrineFixturesBundle(),
+            new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
             // ...
         );
         // ...

Tests/Common/ContainerAwareFixture.php

@@ -12,7 +12,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Doctrine\Bundle\DoctrineFixturesBundle\Tests\Common;
+namespace Doctrine\Bundle\FixturesBundle\Tests\Common;
 
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;

Tests/Common/DataFixtures/LoaderTest.php

@@ -12,11 +12,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Doctrine\Bundle\DoctrineFixturesBundle\Tests\Common\DataFixtures;
+namespace Doctrine\Bundle\FixturesBundle\Tests\Common\DataFixtures;
 
-use Doctrine\Bundle\DoctrineFixturesBundle\Tests\TestCase;
-use Doctrine\Bundle\DoctrineFixturesBundle\Tests\Common\ContainerAwareFixture;
-use Doctrine\Bundle\DoctrineFixturesBundle\Common\DataFixtures\Loader;
+use Doctrine\Bundle\FixturesBundle\Tests\TestCase;
+use Doctrine\Bundle\FixturesBundle\Tests\Common\ContainerAwareFixture;
+use Doctrine\Bundle\FixturesBundle\Common\DataFixtures\Loader;
 
 class LoaderTest extends TestCase
 {

Tests/TestCase.php

@@ -12,7 +12,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Doctrine\Bundle\DoctrineFixturesBundle\Tests;
+namespace Doctrine\Bundle\FixturesBundle\Tests;
 
 class TestCase extends \PHPUnit_Framework_TestCase
 {