Merge branch 'master' into 1236-database-changes

2025-08-16 21:34:08 +02:00 · 2018-06-27 21:23:52 +02:00
parent 4d2d7465ee b78129b36b
commit 54678e8d5c
5 changed files with 11 additions and 5 deletions
--- a/src/Extension/Extension.php
+++ b/src/Extension/Extension.php
@@ -119,7 +119,13 @@ class Extension implements Arrayable
            return;
        }

-        $extenders = array_flatten((array) require $bootstrapper);
+        $extenders = require $bootstrapper;
+
+        if (! is_array($extenders)) {
+            $extenders = [$extenders];
+        }
+
+        $extenders = array_flatten($extenders);

        foreach ($extenders as $extender) {
            // If an extension has not yet switched to the new bootstrap.php