From 8476feb2db5f2b0d82708346a5113a1b17fcb141 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Sun, 9 Oct 2022 03:32:39 +0545
Subject: [PATCH 1/2] Fix typo in comment

---
 Core/Frameworks/Baikal/WWWRoot/index.php              | 2 +-
 Core/Frameworks/BaikalAdmin/WWWRoot/index.php         | 2 +-
 Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php | 2 +-
 html/cal.php                                          | 2 +-
 html/card.php                                         | 2 +-
 html/dav.php                                          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Core/Frameworks/Baikal/WWWRoot/index.php b/Core/Frameworks/Baikal/WWWRoot/index.php
index 1aa057c..6ce02bb 100644
--- a/Core/Frameworks/Baikal/WWWRoot/index.php
+++ b/Core/Frameworks/Baikal/WWWRoot/index.php
@@ -45,7 +45,7 @@ if (!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
 
 require PROJECT_PATH_ROOT . 'vendor/autoload.php';
 
-# Bootstraping Flake
+# Bootstrapping Flake
 \Flake\Framework::bootstrap();
 
 # Bootstrapping Baïkal
diff --git a/Core/Frameworks/BaikalAdmin/WWWRoot/index.php b/Core/Frameworks/BaikalAdmin/WWWRoot/index.php
index 31afd48..02a9b0d 100644
--- a/Core/Frameworks/BaikalAdmin/WWWRoot/index.php
+++ b/Core/Frameworks/BaikalAdmin/WWWRoot/index.php
@@ -46,7 +46,7 @@ if (!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
 
 require PROJECT_PATH_ROOT . 'vendor/autoload.php';
 
-# Bootstraping Flake
+# Bootstrapping Flake
 \Flake\Framework::bootstrap();
 
 # Bootstrap BaikalAdmin
diff --git a/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php b/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php
index ba3414b..cf2edd6 100644
--- a/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php
+++ b/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php
@@ -53,7 +53,7 @@ if (!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
 
 require PROJECT_PATH_ROOT . "vendor/autoload.php";
 
-# Bootstraping Flake
+# Bootstrapping Flake
 \Flake\Framework::bootstrap();
 
 # Bootstrap BaikalAdmin
diff --git a/html/cal.php b/html/cal.php
index 76eb025..32c06fd 100644
--- a/html/cal.php
+++ b/html/cal.php
@@ -47,7 +47,7 @@ if (!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
 
 require PROJECT_PATH_ROOT . 'vendor/autoload.php';
 
-# Bootstraping Flake
+# Bootstrapping Flake
 \Flake\Framework::bootstrap();
 
 # Bootstrapping Baïkal
diff --git a/html/card.php b/html/card.php
index 6a41053..4af9218 100644
--- a/html/card.php
+++ b/html/card.php
@@ -47,7 +47,7 @@ if (!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
 
 require PROJECT_PATH_ROOT . 'vendor/autoload.php';
 
-# Bootstraping Flake
+# Bootstrapping Flake
 \Flake\Framework::bootstrap();
 
 # Bootstrapping Baïkal
diff --git a/html/dav.php b/html/dav.php
index 642f6ba..dd20733 100644
--- a/html/dav.php
+++ b/html/dav.php
@@ -46,7 +46,7 @@ if (!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
 }
 require PROJECT_PATH_ROOT . 'vendor/autoload.php';
 
-# Bootstraping Flake
+# Bootstrapping Flake
 \Flake\Framework::bootstrap();
 
 # Bootstrapping Baïkal

From c09dfad3efa431a6ac114ea1ea4a1045755cef51 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Sun, 9 Oct 2022 12:02:42 +0545
Subject: [PATCH 2/2] Add ReturnTypeWillChange to methods that need it for PHP
 8.1

---
 Core/Frameworks/Flake/Core/Datastructure/ChainLink.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Core/Frameworks/Flake/Core/Datastructure/ChainLink.php b/Core/Frameworks/Flake/Core/Datastructure/ChainLink.php
index 313569f..8bd4479 100644
--- a/Core/Frameworks/Flake/Core/Datastructure/ChainLink.php
+++ b/Core/Frameworks/Flake/Core/Datastructure/ChainLink.php
@@ -60,6 +60,7 @@ abstract class ChainLink implements \Flake\Core\Datastructure\Chainable {
         $this->__container->offsetUnset($offset);
     }
 
+    #[\ReturnTypeWillChange]
     function &offsetGet($offset) {
         if (is_null($this->__container)) {
             return null;
@@ -74,10 +75,12 @@ abstract class ChainLink implements \Flake\Core\Datastructure\Chainable {
         $this->__container->rewind();
     }
 
+    #[\ReturnTypeWillChange]
     function current() {
         return $this->__container->current();
     }
 
+    #[\ReturnTypeWillChange]
     function key() {
         return $this->__container->key();
     }