Merge 9f6f1af into c6f580d

dschoenbauer · Sep 12, 2017 · 6f4c15d · 6f4c15d
2 parents c6f580d + 9f6f1af
commit 6f4c15d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/Config/Config.php b/src/Config/Config.php
@@ -74,6 +74,6 @@ public function setArrayDot(ArrayDotNotation $arrayDot)
 
     public function filterPath($path)
     {
-        return str_replace('/', DIRECTORY_SEPARATOR, trim($path, '/\\') . DIRECTORY_SEPARATOR);
+        return str_replace(['/','\\'], DIRECTORY_SEPARATOR, trim($path, '\\/') . DIRECTORY_SEPARATOR);
     }
 }
diff --git a/tests/Config/ConfigTest.php b/tests/Config/ConfigTest.php
@@ -41,6 +41,7 @@ public function testArrayDotNotation()
      */
     public function testFitlerPath($path, $result)
     {
+        chdir(dirname(__FILE__) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . self::PATH);
         $this->assertEquals($result, $this->object->filterPath($path));
     }
 
@@ -50,7 +51,7 @@ public function filterPathDataProvider()
             'trailing-win' => ['test\\', 'test' . DIRECTORY_SEPARATOR],
             'trailing-lin' => ['test/', 'test' . DIRECTORY_SEPARATOR],
             'trailing-none' => ['test', 'test' . DIRECTORY_SEPARATOR],
-            'mid-win' => ['test\\one', 'test' . DIRECTORY_SEPARATOR . 'one' . DIRECTORY_SEPARATOR],
+            'mid-win' => ["test\one", 'test' . DIRECTORY_SEPARATOR . 'one' . DIRECTORY_SEPARATOR],
             'mid-lin' => ['test/one', 'test' . DIRECTORY_SEPARATOR . 'one' . DIRECTORY_SEPARATOR],
         ];
     }
@@ -120,10 +121,10 @@ public function testImportData($files, $result)
     public function importDataDataProvider()
     {
         return [
-            'single file' => [['TestA\local.json'], ['local' => true]],
-            'multiple file' => [['TestB\local.json', 'TestB\remote.json',], ['local' => true, 'remote' => true]],
-            'competing files' => [['TestC\a\local.json', 'TestC\b\local.json',], ['local' => false]], //First file is true, second is false and wins with the value
-            'complicated data schema' => [['TestD\local.json', 'TestD\remote.json',],
+            'single file' => [['TestA' . DIRECTORY_SEPARATOR . 'local.json'], ['local' => true]],
+            'multiple file' => [['TestB' . DIRECTORY_SEPARATOR . 'local.json', 'TestB' . DIRECTORY_SEPARATOR . 'remote.json',], ['local' => true, 'remote' => true]],
+            'competing files' => [['TestC' . DIRECTORY_SEPARATOR . 'a' . DIRECTORY_SEPARATOR . 'local.json', 'TestC' . DIRECTORY_SEPARATOR . 'b' . DIRECTORY_SEPARATOR . 'local.json',], ['local' => false]], //First file is true, second is false and wins with the value
+            'complicated data schema' => [['TestD' . DIRECTORY_SEPARATOR . 'local.json', 'TestD' . DIRECTORY_SEPARATOR . 'remote.json',],
                 [
                     'local' => true,
                     'database' => [