Add magic __isset to classes with __get

Author: MGatner

system/CLI/BaseCommand.php

@@ -190,6 +190,20 @@ public function __get(string $key)
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Makes it simple to check our protected properties.
+	 *
+	 * @param string $key
+	 *
+	 * @return bool
+	 */
+	public function __isset(string $key): bool
+	{
+		return isset($this->$key);
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * show Help include (usage,arguments,description,options)
 	 */

system/Database/BaseConnection.php

@@ -1864,4 +1864,18 @@ public function __get(string $key)
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Checker for properties existence.
+	 *
+	 * @param string $key
+	 *
+	 * @return bool
+	 */
+	public function __isset(string $key): bool
+	{
+		return property_exists($this, $key);
+	}
+
+	//--------------------------------------------------------------------
+
 }

system/Encryption/Encryption.php

@@ -195,4 +195,15 @@ public function __get($key)
 		return null;
 	}
 
+	/**
+	 * __isset() magic, providing checking for some of our protected properties
+	 *
+	 * @param  string $key Property name
+	 * @return bool
+	 */
+	public function __isset($key): bool
+	{
+		return in_array($key, ['key', 'digest', 'driver', 'drivers'], true);
+	}
+
 }

system/Encryption/Handlers/BaseHandler.php

@@ -110,4 +110,14 @@ public function __get($key)
 		return null;
 	}
 
+	/**
+	 * __isset() magic, providing checking for some of our properties
+	 *
+	 * @param  string $key Property name
+	 * @return bool
+	 */
+	public function __isset($key): bool
+	{
+		return in_array($key, ['cipher', 'key'], true);
+	}
 }

system/I18n/Time.php

@@ -1342,4 +1342,20 @@ public function __get($name)
 		return null;
 	}
 
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allow for property-type checking to any getX method...
+	 *
+	 * @param $name
+	 *
+	 * @return bool
+	 */
+	public function __isset($name): bool
+	{
+		$method = 'get' . ucfirst($name);
+
+		return method_exists($this, $method);
+	}
+
 }

system/I18n/TimeDifference.php

@@ -345,4 +345,19 @@ public function __get($name)
 
 		return null;
 	}
+
+	/**
+	 * Allow property-like checking for our calculated values.
+	 *
+	 * @param $name
+	 *
+	 * @return bool
+	 */
+	public function __isset($name)
+	{
+		$name   = ucfirst(strtolower($name));
+		$method = "get{$name}";
+
+		return method_exists($this, $method);
+	}
 }

system/Model.php

@@ -1634,6 +1634,31 @@ public function __get(string $name)
 		return null;
 	}
 
+	/**
+	 * Checks for the existence of properties across this model, builder, and db connection.
+	 *
+	 * @param string $name
+	 *
+	 * @return bool
+	 */
+	public function __isset(string $name): bool
+	{
+		if (in_array($name, ['primaryKey', 'table', 'returnType', 'DBGroup']))
+		{
+			return true;
+		}
+		elseif (isset($this->db->$name))
+		{
+			return true;
+		}
+		elseif (isset($this->builder()->$name))
+		{
+			return true;
+		}
+
+		return false;
+	}
+
 	//--------------------------------------------------------------------
 
 	/**

system/Session/Session.php

@@ -624,6 +624,22 @@ public function __get(string $key)
 		return null;
 	}
 
+	//--------------------------------------------------------------------
+
+	/**
+	 * Magic method to check for session variables
+	 *
+	 * @param string $key Identifier of the session property to remove.
+	 *
+	 * @return bool
+	 */
+	public function __isset(string $key): bool
+	{
+		// Note: Keep this order the same, just in case somebody wants to
+		//       use 'session_id' as a session data key, for whatever reason
+		return isset($_SESSION[$key]) || ($key === 'session_id');
+	}
+
 	//--------------------------------------------------------------------
 	//--------------------------------------------------------------------
 	// Flash Data Methods