Bypass database build with SS_BYPASS_BUILD_DATABASE

ssmarco · Sep 10, 2023 · 66295b9 · 66295b9
1 parent 55eba12
commit 66295b9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 77 deletions.
diff --git a/app/_config/extension.yml b/app/_config/extension.yml
@@ -4,6 +4,3 @@ Name: app-extension
 SilverStripe\Control\Controller:
   extensions:
     - App\Extension\ControllerExtension
-SilverStripe\ORM\DatabaseAdmin:
-  extensions:
-    - App\Extension\DatabaseAdminExtension
diff --git a/app/_config/internal.yml b/app/_config/internal.yml
@@ -1,24 +1,20 @@
 ---
 Name: app-internal
-After:
-  - '#coreroutes'
-Only:
-  envvarset: SS_BYPASS_BUILD_DATABASE
 ---
 SilverStripe\Core\Injector\Injector:
   ZeroDatabase:
     class: App\Internal\ZeroDatabase
     properties:
       connector: '%$App\Internal\ZeroConnector'
       schemaManager: '%$App\Internal\ZeroSchemaManager'
-  DevRequestFilter:
-    class: SilverStripe\Control\Middleware\RequestHandlerMiddlewareAdapter
-    properties:
-      RequestHandler: '%$SilverStripe\Dev\DevBuildController'
-      Middlewares:
-        AdminRequestFilterMiddleware: '%$App\Internal\DevRequestFilterMiddleware'
 
-SilverStripe\Control\Director:
-  rules:
-    dev:
-      Controller: '%$DevRequestFilter'
+---
+Name: app-internal-database
+After:
+  - '#coreroutes'
+Only:
+  envvarset: SS_BYPASS_BUILD_DATABASE
+---
+SilverStripe\ORM\DatabaseAdmin:
+  extensions:
+    - App\Extension\DatabaseAdminExtension
diff --git a/app/src/Extension/DatabaseAdminExtension.php b/app/src/Extension/DatabaseAdminExtension.php
@@ -9,6 +9,12 @@
 class DatabaseAdminExtension extends Extension
 {
 
+    public function onBeforeBuild(bool &$quiet, bool &$populate, bool $testMode): void
+    {
+        $quiet = true;
+        $populate = false;
+    }
+
     public function onAfterBuild(bool $quiet, bool $populate, bool $testMode): void
     {
        Debug::message('$quiet: ' . json_encode($quiet));

diff --git a/app/src/Internal/DevRequestFilterMiddleware.php b/app/src/Internal/DevRequestFilterMiddleware.php
diff --git a/app/tests/Unit/Internal/DevRequestFilterMiddlewareTest.php b/app/tests/Unit/Internal/DevRequestFilterMiddlewareTest.php