add some tests for config

.gitignore

@@ -7,4 +7,5 @@ composer.lock
 *.log
 *.pid
 *.patch
+*.cache
 .DS_Store

README.md

@@ -20,7 +20,15 @@ composer require phppkg/config
 
 ## Usage
 
+**Config**
 
+```php
+use PhpPkg\Config\ConfigBox;
+
+$config = ConfigBox::new();
+
+$config->getString('name'); // 'inhere'
+```
 
 ## License
 

phpunit.xml

@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="test/boot.php"
-         colors="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         stopOnFailure="false"
->
-    <testsuites>
-        <testsuite name="Php Library Test Suite">
-            <directory>test/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="test/bootstrap.php" colors="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Php Library Test Suite">
+      <directory>test/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

src/Collection.php

@@ -37,12 +37,18 @@
  */
 class Collection extends \Toolkit\Stdlib\Std\Collection
 {
+
+    /**
+     * @var int
+     */
+    public int $mergeDepth = 3;
+
     /**
-     * Property separator.
+     * The key path separator.
      *
      * @var  string
      */
-    protected string $keyPathSep = '.';
+    public string $keyPathSep = '.';
 
     /**
      * set config value by key/path
@@ -121,6 +127,7 @@ public function setKeyPathSep(string $keyPathSep): void
     public function load(array|Traversable $data): self
     {
         $this->bindData($this->data, $data);
+
         return $this;
     }
 
@@ -132,26 +139,28 @@ public function load(array|Traversable $data): self
     public function loadData(array|Traversable $data): self
     {
         $this->bindData($this->data, $data);
+
         return $this;
     }
 
     /**
      * @param array $parent
      * @param array|Traversable $data
+     * @param int $depth
      */
-    protected function bindData(array &$parent, array|Traversable $data): void
+    protected function bindData(array &$parent, array|Traversable $data, int $depth = 1): void
     {
         foreach ($data as $key => $value) {
             if ($value === null) {
                 continue;
             }
 
-            if (is_array($value)) {
-                if (!isset($parent[$key])) {
-                    $parent[$key] = [];
+            if (is_array($value) && isset($parent[$key]) && is_array($parent[$key])) {
+                if ($depth > $this->mergeDepth) {
+                    $parent[$key] = $value;
+                } else {
+                    $this->bindData($parent[$key], $value, ++$depth);
                 }
-
-                $this->bindData($parent[$key], $value);
             } else {
                 $parent[$key] = $value;
             }
@@ -177,9 +186,7 @@ public function getIterator(): Traversable
     /**
      * Unset an offset in the iterator.
      *
-     * @param mixed $offset The array offset.
-     *
-     * @return  void
+     * @param mixed $offset
      */
     public function offsetUnset($offset): void
     {

src/ConfigBox.php

@@ -38,6 +38,32 @@ public static function newFromFile(string $filepath, string $format = ''): self
         return (new self())->loadFromFile($filepath, $format);
     }
 
+    /**
+     * @param string[] $filePaths
+     * @param string $format
+     *
+     * @return static
+     */
+    public static function newFromFiles(array $filePaths, string $format = ''): self
+    {
+        return (new self())->loadFromFiles($filePaths, $format);
+    }
+
+    /**
+     * @param string[] $filePaths
+     * @param string $format
+     *
+     * @return $this
+     */
+    public function loadFromFiles(array $filePaths, string $format = ''): self
+    {
+        foreach ($filePaths as $filePath) {
+            $this->loadFromFile($filePath, $format);
+        }
+
+        return $this;
+    }
+
     /**
      * @param string $filepath
      * @param string $format

test/ConfigBoxTest.php

@@ -0,0 +1,27 @@
+<?php declare(strict_types=1);
+
+namespace PhpPkg\ConfigTest;
+
+use PhpPkg\Config\ConfigBox;
+use PHPUnit\Framework\TestCase;
+use function vdump;
+
+/**
+ * class ConfigBoxTest
+ *
+ * @author inhere
+ */
+class ConfigBoxTest extends TestCase
+{
+    public function testNewFromFiles(): void
+    {
+        $c = ConfigBox::newFromFiles([
+            __DIR__ . '/testdata/config.ini',
+            __DIR__ . '/testdata/config.neon',
+            __DIR__ . '/testdata/config.yml',
+        ]);
+
+        vdump($c);
+        $this->assertEquals('inher', $c->get('name'));
+    }
+}

test/LanguageTest.php

@@ -23,7 +23,7 @@ public function testTranslate(): void
         $l = new Language([
             'lang'      => 'en',
             'allowed'   => ['en', 'zh-CN'],
-            'basePath'  => __DIR__ . '/testdata',
+            'basePath'  => __DIR__ . '/testdata/language',
             'langFiles' => [
                 'response.php'
             ],
@@ -35,7 +35,6 @@ public function testTranslate(): void
             'k' => 'c',
         ];
 
-
         $msg = $l->tl('response.key');
         $this->assertEquals('message', $msg);
         $this->assertTrue($l->has('response.key'));

test/bootstrap.php

@@ -0,0 +1,29 @@
+<?php declare(strict_types=1);
+/**
+ * phpunit --bootstrap tests/boot.php tests
+ */
+
+error_reporting(E_ALL | E_STRICT);
+date_default_timezone_set('Asia/Shanghai');
+
+$libDir = dirname(__DIR__);
+$npMap  = [
+    'PhpPkg\\ConfigTest\\' => $libDir . '/test/',
+    'PhpPkg\\Config\\'     => $libDir . '/src/',
+];
+
+spl_autoload_register(static function ($class) use ($npMap) {
+    foreach ($npMap as $np => $dir) {
+        $file = $dir . str_replace('\\', '/', substr($class, strlen($np))) . '.php';
+
+        if (file_exists($file)) {
+            include $file;
+        }
+    }
+});
+
+if (is_file(dirname(__DIR__, 3) . '/autoload.php')) {
+    require dirname(__DIR__, 3) . '/autoload.php';
+} elseif (is_file(dirname(__DIR__) . '/vendor/autoload.php')) {
+    require dirname(__DIR__) . '/vendor/autoload.php';
+}

test/testdata/config.ini

@@ -0,0 +1,3 @@
+name=inhere
+age=89
+atIni=value0

test/testdata/config.neon

@@ -0,0 +1,3 @@
+name: inhere
+age: 89
+atNeon: value1

test/testdata/config.yml

@@ -0,0 +1,4 @@
+name: inhere
+age: 89
+atYaml: value2
+