Merge pull request #1134 from mischabraam/fix/resolve-dist-file

fix: Resolve dist file path from import

Author: veewee

src/Configuration/ContainerBuilder.php

@@ -28,7 +28,11 @@ public static function buildFromConfiguration(string $path): SymfonyContainerBui
 
         // Load basic service file + custom user configuration
         $configDir = dirname(__DIR__, 2).$filesystem->ensureValidSlashes('/resources/config');
-        $loader = LoaderFactory::createLoader($container, [$configDir]);
+        $configFileDir = dirname($path);
+        $loader = LoaderFactory::createLoader(
+            $container,
+            [$configDir, $configFileDir]
+        );
         $loader->load('config.yml');
         $loader->load('console.yml');
         $loader->load('fixer.yml');

test/E2E/ConfigurationTest.php

@@ -37,4 +37,28 @@ function it_should_be_able_to_resolve_env_variable_in_configuration()
             $process->getOutput(),
         );
     }
+
+    /** @test */
+    function it_should_be_able_to_resolve_dist_file_imports()
+    {
+        $this->initializeGitInRootDir();
+        $this->initializeComposer($this->rootDir);
+
+        // grumphp.yml file.
+        $grumphpFile = $this->initializeGrumphpConfig(path: $this->rootDir, customConfig: [
+            'imports' => [
+                ['resource' => 'grumphp.yml.dist']
+            ],
+        ]);
+        // grumphp.yml.dist file which is imported, doesn't matter what's in this imported file.
+        $grumphpDistFile = $this->initializeGrumphpConfig(path: $this->rootDir, fileName: 'grumphp.yml.dist');
+
+        $this->installComposer($this->rootDir);
+        $this->ensureHooksExist($this->rootDir);
+
+        $this->enableValidatePathsTask($grumphpFile, $this->rootDir);
+
+        $this->commitAll($this->rootDir);
+        $this->runGrumphp($this->rootDir);
+    }
 }