From abcc46db94181703bb602903faca30aff43f5424 Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Thu, 26 Jan 2023 09:17:45 +0100
Subject: [PATCH] Add PHP8.2 support to the application

---
 application/core/EA_Controller.php            | 16 ++++++++++
 application/core/EA_Input.php                 |  2 +-
 .../views/components/js_lang_script.php       |  2 +-
 system/core/Controller.php                    | 19 +++++++++++-
 system/core/Loader.php                        | 21 ++++++++++++--
 system/core/Router.php                        |  2 ++
 system/core/URI.php                           | 17 +++++++++++
 system/database/DB_driver.php                 | 17 +++++++++++
 system/libraries/Cache/Cache.php              |  2 ++
 system/libraries/Driver.php                   | 29 +++++++++++++++----
 10 files changed, 117 insertions(+), 10 deletions(-)

diff --git a/application/core/EA_Controller.php b/application/core/EA_Controller.php
index 28d7796e..2a78e3ff 100644
--- a/application/core/EA_Controller.php
+++ b/application/core/EA_Controller.php
@@ -77,6 +77,8 @@ class EA_Controller extends CI_Controller {
 
         $this->configure_language();
         
+        $this->load_common_html_vars();
+        
         $this->load_common_script_vars();
         
         rate_limit($this->input->ip_address());
@@ -97,6 +99,20 @@ class EA_Controller extends CI_Controller {
         $this->lang->load('translations');
     }
 
+    /**
+     * Load common script vars for all requests.
+     */
+    private function load_common_html_vars()
+    {
+        html_vars([
+            'base_url' => config('base_url'),
+            'index_page' => config('index_page'),
+            'available_languages' => config('available_languages'),
+            'language' => $this->lang->language,
+            'csrf_token' => $this->security->get_csrf_hash(),
+        ]);
+    }
+    
     /**
      * Load common script vars for all requests. 
      */
diff --git a/application/core/EA_Input.php b/application/core/EA_Input.php
index 00d81454..9e006d44 100644
--- a/application/core/EA_Input.php
+++ b/application/core/EA_Input.php
@@ -55,7 +55,7 @@ class EA_Input extends CI_Input {
         /** @var EA_Controller $CI */
         $CI = &get_instance();
 
-        if (strpos($CI->input->get_request_header('Content-Type'), 'application/json') === false)
+        if (strpos((string)$CI->input->get_request_header('Content-Type'), 'application/json') === false)
         {
             return NULL;
         }
diff --git a/application/views/components/js_lang_script.php b/application/views/components/js_lang_script.php
index 80a821f2..ef18a90a 100644
--- a/application/views/components/js_lang_script.php
+++ b/application/views/components/js_lang_script.php
@@ -1,6 +1,6 @@
 <script>
     window.lang = (function () {
-        const lang = <?= json_encode($this->lang->language) ?>;
+        const lang = <?= json_encode(html_vars('language')) ?>;
 
         return (key) => {
             if (!key) {
diff --git a/system/core/Controller.php b/system/core/Controller.php
index ac27989f..c7613648 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -65,6 +65,23 @@ class CI_Controller {
 	 */
 	public $load;
 
+    /**
+     * Dynamic Class Props
+     *
+     * @var array
+     */
+    public $props = [];
+
+    public function __get(string $name): mixed
+    {
+        return $this->props[$name] ?? NULL;
+    }
+
+    public function __set(string $name, mixed $value): void
+    {
+        $this->props[$name] = $value;
+    }
+
 	/**
 	 * Class constructor
 	 *
@@ -79,7 +96,7 @@ class CI_Controller {
 		// so that CI can run as one big super object.
 		foreach (is_loaded() as $var => $class)
 		{
-			$this->$var =& load_class($class);
+			$this->$var = load_class($class);
 		}
 
 		$this->load =& load_class('Loader', 'core');
diff --git a/system/core/Loader.php b/system/core/Loader.php
index d9a1539a..846dfc74 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -50,6 +50,23 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  */
 class CI_Loader {
 
+    /**
+     * Dynamic Class Props
+     *
+     * @var array
+     */
+    public $props = [];
+
+    public function __get(string $name): mixed
+    {
+        return $this->props[$name] ?? NULL;
+    }
+
+    public function __set(string $name, mixed $value): void
+    {
+        $this->props[$name] = $value;
+    }
+
 	// All these are set automatically. Don't mess with them.
 	/**
 	 * Nesting level of the output buffering mechanism
@@ -397,7 +414,7 @@ class CI_Loader {
 		$CI->db = '';
 
 		// Load the DB class
-		$CI->db =& DB($params, $query_builder);
+		$CI->db = DB($params, $query_builder);
 		return $this;
 	}
 
@@ -929,7 +946,7 @@ class CI_Loader {
 		{
 			if ( ! isset($this->$_ci_key))
 			{
-				$this->$_ci_key =& $_ci_CI->$_ci_key;
+				$this->$_ci_key = $_ci_CI->$_ci_key;
 			}
 		}
 
diff --git a/system/core/Router.php b/system/core/Router.php
index 0d966255..9acb9fb9 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -49,6 +49,8 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  * @link		https://codeigniter.com/userguide3/general/routing.html
  */
 class CI_Router {
+    
+    public $uri;
 
 	/**
 	 * CI_Config class object
diff --git a/system/core/URI.php b/system/core/URI.php
index 9bef22d6..daa58c13 100644
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -50,6 +50,23 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  */
 class CI_URI {
 
+    /**
+     * Dynamic Class Props
+     * 
+     * @var array 
+     */
+    public $props = []; 
+    
+    public function __get(string $name): mixed 
+    {
+        return $this->props[$name] ?? NULL;
+    }
+
+    public function __set(string $name, mixed $value): void
+    {
+        $this->props[$name] = $value;
+    }
+
 	/**
 	 * List of cached URI segments
 	 *
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index cba96d9a..0aaaf5a6 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -52,6 +52,23 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  */
 abstract class CI_DB_driver {
 
+    /**
+     * Dynamic Class Props
+     *
+     * @var array
+     */
+    public $props = [];
+
+    public function __get(string $name): mixed
+    {
+        return $this->props[$name] ?? NULL;
+    }
+
+    public function __set(string $name, mixed $value): void
+    {
+        $this->props[$name] = $value;
+    }
+
 	/**
 	 * Data Source Name / Connect string
 	 *
diff --git a/system/libraries/Cache/Cache.php b/system/libraries/Cache/Cache.php
index b1241766..17fbb2fe 100644
--- a/system/libraries/Cache/Cache.php
+++ b/system/libraries/Cache/Cache.php
@@ -248,6 +248,8 @@ class CI_Cache extends CI_Driver_Library {
 
 		if ( ! isset($support, $support[$driver]))
 		{
+            $this->load_driver($driver);
+            
 			$support[$driver] = $this->{$driver}->is_supported();
 		}
 
diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php
index 7e6cf4fa..98ac16af 100644
--- a/system/libraries/Driver.php
+++ b/system/libraries/Driver.php
@@ -65,6 +65,25 @@ class CI_Driver_Library {
 	 */
 	protected $lib_name;
 
+    /**
+     * Dynamic Class Props
+     *
+     * @var array
+     */
+    public $props = [];
+
+    public function __get(string $name): mixed
+    {
+        // $this->load_driver($name);
+        
+        return $this->props[$name] ?? NULL;
+    }
+
+    public function __set(string $name, mixed $value): void
+    {
+        $this->props[$name] = $value;
+    }
+
 	/**
 	 * Get magic method
 	 *
@@ -74,11 +93,11 @@ class CI_Driver_Library {
 	 * @param	string	Child class name
 	 * @return	object	Child class
 	 */
-	public function __get($child)
-	{
-		// Try to load the driver
-		return $this->load_driver($child);
-	}
+	// public function __get($child)
+	// {
+	// 	// Try to load the driver
+	// 	return $this->load_driver($child);
+	// }
 
 	/**
 	 * Load driver