- changed method signature for fromObject to fromObject(Configuration|string $object)

- fixed Config::$root fallback assignment

Author: kodeart

Config.php

@@ -20,6 +20,7 @@
 use function file_get_contents;
 use function getcwd;
 use function getenv;
+use function is_a;
 use function is_string;
 use function iterator_to_array;
 use function join;
@@ -80,7 +81,7 @@ public function __construct(
         Data $defaults = null)
     {
         parent::__construct($defaults?->toArray() ?? []);
-        $this->root ??= getcwd();
+        $this->root = $root ?: getcwd();
     }
 
     /**
@@ -112,12 +113,12 @@ public function withParameters(array $parameters): Configuration
         return $this->import($parameters);
     }
 
-    public function fromObject(object|string $object): Configuration
+    public function fromObject(Configuration|string $object): Configuration
     {
-        if (is_string($object) && class_exists($object)) {
+        if (is_string($object) && class_exists($object) && is_a($object, Configuration::class, true)) {
             $object = new $object;
         }
-        $this->root ??= $object->root;
+        $this->root = $object->root;
         return $this->import(iterator_to_array($object));
     }
 

Interfaces.php

@@ -318,11 +318,12 @@ public function fromIniFile(string $filename): Configuration;
     /**
      * Loads the configuration options from other Config instance.
      *
-     * @param object|string $object A FQN of the configuration object, or an instance of it
+     * @param Configuration|string $object A FQN of the configuration object,
+     *                                     or an instance of it
      *
      * @return Configuration
      */
-    public function fromObject(object|string $object): Configuration;
+    public function fromObject(Configuration|string $object): Configuration;
 
     /**
      * Yell if something bad has happened, or pass quietly.

tests/ConfigTest.php

@@ -11,7 +11,7 @@ class ConfigTest extends TestCase
 {
     public function test_should_load_defaults_from_other_instance()
     {
-        $config = new Config('', new MockOtherConfigInstance);
+        $config = new Config('', new TestOtherConfInstanceClass);
         $this->assertSame([1, 2, 3], $config->list);
     }
 
@@ -52,7 +52,7 @@ public function test_should_load_options_from_object_instance()
         $config = new Config;
         $this->assertNull($config->foo);
 
-        $config->fromObject(new MockOtherConfigInstance);
+        $config->fromObject(new TestOtherConfInstanceClass);
         $this->assertSame('bar', $config->foo);
     }
 
@@ -61,7 +61,7 @@ public function test_should_load_options_from_object_fqn()
         $config = new Config;
         $this->assertNull($config->foo);
 
-        $config->fromObject(MockOtherConfigInstance::class);
+        $config->fromObject(TestOtherConfInstanceClass::class);
         $this->assertSame('bar', $config->foo);
     }
 
@@ -241,17 +241,41 @@ public function test_ini_sections_parsing()
         $this->assertSame(include_once __DIR__ . '/fixtures/config-sections.php', $config->toArray());
     }
 
+    public function test_should_set_root_on_empty_constructor_argument()
+    {
+        $config = new Config;
+        $this->assertNotEmpty($config->root);
+    }
+
+    public function test_shoud_set_root_from_empty_object_root()
+    {
+        $initial = new TestRootFromThisClass;
+        $config = new Config(__DIR__);
+        $config->fromObject($initial);
+
+        $this->assertSame($config->root, $initial->root);
+        $this->assertSame('/tmp', $config->root);
+    }
+
     protected function tearDown(): void
     {
         env('', null, []);
     }
 }
 
-class MockOtherConfigInstance extends Config
+class TestOtherConfInstanceClass extends Config
 {
     public function __construct()
     {
         parent::__construct();
         $this->fromPhpFile(__DIR__ . '/fixtures/nested-array.php');
     }
 }
+
+class TestRootFromThisClass extends Config
+{
+    public function __construct()
+    {
+        parent::__construct('/tmp');
+    }
+}