Fixes tests and fixes base configuration loading

laravel-zero · Apr 24, 2024 · 95fd727 · 95fd727
1 parent a17c1e2
commit 95fd727
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 30 deletions.
diff --git a/src/Bootstrap/BaseLoadConfiguration.php b/src/Bootstrap/BaseLoadConfiguration.php
@@ -13,6 +13,7 @@
 
 namespace LaravelZero\Framework\Bootstrap;
 
+use ReflectionClass;
 use Illuminate\Contracts\Foundation\Application as ApplicationContract;
 use Illuminate\Foundation\Bootstrap\LoadConfiguration;
 use Symfony\Component\Finder\Finder;
@@ -48,4 +49,25 @@ protected function getConfigurationFiles(ApplicationContract $app): array
 
         return $files;
     }
+
+    /**
+     * Get the base configuration files.
+     *
+     * @return array
+     */
+    protected function getBaseConfiguration()
+    {
+        $config = [];
+
+        $reflector = new ReflectionClass($this);
+        $declaringClass = $reflector->getParentClass();
+        $dir = dirname($declaringClass->getFilename());
+
+        foreach (Finder::create()->files()->name('*.php')->in($dir.'/../../../../config') as $file) {
+            $config[basename($file->getRelativePathname(), '.php')] = require ($file->getPath() . '/' . $file->getFilename());
+        }
+
+        return $config;
+    }
 }
+
diff --git a/tests/Components/HttpComponentTest.php b/tests/Components/HttpComponentTest.php
@@ -9,7 +9,7 @@
 it('installs the required packages', function () {
     $composerMock = $this->createMock(ComposerContract::class);
 
-    $composerMock->expects($this->exactly(2))
+    $composerMock->expects($this->exactly(1))
         ->method('require');
 
     $this->app->instance(ComposerContract::class, $composerMock);

diff --git a/tests/Components/LogInstallTest.php b/tests/Components/LogInstallTest.php
@@ -15,7 +15,7 @@
 
     $composerMock->expects($this->once())
         ->method('require')
-        ->with('illuminate/log "^10.0"');
+        ->with('illuminate/log "^11.5"');
 
     $this->app->instance(ComposerContract::class, $composerMock);
 

diff --git a/tests/Components/LogoProviderTest.php b/tests/Components/LogoProviderTest.php
diff --git a/tests/Components/MenuComponentTest.php b/tests/Components/MenuComponentTest.php
@@ -10,7 +10,7 @@
 
     $composerMock->expects($this->once())
         ->method('require')
-        ->with('nunomaduro/laravel-console-menu "^3.4"');
+        ->with('nunomaduro/laravel-console-menu "^3.5"');
 
     $this->app->instance(ComposerContract::class, $composerMock);
 

diff --git a/tests/Components/RedisInstallTest.php b/tests/Components/RedisInstallTest.php
@@ -10,7 +10,7 @@
 
     $composerMock->expects($this->once())
         ->method('require')
-        ->with('illuminate/redis "^10.0"', false);
+        ->with('illuminate/redis "^11.5"', false);
 
     $this->app->instance(ComposerContract::class, $composerMock);
 

diff --git a/tests/Components/UpdaterInstallTest.php b/tests/Components/UpdaterInstallTest.php
@@ -8,7 +8,7 @@
 it('installs the required packages', function () {
     $composerMock = $this->createMock(ComposerContract::class);
 
-    $composerMock->expects($this->once())->method('require')->with('laravel-zero/phar-updater "^1.3"');
+    $composerMock->expects($this->once())->method('require')->with('laravel-zero/phar-updater "^1.4"');
 
     $this->app->instance(ComposerContract::class, $composerMock);