From da5a97fd36aab1c1adf3374167521a76da5484d8 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Sat, 20 Oct 2018 22:21:39 +1030
Subject: [PATCH] Load extensions in the configured order

---
 framework/core/src/Extension/ExtensionManager.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/framework/core/src/Extension/ExtensionManager.php b/framework/core/src/Extension/ExtensionManager.php
index 62e4e0502..4414f3142 100644
--- a/framework/core/src/Extension/ExtensionManager.php
+++ b/framework/core/src/Extension/ExtensionManager.php
@@ -266,11 +266,15 @@ class ExtensionManager
     /**
      * Get only enabled extensions.
      *
-     * @return Collection
+     * @return array
      */
     public function getEnabledExtensions()
     {
-        return $this->getExtensions()->only($this->getEnabled());
+        $extensions = $this->getExtensions();
+
+        return array_filter(array_map(function ($id) use ($extensions) {
+            return $extensions[$id] ?? null;
+        }, $this->getEnabled()));
     }
 
     /**