Fallback on churn.yml.dist

src/Configuration/Loader.php

@@ -32,7 +32,8 @@ class Loader
      */
     public static function fromPath(string $confPath, bool $isDefaultValue): Config
     {
-        $confPath = self::normalizePath($originalConfPath = $confPath);
+        $originalConfPath = $confPath;
+        $confPath = self::normalizePath($isDefaultValue ? '.' : $confPath);
 
         if (false !== $confPath && \is_readable($confPath)) {
             $config = new EditableConfig($confPath);
@@ -54,10 +55,19 @@ public static function fromPath(string $confPath, bool $isDefaultValue): Config
      */
     private static function normalizePath(string $confPath)
     {
-        if (\is_dir($confPath)) {
-            $confPath = \rtrim($confPath, '/\\') . '/churn.yml';
+        if (!\is_dir($confPath)) {
+            return \realpath($confPath);
         }
 
+        $confPath = \rtrim($confPath, '/\\') . '/churn.yml';
+        $realConfPath = \realpath($confPath);
+
+        if (false !== $realConfPath) {
+            return $realConfPath;
+        }
+
+        $confPath .= '.dist';
+
         return \realpath($confPath);
     }
 

tests/Unit/Configuration/LoaderTest.php

@@ -5,6 +5,7 @@
 namespace Churn\Tests\Unit\Configuration;
 
 use Churn\Configuration\Config;
+use Churn\Configuration\EditableConfig;
 use Churn\Configuration\Loader;
 use Churn\Tests\BaseTestCase;
 use InvalidArgumentException;
@@ -14,10 +15,17 @@ class LoaderTest extends BaseTestCase
     /** @test */
     public function it_returns_the_default_values_if_there_is_no_default_file()
     {
-        $config = Loader::fromPath('non-existing-config-file.yml', true);
+        $cwd = \getcwd();
+        try {
+            chdir(__DIR__);
+            $config = Loader::fromPath('churn.yml', true);
 
-        $this->assertEquals(new Config(), $config);
-        $this->assertEquals(\getcwd(), $config->getDirPath());
+            $this->assertEquals(new Config(), $config);
+            $this->assertEquals(\getcwd(), $config->getDirPath());
+        } finally {
+            // restore cwd
+            chdir($cwd);
+        }
     }
 
     /** @test */
@@ -33,4 +41,31 @@ public function it_throws_if_the_content_is_invalid()
         $this->expectException(InvalidArgumentException::class);
         Loader::fromPath(__FILE__, false);
     }
+
+    /** @test */
+    public function it_fallbacks_on_the_distributed_file()
+    {
+        $dirPath = \realpath(__DIR__ . '/config/dist');
+        $config = Loader::fromPath($dirPath, false);
+
+        $this->assertEquals(new EditableConfig($dirPath . DIRECTORY_SEPARATOR . 'churn.yml.dist'), $config);
+        $this->assertEquals($dirPath, $config->getDirPath());
+    }
+
+    /** @test */
+    public function it_fallbacks_on_the_default_distributed_file()
+    {
+        $cwd = \getcwd();
+        $dirPath = \realpath(__DIR__ . '/config/dist');
+        try {
+            chdir($dirPath);
+            $config = Loader::fromPath('churn.yml', true);
+
+            $this->assertEquals(new EditableConfig($dirPath . DIRECTORY_SEPARATOR . 'churn.yml.dist'), $config);
+            $this->assertEquals($dirPath, $config->getDirPath());
+        } finally {
+            // restore cwd
+            chdir($cwd);
+        }
+    }
 }