Merge pull request #28 from darkwebdesign/2.7-issue-20

#20: Add Symfony 5.x support

Author: raymondschouten

composer.json

@@ -11,13 +11,13 @@
     "require": {
         "darkwebdesign/doctrine-enhancement-pack": "2.7.*",
         "php": "^7.1",
-        "symfony/config": "^4.0",
-        "symfony/dependency-injection": "^4.0",
-        "symfony/http-kernel": "^4.0"
+        "symfony/config": "^4.0 || ^5.0",
+        "symfony/dependency-injection": "^4.0 || ^5.0",
+        "symfony/http-kernel": "^4.0 || ^5.0"
     },
     "autoload": {
         "psr-4": {
-            "DarkWebDesign\\DoctrineEnhancementBundle\\": ""
+            "DarkWebDesign\\DoctrineEnhancementBundle\\": "src/"
         }
     }
 }

Resources/config/services.yaml renamed to config/services.yaml

@@ -31,4 +31,8 @@
  */
 class DarkWebDesignDoctrineEnhancementBundle extends Bundle
 {
+    public function getPath(): string
+    {
+        return dirname(__DIR__);
+    }
 }

DarkWebDesignDoctrineEnhancementBundle.php renamed to src/DarkWebDesignDoctrineEnhancementBundle.php

@@ -40,7 +40,7 @@ class DarkWebDesignDoctrineEnhancementExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
         $loader->load('services.yaml');
     }
 }