Merge pull request #12 from yokai-php/2.x

2.x

Author: yann-eugone

.gitignore

@@ -1,4 +1,4 @@
 /phpunit.xml
-*~
 composer.lock
 /vendor/
+/build/

.travis.yml

@@ -1,26 +1,17 @@
 language: php
 
 php:
-  - 5.5
   - 5.6
   - 7.0
-  - hhvm
-
-matrix:
-  fast_finish: true
-  include:
-    - php: 5.6
-      env: SYMFONY_VERSION=2.7.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.8.*
-    - php: 5.6
-      env: SYMFONY_VERSION="3.0.*"
-    - php: 5.6
-      env: SYMFONY_VERSION="3.1.*"
-    - php: 5.6
-      env: SYMFONY_VERSION="3.2.*@dev"
-  allow_failures:
-    - env: SYMFONY_VERSION=3.2.*@dev
+  - 7.1
+
+env:
+  - SYMFONY_VERSION="2.7.*"
+  - SYMFONY_VERSION="2.8.*"
+  - SYMFONY_VERSION="3.0.*"
+  - SYMFONY_VERSION="3.1.*"
+  - SYMFONY_VERSION="3.2"
+  - SYMFONY_VERSION="3.3.x-dev as 3.3"
 
 sudo: false
 
@@ -42,4 +33,4 @@ after_script:
   - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
 
 notifications:
-  email: yann.[email protected]
+  email: eugone.yann@gmail.com

DependencyInjection/CompilerPass/ConventionedEnumCollectorCompilerPass.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace EnumBundle\DependencyInjection\CompilerPass;
+namespace Yokai\EnumBundle\DependencyInjection\CompilerPass;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
- * @author Yann Eugoné <yann.[email protected]>
+ * @author Yann Eugoné <eugone.yann@gmail.com>
  */
 class ConventionedEnumCollectorCompilerPass implements CompilerPassInterface
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(ContainerBuilder $container)
     {

DependencyInjection/CompilerPass/DeclarativeEnumCollectorCompilerPass.php

@@ -1,19 +1,22 @@
 <?php
 
-namespace EnumBundle\DependencyInjection\CompilerPass;
+namespace Yokai\EnumBundle\DependencyInjection\CompilerPass;
 
-use EnumBundle\Enum\AbstractTranslatedEnum;
-use EnumBundle\Enum\EnumInterface;
+use ReflectionClass;
+use RuntimeException;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\SplFileInfo;
+use Yokai\EnumBundle\Enum\AbstractTranslatedEnum;
+use Yokai\EnumBundle\Enum\EnumInterface;
 
 /**
- * @author Yann Eugoné <yann.[email protected]>
+ * @author Yann Eugoné <eugone.yann@gmail.com>
  */
 class DeclarativeEnumCollectorCompilerPass implements CompilerPassInterface
 {
@@ -43,7 +46,7 @@ class DeclarativeEnumCollectorCompilerPass implements CompilerPassInterface
      */
     public function __construct($bundle, $transDomain = null)
     {
-        $reflection = new \ReflectionClass($bundle);
+        $reflection = new ReflectionClass($bundle);
         $this->bundleDir = dirname($reflection->getFileName());
         $this->bundleNamespace = $reflection->getNamespaceName();
         $this->bundleName = $reflection->getShortName();
@@ -52,12 +55,12 @@ public function __construct($bundle, $transDomain = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(ContainerBuilder $container)
     {
         if (!class_exists('Symfony\Component\Finder\Finder')) {
-            throw new \RuntimeException('You need the symfony/finder component to register enums.');
+            throw new RuntimeException('You need the symfony/finder component to register enums.');
         }
 
         $enumDir = $this->bundleDir . '/Enum';
@@ -77,18 +80,28 @@ public function process(ContainerBuilder $container)
             }
 
             $enumClass = $enumNamespace . '\\' . $file->getBasename('.php');
-            $enumReflection = new \ReflectionClass($enumClass);
+            $enumReflection = new ReflectionClass($enumClass);
 
             if (!$enumReflection->isSubclassOf(EnumInterface::class) || $enumReflection->isAbstract()) {
                 continue; //Not an enum or abstract enum
             }
 
             $definition = null;
-            $requiredParameters = $enumReflection->getConstructor() ? $enumReflection->getConstructor()->getNumberOfRequiredParameters() : 0;
+            $requiredParameters = 0;
+            if ($enumReflection->getConstructor()) {
+                $requiredParameters = $enumReflection->getConstructor()->getNumberOfRequiredParameters();
+            }
+
             if ($requiredParameters === 0) {
                 $definition = new Definition($enumClass);
             } elseif ($requiredParameters === 2 && $enumReflection->isSubclassOf(AbstractTranslatedEnum::class)) {
-                $definition = new DefinitionDecorator('enum.abstract_translated');
+                if (class_exists('Symfony\Component\DependencyInjection\ChildDefinition')) {
+                    // ChildDefinition was introduced as Symfony 3.3
+                    $definition = new ChildDefinition('enum.abstract_translated');
+                } else {
+                    // DefinitionDecorator was deprecated as Symfony 3.3
+                    $definition = new DefinitionDecorator('enum.abstract_translated');
+                }
                 $definition->setClass($enumClass);
                 $definition->addArgument(
                     $this->getTransPattern($enumClass)

DependencyInjection/CompilerPass/TaggedEnumCollectorCompilerPass.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace EnumBundle\DependencyInjection\CompilerPass;
+namespace Yokai\EnumBundle\DependencyInjection\CompilerPass;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * @author Yann Eugoné <yann.[email protected]>
+ * @author Yann Eugoné <eugone.yann@gmail.com>
  */
 class TaggedEnumCollectorCompilerPass implements CompilerPassInterface
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(ContainerBuilder $container)
     {

DependencyInjection/Configuration.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace EnumBundle\DependencyInjection;
+namespace Yokai\EnumBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * @author Yann Eugoné <[email protected]>
+ * @author Yann Eugoné <[email protected]>
  */
 class Configuration implements ConfigurationInterface
 {
     /**
-     * @inheritDoc
+     * @inheritdoc
      */
     public function getConfigTreeBuilder()
     {

DependencyInjection/EnumExtension.php

@@ -1,19 +1,19 @@
 <?php
 
-namespace EnumBundle\DependencyInjection;
+namespace Yokai\EnumBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
- * @author Yann Eugoné <yann.[email protected]>
+ * @author Yann Eugoné <eugone.yann@gmail.com>
  */
 class EnumExtension extends Extension
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function load(array $configs, ContainerBuilder $container)
     {

Enum/AbstractTranslatedEnum.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace EnumBundle\Enum;
+namespace Yokai\EnumBundle\Enum;
 
-use EnumBundle\Exception\InvalidTranslatePatternException;
 use Symfony\Component\Translation\TranslatorInterface;
+use Yokai\EnumBundle\Exception\InvalidTranslatePatternException;
 
 /**
- * @author Yann Eugoné <yann.[email protected]>
+ * @author Yann Eugoné <eugone.yann@gmail.com>
  */
 abstract class AbstractTranslatedEnum implements EnumInterface
 {

Enum/EnumInterface.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace EnumBundle\Enum;
+namespace Yokai\EnumBundle\Enum;
 
 /**
- * @author Yann Eugoné <yann.[email protected]>
+ * @author Yann Eugoné <eugone.yann@gmail.com>
  */
 interface EnumInterface
 {

Exception/DuplicatedEnumException.php

@@ -1,11 +1,13 @@
 <?php
 
-namespace EnumBundle\Exception;
+namespace Yokai\EnumBundle\Exception;
+
+use BadMethodCallException;
 
 /**
- * @author Yann Eugoné <yann.[email protected]>
+ * @author Yann Eugoné <eugone.yann@gmail.com>
  */
-class DuplicatedEnumException extends \BadMethodCallException
+class DuplicatedEnumException extends BadMethodCallException
 {
     /**
      * @param string $name