FIX Ensure everything gets flushed when flushing from sake

_config/requestprocessors.yml

@@ -9,7 +9,6 @@ SilverStripe\Core\Injector\Injector:
         TrustedProxyMiddleware: '%$SilverStripe\Control\Middleware\TrustedProxyMiddleware'
         AllowedHostsMiddleware: '%$SilverStripe\Control\Middleware\AllowedHostsMiddleware'
         SessionMiddleware: '%$SilverStripe\Control\Middleware\SessionMiddleware'
-        FlushMiddleware: '%$SilverStripe\Control\Middleware\FlushMiddleware'
         ChangeDetectionMiddleware: '%$SilverStripe\Control\Middleware\ChangeDetectionMiddleware'
         HTTPCacheControleMiddleware: '%$SilverStripe\Control\Middleware\HTTPCacheControlMiddleware'
         CanonicalURLMiddleware: '%$SilverStripe\Control\Middleware\CanonicalURLMiddleware'

src/Control/Middleware/HTTPCacheControlMiddleware.php

@@ -9,6 +9,7 @@
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\Core\Injector\Injector;
+use SilverStripe\Core\Kernel;
 use SilverStripe\Core\Resettable;
 use SilverStripe\ORM\FieldType\DBDatetime;
 
@@ -35,6 +36,12 @@ class HTTPCacheControlMiddleware implements HTTPMiddleware, Resettable
      */
     public function process(HTTPRequest $request, callable $delegate)
     {
+        // Disable cache when flushing
+        $kernel = Injector::inst()->get(Kernel::class);
+        if ($kernel->isFlushed()) {
+            $this->disableCache(true);
+        }
+
         try {
             $response = $delegate($request);
         } catch (HTTPResponse_Exception $ex) {

src/Core/CoreKernel.php

@@ -52,6 +52,14 @@ public function boot($flush = false)
         $this->validateDatabase();
 
         $this->setBooted(true);
+
+        // Flush everything else that can be flushed, now that we're booted.
+        if ($flush) {
+            foreach (ClassInfo::implementorsOf(Flushable::class) as $class) {
+                /** @var Flushable|string $class */
+                $class::flush();
+            }
+        }
     }
 
     /**

src/Core/Flushable.php

@@ -2,8 +2,6 @@
 
 namespace SilverStripe\Core;
 
-use SilverStripe\Control\Middleware\FlushMiddleware;
-
 /**
  * Provides an interface for classes to implement their own flushing functionality
  * whenever flush=1 is requested.
@@ -12,11 +10,9 @@ interface Flushable
 {
 
     /**
-     * This function is triggered early in the request if the "flush" query
-     * parameter has been set. Each class that implements Flushable implements
+     * This function is triggered early in the request if the kernel gets flushed.
+     * Each class that implements Flushable implements
      * this function which looks after it's own specific flushing functionality.
-     *
-     * @see FlushMiddleware
      */
     public static function flush();
 }

src/Forms/HTMLEditor/TinyMCECombinedGenerator.php

@@ -237,13 +237,6 @@ public function generateFilename(TinyMCEConfig $config)
         return $url;
     }
 
-    /**
-     * This function is triggered early in the request if the "flush" query
-     * parameter has been set. Each class that implements Flushable implements
-     * this function which looks after it's own specific flushing functionality.
-     *
-     * @see FlushMiddleware
-     */
     public static function flush()
     {
         $dir = dirname(static::config()->get('filename_base') ?? '');

tests/php/Core/KernelTest.php

@@ -15,6 +15,7 @@
 use ReflectionClass;
 use SilverStripe\ORM\DB;
 use ReflectionObject;
+use SilverStripe\Core\Tests\KernelTest\TestFlushable;
 
 class KernelTest extends SapphireTest
 {
@@ -85,7 +86,7 @@ public function testInvalidConfigDetection()
 
         $kernel->getConfigLoader()->getManifest();
     }
-    
+
     public function testReplicaDatabaseVarsLoaded()
     {
         // Set environment variables for a fake replica database
@@ -113,4 +114,16 @@ public function testReplicaDatabaseVarsLoaded()
             'password' => 'hi_people',
         ], $configs['replica_01']);
     }
+
+    public function testImplementorsAreCalled()
+    {
+        TestFlushable::$flushed = false;
+
+        $kernel = Injector::inst()->get(Kernel::class);
+        $kernel->boot(true);
+        $this->assertTrue(TestFlushable::$flushed);
+
+        // reset the kernel Flush flag
+        $kernel->boot();
+    }
 }

tests/php/Control/FlushMiddlewareTest/TestFlushable.php → tests/php/Core/KernelTest/TestFlushable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Control\Tests\FlushMiddlewareTest;
+namespace SilverStripe\Core\Tests\KernelTest;
 
 use SilverStripe\Core\Flushable;
 use SilverStripe\Dev\TestOnly;