Apply fixtures commit

biurad · May 20, 2020 · d645d9e · d645d9e
1 parent 1ccfc3d
commit d645d9e
Show file tree

Hide file tree

Showing 34 changed files with 540 additions and 500 deletions.
diff --git a/Tests/IniTest.php b/Tests/IniTest.php
@@ -20,8 +20,8 @@
 namespace BiuradPHP\Loader\Tests;
 
 use PHPUnit\Framework\TestCase;
-use BiuradPHP\Loader\Adapters\IniAdapter;
-use BiuradPHP\Loader\ConfigLoader;
+use BiuradPHP\Loader\Files\Adapters\IniAdapter;
+use BiuradPHP\Loader\Files\ConfigLoader;
 
 /**
  * @requires PHP 7.1.30

diff --git a/Tests/JsonTest.php b/Tests/JsonTest.php
@@ -20,8 +20,8 @@
 namespace BiuradPHP\Loader\Tests;
 
 use PHPUnit\Framework\TestCase;
-use BiuradPHP\Loader\Adapters\JsonAdapter;
-use BiuradPHP\Loader\ConfigLoader;
+use BiuradPHP\Loader\Files\Adapters\JsonAdapter;
+use BiuradPHP\Loader\Files\ConfigLoader;
 
 /**
  * @requires PHP 7.1.30

diff --git a/Tests/UniformResourceLocatorTest.php b/Tests/UniformResourceLocatorTest.php
@@ -18,9 +18,9 @@
 namespace BiuradPHP\Loader\Tests;
 
 use PHPUnit\Framework\TestCase;
-use BiuradPHP\Loader\UniformResourceLocator;
-use BiuradPHP\Loader\UniformResourceIterator;
-use BiuradPHP\Loader\RecursiveUniformResourceIterator;
+use BiuradPHP\Loader\Resources\UniformResourceLocator;
+use BiuradPHP\Loader\Resources\UniformResourceIterator;
+use BiuradPHP\Loader\Resources\RecursiveUniformResourceIterator;
 use BiuradPHP\Loader\Interfaces\ResourceLocatorInterface;
 
 /**
@@ -95,7 +95,8 @@ public function testGetPaths($scheme, $expected)
     }
 
 
-    public function getPathsProvider() {
+    public function getPathsProvider()
+    {
         return [
             ['base', ['' => ['base']]],
             ['local', ['' => ['local']]],
@@ -217,7 +218,8 @@ public function testInvoke($uri, $paths)
     }
 
 
-    public function normalizeProvider() {
+    public function normalizeProvider()
+    {
         return [
             ['', ''],
             ['./', ''],
@@ -252,7 +254,9 @@ public function normalizeProvider() {
 
         ];
     }
-    public function findResourcesProvider() {
+
+    public function findResourcesProvider()
+    {
         return [
             ['all://base.txt', ['base/all/base.txt']],
             ['all://base_all.txt', ['override/all/base_all.txt', 'local/all/base_all.txt', 'base/all/base_all.txt']],

diff --git a/Tests/XmlTest.php b/Tests/XmlTest.php
@@ -20,8 +20,8 @@
 namespace BiuradPHP\Loader\Tests;
 
 use PHPUnit\Framework\TestCase;
-use BiuradPHP\Loader\Adapters\XmlAdapter;
-use BiuradPHP\Loader\ConfigLoader;
+use BiuradPHP\Loader\Files\Adapters\XmlAdapter;
+use BiuradPHP\Loader\Files\ConfigLoader;
 
 /**
  * @requires PHP 7.1.30

diff --git a/Tests/YamlTest.php b/Tests/YamlTest.php
@@ -20,8 +20,8 @@
 namespace BiuradPHP\Loader\Tests;
 
 use PHPUnit\Framework\TestCase;
-use BiuradPHP\Loader\Adapters\YamlAdapter;
-use BiuradPHP\Loader\ConfigLoader;
+use BiuradPHP\Loader\Files\Adapters\YamlAdapter;
+use BiuradPHP\Loader\Files\ConfigLoader;
 
 /**
  * @requires PHP 7.1.30

diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
@@ -1,15 +1,9 @@
 <?php
 
 $paths = [
-    '../../../vendor/autoload.php',
-    __DIR__. '/vendor/autoload.php',
-    __DIR__ . '/../vendor/autoload.php',
-    __DIR__. '/../../vendor/autoload.php',
+    dirname(__DIR__, 4) . '/storage/dev-autoload.php',
+    dirname(__DIR__, 3) . '/autoload.php',
+    dirname(__DIR__) . '/vendor/autoload.php',
 ];
 
-
-foreach ($paths as $vendor) {
-    if (file_exists($vendor)) {
-        return require $vendor;
-    }
-}
+return require current(array_filter($paths, 'file_exists'));
diff --git a/src/AliasLoader.php b/src/AliasLoader.php