v2.0.0

composer.json

@@ -1,30 +1,25 @@
 {
-    "name": "afbora/kirby-loader",
-    "description": "Kirby plugins loader from multiple roots",
-    "keywords": [],
-    "version": "1.4.0",
-    "type": "kirby-plugin",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Ahmet Bora",
-            "email": "[email protected]"
-        }
-    ],
-    "require": {
-        "php": "^7.3 || ^8.0",
-        "getkirby/composer-installer": "^1.2"
-    },
-    "config": {
-        "optimize-autoloader": true,
-        "preferred-install": "dist",
-        "sort-packages": true
-    },
-    "autoload": {
-        "psr-4": {
-            "Afbora\\Loader\\": "src/"
-        }
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+  "name": "afbora/kirby-loader",
+  "description": "Kirby plugins loader from multiple roots",
+  "keywords": [],
+  "version": "2.0.0",
+  "type": "kirby-plugin",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Ahmet Bora",
+      "email": "[email protected]"
+    }
+  ],
+  "require": {
+    "php": "^7.4|^8.0",
+    "getkirby/composer-installer": "^1.2"
+  },
+  "config": {
+    "optimize-autoloader": true,
+    "preferred-install": "dist",
+    "sort-packages": true
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true
 }

index.php

@@ -1,14 +1,16 @@
 <?php
 
-use Afbora\Loader\Loader;
+use Afbora\Loader;
 use Kirby\Cms\App as Kirby;
 
-@include_once __DIR__ . "/vendor/autoload.php";
+load([
+    'afbora\\loader' => __DIR__ . '/src/Loader.php',
+]);
 
 (new Loader())->register();
 
 Kirby::plugin('afbora/loader', [
     'options' => [
         'roots' => []
     ]
-]);
+]);

src/Loader.php

@@ -1,16 +1,17 @@
 <?php
 
-namespace Afbora\Loader;
+namespace Afbora;
 
-use Kirby\Toolkit\Dir;
+use Kirby\Filesystem\Dir;
+use Kirby\Filesystem\F;
 
 class Loader
 {
     protected $roots = [];
 
     public function __construct()
     {
-        $this->roots = option('afbora.loader.roots');
+        $this->roots = option('afbora.loader.roots', []);
     }
 
     public function register()
@@ -58,11 +59,11 @@ protected function readDir(string $dirname, string $root): bool
         }
 
         $entry = $dir . DIRECTORY_SEPARATOR . 'index.php';
-        if (file_exists($entry) === false) {
+        if (is_dir($dir) !== true || is_file($entry) !== true) {
             return false;
         }
 
-        include_once $entry;
+        F::loadOnce($entry);
 
         return true;
     }