- WIP on Kernel loading and Lean's autoload. Fixed some breadcrumb inconsistencies also

src/Kernel.php

@@ -31,8 +31,6 @@ class Kernel {
 
     public string $definitionFilePath;
 
-    public array $definitionFilePaths = [];
-
     public string $errorLogPath;
 
     public string $projectPath;
@@ -126,12 +124,11 @@ class Kernel {
             }
         }
 
-        if ($this->definitionFilePath ?? false) {
-            $containerBuilder->addDefinitions($this->definitionFilePath);
-        }
+        # $containerBuilder->useAnnotations(false);
 
-        foreach($this->definitionFilePaths ?? [] as $path) {
-            $containerBuilder->addDefinitions($path);
+        if ($this->definitionFilePath ?? false) {
+            $containerBuilder->addDefinitions(Lean::autoloadDefinitionsFromComposerExtra());
+            $containerBuilder->addDefinitions(require($this->definitionFilePath));
         }
 
         $this->container = $containerBuilder->build();

src/Lean.php

@@ -161,33 +161,20 @@ class Lean
         return [];
     }
 
-    public static function getDefinitionsPathsFromComposer() : array
-    {
-        $list = [];
-
-        foreach(Composer::readComposerLock()['packages'] as $package) {
-            foreach($package['extra']['lean']['autoload']['definitions'] ?? [] as $autoload) {
-                $list[] = static::pathFromPackage($package, $autoload);
-            }
-        }
-
-        foreach(Composer::readComposerJson()['extra']['lean']['autoload']['definitions'] ?? [] ?? [] as $autoload) {
-            $list[] = getenv('PROJECT_PATH') . DIRECTORY_SEPARATOR . $autoload;
-        }
-
-        return $list;
-    }
-
     public static function autoloadDefinitionsFromComposerExtra() : array
     {
         $list = [];
 
         foreach(Composer::readComposerLock()['packages'] as $package) {
             foreach($package['extra']['lean']['autoload']['definitions'] ?? [] as $autoload) {
-                $list = array_replace($list, static::loadFromPackage($package, $autoload));
+                $list = array_replace($list, static::loadFromPackage($package, $autoload, getenv('VENDOR_DIR') ?: dirname(__DIR__, 3)));
             }
         }
 
+        foreach(Composer::readComposerJson()['extra']['lean']['autoload']['definitions'] ?? [] as $autoload) {
+            $list = array_replace($list, static::loadFromPackage(null, $autoload, getenv('PROJECT_PATH') ?: dirname(__DIR__, 5)));
+        }
+
         return $list;
     }
 
@@ -197,35 +184,26 @@ class Lean
 
         foreach(Composer::readComposerLock()['packages'] as $package) {
             foreach($package['extra']['lean']['autoload']['config'] ?? [] as $autoload) {
-                $list = array_merge_recursive($list, static::loadFromPackage($package, $autoload));
+                $list = array_merge_recursive($list, static::loadFromPackage($package, $autoload, getenv('VENDOR_DIR') ?: dirname(__DIR__, 3)));
             }
         }
 
+        foreach(Composer::readComposerJson()['extra']['lean']['autoload']['config'] ?? [] as $autoload) {
+            $list = array_merge_recursive($list, static::loadFromPackage(null, $autoload, getenv('PROJECT_PATH') ?: dirname(__DIR__, 5)));
+        }
+
         return $list;
     }
 
-    protected static function pathFromPackage(array $package, array|string $autoload) : string
-    {
-        $vendor = getenv('VENDOR_DIR') ? getenv('VENDOR_PATH') : dirname(__DIR__, 3);
-
-        $filepath = $vendor . DIRECTORY_SEPARATOR . $package['name'] . DIRECTORY_SEPARATOR . $autoload;
-
-        if (! file_exists($filepath)) {
-            throw new \InvalidArgumentException("Given definition filepath do not exists '$filepath'");
-        }
-
-        return $filepath;
-    }
-
-    protected static function loadFromPackage(array $package, array|string $autoload) : false|array
+    protected static function loadFromPackage(?array $package, array|string $autoload, string $path) : false|array
     {
         $list = [];
 
         if (is_string($autoload)) {
-            $file = static::pathFromPackage($package, $autoload);
+            $file = $path . DIRECTORY_SEPARATOR . ($package ? $package['name'] . DIRECTORY_SEPARATOR : "") . $autoload;
 
             if ( ! file_exists($file) ) {
-                throw new \InvalidArgumentException(sprintf("Given autoload file `%s` from package `%s` was not found or is unreachable", $autoload, $package['name']));
+                throw new \InvalidArgumentException(sprintf("Given autoload file `%s` from package `%s` was not found or is unreachable", $file, $package['name']));
             }
 
             return require($file);
@@ -238,4 +216,4 @@ class Lean
 
         return false;
     }
-}
+}