Merge pull request #2 from paillechat/feature/support-symfony-5

Add support for symfony 5 and dbal 2.10

Author: Pavel Batanov

.travis.yml

@@ -19,6 +19,8 @@ matrix:
     env: PACKAGES='symfony/symfony=4.0.*'
   - php: 7.1
     env: PACKAGES='symfony/symfony=4.1.*'
+  - php: 7.3
+    env: PACKAGES='symfony/symfony=5.* doctrine/dbal=2.10'
 
 before_install:
   - travis_retry composer self-update

composer.json

@@ -13,14 +13,14 @@
   "require": {
     "php": "^7.1",
     "paillechat/php-enum": "^1.2 || ^2.1",
-    "symfony/http-kernel": "^3.4 || ^4.0",
-    "symfony/dependency-injection": "^3.4 || ^4.0",
-    "symfony/config": "^3.4 || ^4.0",
+    "symfony/http-kernel": "^3.4 || ^4.0 || ^5.0",
+    "symfony/dependency-injection": "^3.4 || ^4.0 || ^5.0",
+    "symfony/config": "^3.4 || ^4.0 || ^5.0",
     "doctrine/dbal": "^2.4"
   },
   "require-dev": {
     "phpunit/phpunit": "^7.0",
-    "symfony/yaml": "^3.4 || ^4.0"
+    "symfony/yaml": "^3.4 || ^4.0 || ^5.0"
   },
   "autoload": {
     "psr-4": {

src/DependencyInjection/Configuration.php

@@ -11,9 +11,14 @@ final class Configuration implements ConfigurationInterface
     /** {@inheritdoc} */
     public function getConfigTreeBuilder(): TreeBuilder
     {
-        $builder = new TreeBuilder();
-
-        $root = $builder->root('lamoda_enum');
+        $name = 'lamoda_enum';
+        if (method_exists(TreeBuilder::class, 'root')) {
+            $builder = new TreeBuilder();
+            $root = $builder->root($name);
+        } else {
+            $builder = new TreeBuilder($name);
+            $root = $builder->getRootNode();
+        }
 
         $root->children()->booleanNode('enum_name_type_mapping')
             ->defaultValue(false);

tests/Unit/DBAL/EnumTypeInitializerTest.php

@@ -4,6 +4,7 @@
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\TypeRegistry;
 use Lamoda\EnumBundle\DBAL\EnumType;
 use Lamoda\EnumBundle\DBAL\EnumTypeInitializer;
 use Lamoda\EnumBundle\Naming\IdenticalNamingStrategy;
@@ -23,9 +24,16 @@ protected function setUp(): void
     {
         $typeReflectionClass = new \ReflectionClass(Type::class);
 
-        $typesMapProperty = $typeReflectionClass->getProperty('_typesMap');
-        $typesMapProperty->setAccessible(true);
-        $typesMapProperty->setValue([]);
+        if ($typeReflectionClass->hasProperty('_typesMap')) {
+            $typesMapProperty = $typeReflectionClass->getProperty('_typesMap');
+            $typesMapProperty->setAccessible(true);
+            $typesMapProperty->setValue([]);
+        } else {
+            $registry = new TypeRegistry();
+            $typesMapProperty = $typeReflectionClass->getProperty('typeRegistry');
+            $typesMapProperty->setAccessible(true);
+            $typesMapProperty->setValue($registry);
+        }
     }
 
     public function testInitializerLoadsType(): void