Moved Bundle namespace in favor of self named package

Yann Eugoné · Yann Eugoné · commit b7c7751625dc · 2015-10-01T09:13:53.000+02:00
diff --git a/DependencyInjection/CompilerPass/CollectEnumCompilerPass.php b/DependencyInjection/CompilerPass/CollectEnumCompilerPass.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Octo\EnumBundle\DependencyInjection\CompilerPass;
+namespace EnumBundle\DependencyInjection\CompilerPass;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/DependencyInjection/EnumExtension.php b/DependencyInjection/EnumExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Octo\EnumBundle\DependencyInjection;
+namespace EnumBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/Enum/AbstractTranslatedEnum.php b/Enum/AbstractTranslatedEnum.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Octo\EnumBundle\Enum;
+namespace EnumBundle\Enum;
 
-use Octo\EnumBundle\Exception\InvalidTranslatePatternException;
+use EnumBundle\Exception\InvalidTranslatePatternException;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
diff --git a/Enum/EnumInterface.php b/Enum/EnumInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Octo\EnumBundle\Enum;
+namespace EnumBundle\Enum;
 
 /**
  * @author Yann Eugoné <yann.eugone@gmail.com>
diff --git a/EnumBundle.php b/EnumBundle.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Octo\EnumBundle;
+namespace EnumBundle;
 
-use Octo\EnumBundle\DependencyInjection\CompilerPass\CollectEnumCompilerPass;
+use EnumBundle\DependencyInjection\CompilerPass\CollectEnumCompilerPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
  * @author Yann Eugoné <yann.eugone@gmail.com>
  */
-class OctoEnumBundle extends Bundle
+class EnumBundle extends Bundle
 {
     /**
      * {@inheritdoc}
diff --git a/Exception/DuplicatedEnumException.php b/Exception/DuplicatedEnumException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Octo\EnumBundle\Exception;
+namespace EnumBundle\Exception;
 
 /**
  * @author Yann Eugoné <yann.eugone@gmail.com>
diff --git a/Exception/InvalidEnumException.php b/Exception/InvalidEnumException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Octo\EnumBundle\Exception;
+namespace EnumBundle\Exception;
 
 /**
  * @author Yann Eugoné <yann.eugone@gmail.com>
diff --git a/Exception/InvalidTranslatePatternException.php b/Exception/InvalidTranslatePatternException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Octo\EnumBundle\Exception;
+namespace EnumBundle\Exception;
 
 /**
  * @author Yann Eugoné <yann.eugone@gmail.com>
diff --git a/Form/Type/EnumType.php b/Form/Type/EnumType.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Octo\EnumBundle\Form\Type;
+namespace EnumBundle\Form\Type;
 
-use Octo\EnumBundle\Registry\EnumRegistryInterface;
+use EnumBundle\Registry\EnumRegistryInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
diff --git a/Registry/EnumRegistry.php b/Registry/EnumRegistry.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Octo\EnumBundle\Registry;
+namespace EnumBundle\Registry;
 
-use Octo\EnumBundle\Enum\EnumInterface;
-use Octo\EnumBundle\Exception\DuplicatedEnumException;
-use Octo\EnumBundle\Exception\InvalidEnumException;
+use EnumBundle\Enum\EnumInterface;
+use EnumBundle\Exception\DuplicatedEnumException;
+use EnumBundle\Exception\InvalidEnumException;
 
 /**
  * @author Yann Eugoné <yann.eugone@gmail.com>
diff --git a/Registry/EnumRegistryInterface.php b/Registry/EnumRegistryInterface.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Octo\EnumBundle\Registry;
+namespace EnumBundle\Registry;
 
-use Octo\EnumBundle\Enum\EnumInterface;
-use Octo\EnumBundle\Exception\DuplicatedEnumException;
-use Octo\EnumBundle\Exception\InvalidEnumException;
+use EnumBundle\Enum\EnumInterface;
+use EnumBundle\Exception\DuplicatedEnumException;
+use EnumBundle\Exception\InvalidEnumException;
 
 /**
  * @author Yann Eugoné <yann.eugone@gmail.com>
diff --git a/Resources/config/form_types.xml b/Resources/config/form_types.xml
@@ -6,7 +6,7 @@
 
     <services>
 
-        <service id="form_type.enum" class="Octo\EnumBundle\Form\Type\EnumType">
+        <service id="form_type.enum" class="EnumBundle\Form\Type\EnumType">
             <argument type="service" id="enum.registry"/>
 
             <tag name="form.type" alias="enum" />
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -6,9 +6,9 @@
 
     <services>
 
-        <service id="enum.registry" class="Octo\EnumBundle\Registry\EnumRegistry"/>
+        <service id="enum.registry" class="EnumBundle\Registry\EnumRegistry"/>
 
-        <service id="enum.abstract_translated" class="Octo\EnumBundle\Enum\AbstractTranslatedEnum" abstract="true">
+        <service id="enum.abstract_translated" class="EnumBundle\Enum\AbstractTranslatedEnum" abstract="true">
             <argument type="service" id="translator"/>
         </service>
 
diff --git a/Resources/config/validators.xml b/Resources/config/validators.xml
@@ -6,7 +6,7 @@
 
     <services>
 
-        <service id="validator.enum" class="Octo\EnumBundle\Validator\Constraints\EnumValidator">
+        <service id="validator.enum" class="EnumBundle\Validator\Constraints\EnumValidator">
             <argument type="service" id="enum.registry"/>
 
             <tag name="validator.constraint_validator" alias="enum"/>
diff --git a/Tests/DependencyInjection/CompilerPass/CollectEnumCompilerPassTest.php b/Tests/DependencyInjection/CompilerPass/CollectEnumCompilerPassTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Octo\EnumBundle\Tests\DependencyInjection\CompilerPass;
+namespace EnumBundle\Tests\DependencyInjection\CompilerPass;
 
-use Octo\EnumBundle\DependencyInjection\CompilerPass\CollectEnumCompilerPass;
+use EnumBundle\DependencyInjection\CompilerPass\CollectEnumCompilerPass;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
diff --git a/Tests/Enum/AbstractTranslatedEnumTest.php b/Tests/Enum/AbstractTranslatedEnumTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Octo\Tests\Enum;
+namespace Tests\Enum;
 
-use Octo\EnumBundle\Tests\StateEnum;
+use EnumBundle\Tests\StateEnum;
 
 /**
  * @author Yann Eugoné <yann.eugone@gmail.com>
@@ -11,7 +11,7 @@ class AbstractTranslatedEnumTest extends \PHPUnit_Framework_TestCase
 {
     public function testConstructedWithInvalidPattern()
     {
-        $this->setExpectedException('Octo\EnumBundle\Exception\InvalidTranslatePatternException');
+        $this->setExpectedException('EnumBundle\Exception\InvalidTranslatePatternException');
         $translator = $this->prophesize('Symfony\Component\Translation\TranslatorInterface');
         new StateEnum($translator->reveal(), 'invalid.pattern');
     }
diff --git a/Tests/Form/TestExtension.php b/Tests/Form/TestExtension.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Octo\EnumBundle\Tests\Form;
+namespace EnumBundle\Tests\Form;
 
-use Octo\EnumBundle\Form\Type\EnumType;
-use Octo\EnumBundle\Registry\EnumRegistryInterface;
+use EnumBundle\Form\Type\EnumType;
+use EnumBundle\Registry\EnumRegistryInterface;
 use Symfony\Component\Form\AbstractExtension;
 use Symfony\Component\Form\Exception;
 
diff --git a/Tests/Form/Type/EnumTypeTest.php b/Tests/Form/Type/EnumTypeTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Octo\EnumBundle\Tests\Form\Type;
+namespace EnumBundle\Tests\Form\Type;
 
-use Octo\EnumBundle\Tests\Form\TestExtension;
-use Octo\EnumBundle\Tests\GenderEnum;
+use EnumBundle\Tests\Form\TestExtension;
+use EnumBundle\Tests\GenderEnum;
 use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
@@ -15,7 +15,7 @@ class EnumTypeTest extends TypeTestCase
 
     protected function setUp()
     {
-        $this->enumRegistry = $this->prophesize('Octo\EnumBundle\Registry\EnumRegistryInterface');
+        $this->enumRegistry = $this->prophesize('EnumBundle\Registry\EnumRegistryInterface');
         $this->enumRegistry->has('state')->willReturn(false);
         $this->enumRegistry->has('gender')->willReturn(true);
         $this->enumRegistry->get('gender')->willReturn(new GenderEnum);
diff --git a/Tests/GenderEnum.php b/Tests/GenderEnum.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Octo\EnumBundle\Tests;
+namespace EnumBundle\Tests;
 
-use Octo\EnumBundle\Enum\EnumInterface;
+use EnumBundle\Enum\EnumInterface;
 
 /**
  * @author Yann Eugoné <yann.eugone@gmail.com>
diff --git a/Tests/Registry/EnumRegistryTest.php b/Tests/Registry/EnumRegistryTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Octo\EnumBundle\Tests\Registry;
+namespace EnumBundle\Tests\Registry;
 
-use Octo\EnumBundle\Registry\EnumRegistry;
-use Octo\EnumBundle\Tests\GenderEnum;
-use Octo\EnumBundle\Tests\StateEnum;
+use EnumBundle\Registry\EnumRegistry;
+use EnumBundle\Tests\GenderEnum;
+use EnumBundle\Tests\StateEnum;
 
 /**
  * @author Yann Eugoné <yann.eugone@gmail.com>
@@ -28,14 +28,14 @@ protected function tearDown()
 
     public function testAddDuplicatedException()
     {
-        $this->setExpectedException('Octo\EnumBundle\Exception\DuplicatedEnumException');
+        $this->setExpectedException('EnumBundle\Exception\DuplicatedEnumException');
         $this->registry->add(new GenderEnum);
         $this->registry->add(new GenderEnum);
     }
 
     public function testGetInvalidException()
     {
-        $this->setExpectedException('Octo\EnumBundle\Exception\InvalidEnumException');
+        $this->setExpectedException('EnumBundle\Exception\InvalidEnumException');
         $this->registry->add(new GenderEnum);
         $this->registry->get('type');
     }
diff --git a/Tests/StateEnum.php b/Tests/StateEnum.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Octo\EnumBundle\Tests;
+namespace EnumBundle\Tests;
 
-use Octo\EnumBundle\Enum\AbstractTranslatedEnum;
+use EnumBundle\Enum\AbstractTranslatedEnum;
 
 /**
  * @author Yann Eugoné <yann.eugone@gmail.com>
diff --git a/Tests/TypeEnum.php b/Tests/TypeEnum.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Octo\EnumBundle\Tests;
+namespace EnumBundle\Tests;
 
-use Octo\EnumBundle\Enum\EnumInterface;
+use EnumBundle\Enum\EnumInterface;
 
 /**
  * @author Yann Eugoné <yann.eugone@gmail.com>
diff --git a/Tests/Validator/Constraints/EnumValidatorTest.php b/Tests/Validator/Constraints/EnumValidatorTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Octo\EnumBundle\Tests\Validator\Constraints;
+namespace EnumBundle\Tests\Validator\Constraints;
 
-use Octo\EnumBundle\Tests\TypeEnum;
-use Octo\EnumBundle\Validator\Constraints\Enum;
-use Octo\EnumBundle\Validator\Constraints\EnumValidator;
+use EnumBundle\Tests\TypeEnum;
+use EnumBundle\Validator\Constraints\Enum;
+use EnumBundle\Validator\Constraints\EnumValidator;
 use Symfony\Component\Validator\Constraints\Choice;
 use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;
 
@@ -16,7 +16,7 @@ class EnumValidatorTest extends AbstractConstraintValidatorTest
 
     protected function createValidator()
     {
-        $registry = $this->prophesize('Octo\EnumBundle\Registry\EnumRegistryInterface');
+        $registry = $this->prophesize('EnumBundle\Registry\EnumRegistryInterface');
         $registry->has('state')->willReturn(false);
         $registry->has('type')->willReturn(true);
         $registry->get('type')->willReturn(new TypeEnum);
diff --git a/Validator/Constraints/Enum.php b/Validator/Constraints/Enum.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Octo\EnumBundle\Validator\Constraints;
+namespace EnumBundle\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraints\Choice;
 
diff --git a/Validator/Constraints/EnumValidator.php b/Validator/Constraints/EnumValidator.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Octo\EnumBundle\Validator\Constraints;
+namespace EnumBundle\Validator\Constraints;
 
-use Octo\EnumBundle\Registry\EnumRegistryInterface;
+use EnumBundle\Registry\EnumRegistryInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints\ChoiceValidator;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "octo/enum-bundle",
+    "name": "yeugone/enum-bundle",
     "description": "Bring simple enumeration implementation to Symfony2",
     "license": "Apache2",
     "authors": [
@@ -18,8 +18,7 @@
         "phpunit/phpunit": "~4.6"
     },
     "autoload": {
-        "psr-0": { "Octo\\EnumBundle": "" }
+        "psr-4": { "EnumBundle\\": "" }
     },
-    "minimum-stability": "stable",
-    "target-dir": "Octo/EnumBundle"
+    "minimum-stability": "stable"
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -13,7 +13,7 @@
         >
 
     <testsuites>
-        <testsuite name="OctoEnumBundle Test Suite">
+        <testsuite name="EnumBundle Test Suite">
             <directory>./Tests</directory>
         </testsuite>
     </testsuites>

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 <?php
 -namespace Octo\EnumBundle\Enum;
 +namespace EnumBundle\Enum;
 /**
  * @author Yann Eugoné <[email protected]>