v1.2.0

.gitignore

@@ -1,2 +1,3 @@
 composer.lock
+.idea
 .DS_Store

README.md

@@ -1,6 +1,6 @@
 # Kirby Loader
 
-With Kirby Loader you can load plugins from multiple roots. Thus, you can simplify the management of your plugins by grouping.
+The Kirby Loader allows you to install plugins from multiple root directories. You can easily manage plug-ins by grouping them.
 
 ## Installation
 
@@ -37,7 +37,7 @@ return [
 The default values of the package are:
 
 | Option | Default | Values | Description |
-|:--|:--|:--|:--|
+|:---|:---|:---|:---|
 | afbora.loader.roots | [] | (array) | Array with the roots |
 
 All the values can be updated in the `config.php` file.

composer.json

@@ -2,7 +2,7 @@
     "name": "afbora/kirby-loader",
     "description": "Kirby plugins loader from multiple roots",
     "keywords": [],
-    "version": "1.1",
+    "version": "1.2.0",
     "type": "kirby-plugin",
     "license": "MIT",
     "authors": [
@@ -21,9 +21,6 @@
         "sort-packages": true
     },
     "autoload": {
-        "files": [
-            "config.php"
-        ],
         "psr-4": {
             "Afbora\\Loader\\": "src/"
         }

index.php

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

src/Loader.php

@@ -17,11 +17,13 @@ public function register()
     {
         if ($this->roots) {
             $index = kirby()->root('index');
+
             foreach ($this->roots as $root) {
                 if (is_string($root)) {
                     if (strpos($root, $index) === false) {
                         $root = $index . DIRECTORY_SEPARATOR . ltrim($root, DIRECTORY_SEPARATOR);
                     }
+
                     $this->pluginsLoader($root);
                 }
             }
@@ -42,15 +44,19 @@ protected function readDir(string $dirname, string $root): bool
         if (in_array(substr($dirname, 0, 1), ['.', '_']) === true) {
             return false;
         }
+
         $dir = $root . DIRECTORY_SEPARATOR . $dirname;
         if (is_dir($dir) === false) {
             return false;
         }
+
         $entry = $dir . DIRECTORY_SEPARATOR . 'index.php';
         if (file_exists($entry) === false) {
             return false;
         }
+
         include_once $entry;
+
         return true;
     }
 }

vendor/composer/autoload_real.php

@@ -47,24 +47,6 @@ public static function getLoader()
 
         $loader->register(true);
 
-        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit3fb0a4d64201676d2dcd03e06dd74f70::$files;
-        } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
-        }
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire3fb0a4d64201676d2dcd03e06dd74f70($fileIdentifier, $file);
-        }
-
         return $loader;
     }
 }
-
-function composerRequire3fb0a4d64201676d2dcd03e06dd74f70($fileIdentifier, $file)
-{
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        require $file;
-
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-    }
-}

vendor/composer/autoload_static.php

@@ -6,10 +6,6 @@
 
 class ComposerStaticInit3fb0a4d64201676d2dcd03e06dd74f70
 {
-    public static $files = array (
-        '412e4b389f65beea27bfc71fde38a046' => __DIR__ . '/../..' . '/config.php',
-    );
-
     public static $prefixLengthsPsr4 = array (
         'K' => 
         array (