From c82d11ef70b59daeabd386e16cf871bb25e5bb70 Mon Sep 17 00:00:00 2001
From: Chris Penny <chris.penny@gmail.com>
Date: Thu, 23 Feb 2023 11:08:31 +1300
Subject: [PATCH] Add isFlushed() to Kernel interface

Also add explicit return type
---
 src/Core/BaseKernel.php         |  4 ++--
 src/Core/CoreKernel.php         | 12 ++----------
 src/Core/DatabaselessKernel.php | 11 +++--------
 src/Core/Kernel.php             |  7 +++++++
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/Core/BaseKernel.php b/src/Core/BaseKernel.php
index a3893ab9d..2b7ffbd2e 100644
--- a/src/Core/BaseKernel.php
+++ b/src/Core/BaseKernel.php
@@ -188,7 +188,7 @@ abstract class BaseKernel implements Kernel
             $this->getIncludeTests(),
             $flush
         );
-        
+
         // Flush config
         if ($flush) {
             $config = $this->getConfigLoader()->getManifest();
@@ -265,7 +265,7 @@ abstract class BaseKernel implements Kernel
 
     abstract public function boot($flush = false);
 
-    abstract public function isFlushed();
+    abstract public function isFlushed(): ?bool;
 
     /**
      * Check if there's a legacy _ss_environment.php file
diff --git a/src/Core/CoreKernel.php b/src/Core/CoreKernel.php
index be3ed1821..3af15bb99 100644
--- a/src/Core/CoreKernel.php
+++ b/src/Core/CoreKernel.php
@@ -15,11 +15,8 @@ class CoreKernel extends BaseKernel
 
     /**
      * Indicates whether the Kernel has been flushed on boot
-     * Uninitialised before boot
-     *
-     * @var bool
      */
-    private $flush;
+    private ?bool $flush = null;
 
     /**
      * @param false $flush
@@ -217,12 +214,7 @@ class CoreKernel extends BaseKernel
         return null;
     }
 
-    /**
-     * Returns whether the Kernel has been flushed on boot
-     *
-     * @return bool|null null if the kernel hasn't been booted yet
-     */
-    public function isFlushed()
+    public function isFlushed(): ?bool
     {
         return $this->flush;
     }
diff --git a/src/Core/DatabaselessKernel.php b/src/Core/DatabaselessKernel.php
index d5c981ba4..c21ec3681 100644
--- a/src/Core/DatabaselessKernel.php
+++ b/src/Core/DatabaselessKernel.php
@@ -16,11 +16,9 @@ class DatabaselessKernel extends BaseKernel
 {
     /**
      * Indicates whether the Kernel has been flushed on boot
-     * Uninitialised before boot
-     *
-     * @var bool
+     * Null before boot
      */
-    private $flush;
+    private ?bool $flush = null;
 
     /**
      * Allows disabling of the configured error handling.
@@ -53,10 +51,7 @@ class DatabaselessKernel extends BaseKernel
         $this->setBooted(true);
     }
 
-    /**
-     * @return bool
-     */
-    public function isFlushed()
+    public function isFlushed(): ?bool
     {
         return $this->flush;
     }
diff --git a/src/Core/Kernel.php b/src/Core/Kernel.php
index a80a23203..a64590bce 100644
--- a/src/Core/Kernel.php
+++ b/src/Core/Kernel.php
@@ -132,4 +132,11 @@ interface Kernel
      * @return $this
      */
     public function setEnvironment($environment);
+
+    /**
+     * Returns whether the Kernel has been flushed on boot
+     *
+     * @return bool|null null if the kernel hasn't been booted yet
+     */
+    public function isFlushed(): ?bool;
 }