Convert Object class to BaseObject in core classes

classes/context/Context.class.php

@@ -1904,7 +1904,7 @@ class Context
 	/**
 	 * Return values from the GET/POST/XMLRPC
 	 *
-	 * @return Object Request variables.
+	 * @return object Request variables.
 	 */
 	public static function getRequestVars()
 	{

classes/db/DB.class.php

@@ -143,7 +143,7 @@ class DB
 		}
 		if(!$db_type && Context::isInstalled())
 		{
-			return new Object(-1, 'msg_db_not_setted');
+			return new BaseObject(-1, 'msg_db_not_setted');
 		}
 
 		if(!isset($GLOBALS['__DB__']))
@@ -156,7 +156,7 @@ class DB
 			$class_file = RX_BASEDIR . "classes/db/$class_name.class.php";
 			if(!file_exists($class_file))
 			{
-				return new Object(-1, 'msg_db_not_setted');
+				return new BaseObject(-1, 'msg_db_not_setted');
 			}
 
 			// get a singletone instance of the database driver class
@@ -449,7 +449,7 @@ class DB
 	public function getError()
 	{
 		$this->errstr = Context::convertEncodingStr($this->errstr);
-		return new Object($this->errno, $this->errstr);
+		return new BaseObject($this->errno, $this->errstr);
 	}
 
 	/**
@@ -466,7 +466,7 @@ class DB
 
 		if(!$query_id)
 		{
-			return new Object(-1, 'msg_invalid_queryid');
+			return new BaseObject(-1, 'msg_invalid_queryid');
 		}
 		if(!$this->db_type)
 		{
@@ -501,14 +501,14 @@ class DB
 			if(!$target || !$module || !$id)
 			{
 				$this->actDBClassFinish();
-				return new Object(-1, 'msg_invalid_queryid');
+				return new BaseObject(-1, 'msg_invalid_queryid');
 			}
 
 			$xml_file = sprintf('%s%s/%s/queries/%s.xml', _XE_PATH_, $target, $module, $id);
 			if(!file_exists($xml_file))
 			{
 				$this->actDBClassFinish();
-				return new Object(-1, 'msg_invalid_queryid');
+				return new BaseObject(-1, 'msg_invalid_queryid');
 			}
 
 			// look for cache file
@@ -564,7 +564,7 @@ class DB
 
 		if(!file_exists($cache_file))
 		{
-			return new Object(-1, 'msg_invalid_queryid');
+			return new BaseObject(-1, 'msg_invalid_queryid');
 		}
 
 		if (is_object($source_args))
@@ -582,13 +582,13 @@ class DB
 
 		$output = include($cache_file);
 
-		if($output instanceof Object && !$output->toBool())
+		if($output instanceof BaseObject && !$output->toBool())
 		{
 			return $output;
 		}
 		if(!is_object($output) || !method_exists($output, 'getAction'))
 		{
-			return new Object(-1, sprintf(lang('msg_failed_to_load_query'), $query_id));
+			return new BaseObject(-1, sprintf(lang('msg_failed_to_load_query'), $query_id));
 		}
 
 		// execute appropriate query
@@ -619,9 +619,9 @@ class DB
 		{
 			$output = $this->getError();
 		}
-		elseif(!($output instanceof Object))
+		elseif(!($output instanceof BaseObject))
 		{
-			$output = new Object();
+			$output = new BaseObject();
 		}
 		$output->add('_query', $this->query);
 		$output->add('_elapsed_time', sprintf("%0.5f", $this->elapsed_time));
@@ -688,14 +688,14 @@ class DB
 		$select = $query->getSelectString($with_values);
 		if($select == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		$select = 'SELECT ' . $select;
 
 		$from = $query->getFromString($with_values);
 		if($from == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		$from = ' FROM ' . $from;
 
@@ -790,7 +790,7 @@ class DB
 		$from = $query->getFromString($with_values);
 		if($from == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		$sql .= ' FROM ' . $from;
 
@@ -815,13 +815,13 @@ class DB
 		$columnsList = $query->getUpdateString($with_values);
 		if($columnsList == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 
 		$tables = $query->getFromString($with_values);
 		if($tables == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 
 		$where = $query->getWhereString($with_values);

classes/db/DBCubrid.class.php

@@ -624,7 +624,7 @@ class DBCubrid extends DB
 	 * Get information about a column
 	 * @param string $table_name table name
 	 * @param string $column_name column name
-	 * @return object
+	 * @return BaseObject
 	 */
 	function getColumnInfo($table_name, $column_name)
 	{
@@ -982,7 +982,7 @@ class DBCubrid extends DB
 
 	/**
 	 * Handles insertAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
@@ -994,7 +994,7 @@ class DBCubrid extends DB
 			$with_values = FALSE;
 		}
 		$query = $this->getInsertSql($queryObject, $with_values);
-		if(is_a($query, 'Object'))
+		if($query instanceof BaseObject)
 		{
 			unset($this->param);
 			return;
@@ -1011,7 +1011,7 @@ class DBCubrid extends DB
 
 	/**
 	 * Handles updateAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
@@ -1023,7 +1023,7 @@ class DBCubrid extends DB
 			$with_values = FALSE;
 		}
 		$query = $this->getUpdateSql($queryObject, $with_values);
-		if(is_a($query, 'Object'))
+		if($query instanceof BaseObject)
 		{
 			unset($this->param);
 			return;
@@ -1041,7 +1041,7 @@ class DBCubrid extends DB
 
 	/**
 	 * Handles deleteAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
@@ -1053,7 +1053,7 @@ class DBCubrid extends DB
 			$with_values = FALSE;
 		}
 		$query = $this->getDeleteSql($queryObject, $with_values);
-		if(is_a($query, 'Object'))
+		if($query instanceof BaseObject)
 		{
 			unset($this->param);
 			return;
@@ -1074,10 +1074,10 @@ class DBCubrid extends DB
 	 * Handle selectAct
 	 * To get a specific page list easily in select statement,
 	 * a method, navigation, is used
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param resource $connection
 	 * @param boolean $with_values
-	 * @return Object
+	 * @return BaseObject
 	 */
 	function _executeSelectAct($queryObject, $connection = NULL, $with_values = TRUE)
 	{
@@ -1094,7 +1094,7 @@ class DBCubrid extends DB
 		else
 		{
 			$query = $this->getSelectSql($queryObject, $with_values);
-			if(is_a($query, 'Object'))
+			if($query instanceof BaseObject)
 			{
 				unset($this->param);
 				return;
@@ -1109,7 +1109,7 @@ class DBCubrid extends DB
 			}
 
 			$data = $this->_fetch($result);
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->data = $data;
 
 			unset($this->param);
@@ -1119,15 +1119,15 @@ class DBCubrid extends DB
 
 	/**
 	 * If have a error, return error object
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
-	 * @return Object
+	 * @return BaseObject
 	 */
 	function queryError($queryObject)
 	{
 		$limit = $queryObject->getLimit();
 		if($limit && $limit->isPageHandler())
 		{
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->total_count = 0;
 			$buff->total_page = 0;
 			$buff->page = 1;
@@ -1140,10 +1140,10 @@ class DBCubrid extends DB
 
 	/**
 	 * If select query execute, return page info
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param resource $connection
 	 * @param boolean $with_values
-	 * @return Object Object with page info containing
+	 * @return BaseObject Object with page info containing
 	 */
 	function queryPageLimit($queryObject, $connection, $with_values)
 	{
@@ -1204,7 +1204,7 @@ class DBCubrid extends DB
 		{
 			// If requested page is bigger than total number of pages, return empty list
 
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->total_count = $total_count;
 			$buff->total_page = $total_page;
 			$buff->page = $page;
@@ -1226,7 +1226,7 @@ class DBCubrid extends DB
 		$virtual_no = $total_count - ($page - 1) * $list_count;
 		$data = $this->_fetch($result, $virtual_no);
 
-		$buff = new Object ();
+		$buff = new BaseObject;
 		$buff->total_count = $total_count;
 		$buff->total_page = $total_page;
 		$buff->page = $page;
@@ -1260,14 +1260,14 @@ class DBCubrid extends DB
 		$select = $query->getSelectString($with_values);
 		if($select == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		$select = 'SELECT ' . $select;
 
 		$from = $query->getFromString($with_values);
 		if($from == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		$from = ' FROM ' . $from;
 

classes/db/DBMssql.class.php

@@ -494,7 +494,7 @@ class DBMssql extends DB
 	 * Get information about a column
 	 * @param string $table_name table name
 	 * @param string $column_name column name
-	 * @return object
+	 * @return BaseObject
 	 */
 	function getColumnInfo($table_name, $column_name)
 	{
@@ -774,7 +774,7 @@ class DBMssql extends DB
 	/**
 	 * Handles insertAct
 	 * @todo Lookup _filterNumber against sql injection - see if it is still needed and how to integrate
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @return resource
 	 */
 	function _executeInsertAct($queryObject)
@@ -786,7 +786,7 @@ class DBMssql extends DB
 
 	/**
 	 * Handles updateAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @return resource
 	 */
 	function _executeUpdateAct($queryObject)
@@ -808,13 +808,13 @@ class DBMssql extends DB
 		$columnsList = $query->getUpdateString($with_values);
 		if($columnsList == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 
 		$from = $query->getFromString($with_values);
 		if($from == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 
 		$tables = $query->getTables();
@@ -838,7 +838,7 @@ class DBMssql extends DB
 
 	/**
 	 * Handles deleteAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @return resource
 	 */
 	function _executeDeleteAct($queryObject)
@@ -876,7 +876,7 @@ class DBMssql extends DB
 		$select = $query->getSelectString($with_values);
 		if($select == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		if($limit != '')
 		{
@@ -890,7 +890,7 @@ class DBMssql extends DB
 		$from = $query->getFromString($with_values);
 		if($from == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		$from = ' FROM ' . $from;
 
@@ -961,9 +961,9 @@ class DBMssql extends DB
 	 * Handle selectAct
 	 * In order to get a list of pages easily when selecting \n
 	 * it supports a method as navigation
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param resource $connection
-	 * @return Object
+	 * @return BaseObject
 	 */
 	function _executeSelectAct($queryObject, $connection = null)
 	{
@@ -1000,15 +1000,15 @@ class DBMssql extends DB
 
 	/**
 	 * If have a error, return error object
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
-	 * @return Object
+	 * @return BaseObject
 	 */
 	function queryError($queryObject)
 	{
 		$limit = $queryObject->getLimit();
 		if($limit && $limit->isPageHandler())
 		{
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->total_count = 0;
 			$buff->total_page = 0;
 			$buff->page = 1;
@@ -1024,10 +1024,10 @@ class DBMssql extends DB
 
 	/**
 	 * If select query execute, return page info
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param resource $result
 	 * @param resource $connection
-	 * @return Object Object with page info containing
+	 * @return BaseObject Object with page info containing
 	 */
 	function queryPageLimit($queryObject, $result, $connection)
 	{
@@ -1090,7 +1090,7 @@ class DBMssql extends DB
 			{
 				// If requested page is bigger than total number of pages, return empty list
 
-				$buff = new Object ();
+				$buff = new BaseObject;
 				$buff->total_count = $total_count;
 				$buff->total_page = $total_page;
 				$buff->page = $page;
@@ -1110,7 +1110,7 @@ class DBMssql extends DB
 			$virtual_no = $total_count - $start_count;
 			$data = $this->_fetch($result, $virtual_no);
 
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->total_count = $total_count;
 			$buff->total_page = $total_page;
 			$buff->page = $page;
@@ -1120,7 +1120,7 @@ class DBMssql extends DB
 		else
 		{
 			$data = $this->_fetch($result);
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->data = $data;
 		}
 		return $buff;

classes/db/DBMysql.class.php

@@ -397,7 +397,7 @@ class DBMysql extends DB
 	 * Get information about a column
 	 * @param string $table_name table name
 	 * @param string $column_name column name
-	 * @return object
+	 * @return BaseObject
 	 */
 	function getColumnInfo($table_name, $column_name)
 	{
@@ -708,14 +708,14 @@ class DBMysql extends DB
 
 	/**
 	 * Handles insertAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
 	function _executeInsertAct($queryObject, $with_values = true)
 	{
 		$query = $this->getInsertSql($queryObject, $with_values, true);
-		if(is_a($query, 'Object'))
+		if($query instanceof BaseObject)
 		{
 			return;
 		}
@@ -724,14 +724,14 @@ class DBMysql extends DB
 
 	/**
 	 * Handles updateAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
 	function _executeUpdateAct($queryObject, $with_values = true)
 	{
 		$query = $this->getUpdateSql($queryObject, $with_values, true);
-		if(is_a($query, 'Object'))
+		if($query instanceof BaseObject)
 		{
 			if(!$query->toBool()) return $query;
 			else return;
@@ -741,14 +741,14 @@ class DBMysql extends DB
 
 	/**
 	 * Handles deleteAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
 	function _executeDeleteAct($queryObject, $with_values = true)
 	{
 		$query = $this->getDeleteSql($queryObject, $with_values, true);
-		if(is_a($query, 'Object'))
+		if($query instanceof BaseObject)
 		{
 			return;
 		}
@@ -759,10 +759,10 @@ class DBMysql extends DB
 	 * Handle selectAct
 	 * In order to get a list of pages easily when selecting \n
 	 * it supports a method as navigation
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param resource $connection
 	 * @param boolean $with_values
-	 * @return Object
+	 * @return BaseObject
 	 */
 	function _executeSelectAct($queryObject, $connection = null, $with_values = true)
 	{
@@ -775,7 +775,7 @@ class DBMysql extends DB
 		else
 		{
 			$query = $this->getSelectSql($queryObject, $with_values);
-			if(is_a($query, 'Object'))
+			if($query instanceof BaseObject)
 			{
 				return;
 			}
@@ -787,7 +787,7 @@ class DBMysql extends DB
 			}
 
 			$data = $this->_fetch($result);
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->data = $data;
 
 			if($queryObject->usesClickCount())
@@ -815,7 +815,7 @@ class DBMysql extends DB
 	/**
 	 * Fetch a result row as an object
 	 * @param resource $result
-	 * @return object
+	 * @return BaseObject
 	 */
 	function db_fetch_object(&$result)
 	{
@@ -845,15 +845,15 @@ class DBMysql extends DB
 
 	/**
 	 * If have a error, return error object
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
-	 * @return Object
+	 * @return BaseObject
 	 */
 	function queryError($queryObject)
 	{
 		$limit = $queryObject->getLimit();
 		if($limit && $limit->isPageHandler())
 		{
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->total_count = 0;
 			$buff->total_page = 0;
 			$buff->page = 1;
@@ -869,11 +869,11 @@ class DBMysql extends DB
 
 	/**
 	 * If select query execute, return page info
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param resource $result
 	 * @param resource $connection
 	 * @param boolean $with_values
-	 * @return Object Object with page info containing
+	 * @return BaseObject Object with page info containing
 	 */
 	function queryPageLimit($queryObject, $result, $connection, $with_values = true)
 	{
@@ -933,7 +933,7 @@ class DBMysql extends DB
 		if($page > $total_page)
 		{
 			// If requested page is bigger than total number of pages, return empty list
-			$buff = new Object ();
+			$buff = new BaseObject;
 			$buff->total_count = $total_count;
 			$buff->total_page = $total_page;
 			$buff->page = $page;
@@ -954,7 +954,7 @@ class DBMysql extends DB
 		$virtual_no = $total_count - ($page - 1) * $list_count;
 		$data = $this->_fetch($result, $virtual_no);
 
-		$buff = new Object ();
+		$buff = new BaseObject;
 		$buff->total_count = $total_count;
 		$buff->total_page = $total_page;
 		$buff->page = $page;
@@ -976,14 +976,14 @@ class DBMysql extends DB
 		$select = $query->getSelectString($with_values);
 		if($select == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		$select = 'SELECT ' . $select;
 
 		$from = $query->getFromString($with_values);
 		if($from == '')
 		{
-			return new Object(-1, "Invalid query");
+			return new BaseObject(-1, "Invalid query");
 		}
 		$from = ' FROM ' . $from;
 

classes/db/DBMysqli.class.php

@@ -299,7 +299,7 @@ class DBMysqli extends DBMysql
 
 	/**
 	 * Handles insertAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
@@ -317,7 +317,7 @@ class DBMysqli extends DBMysql
 
 	/**
 	 * Handles updateAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
@@ -335,7 +335,7 @@ class DBMysqli extends DBMysql
 
 	/**
 	 * Handles deleteAct
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param boolean $with_values
 	 * @return resource
 	 */
@@ -355,10 +355,10 @@ class DBMysqli extends DBMysql
 	 * Handle selectAct
 	 * In order to get a list of pages easily when selecting \n
 	 * it supports a method as navigation
-	 * @param Object $queryObject
+	 * @param BaseObject $queryObject
 	 * @param resource $connection
 	 * @param boolean $with_values
-	 * @return Object
+	 * @return BaseObject
 	 */
 	function _executeSelectAct($queryObject, $connection = null, $with_values = false)
 	{
@@ -387,7 +387,7 @@ class DBMysqli extends DBMysql
 	/**
 	 * Fetch a result row as an object
 	 * @param resource $result
-	 * @return object
+	 * @return BaseObject
 	 */
 	function db_fetch_object(&$result)
 	{

classes/db/queryparts/Query.class.php

@@ -6,7 +6,7 @@
  * @package /classes/db/queryparts
  * @version 0.1
  */
-class Query extends Object
+class Query extends BaseObject
 {
 
 	/**

classes/display/DisplayHandler.class.php

@@ -68,7 +68,7 @@ class DisplayHandler extends Handler
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
 		if(file_exists($addon_file)) include($addon_file);
-		if($output === false || $output === null || $output instanceof Object)
+		if($output === false || $output === null || $output instanceof BaseObject)
 		{
 			$output = $original_output;
 		}

classes/editor/EditorHandler.class.php

@@ -8,7 +8,7 @@
  * @class EditorHandler
  * @author NAVER (developers@xpressengine.com)
  */
-class EditorHandler extends Object
+class EditorHandler extends BaseObject
 {
 
 	/**

classes/file/FileObject.class.php

@@ -6,7 +6,7 @@
  *
  * @author NAVER (developers@xpressengine.com)
  */
-class FileObject extends Object
+class FileObject extends BaseObject
 {
 
 	/**
@@ -50,7 +50,7 @@ class FileObject extends Object
 	 */
 	function append($file_name)
 	{
-		$target = new FileObject($file_name, "r");
+		$target = new self($file_name, "r");
 		while(!$target->feof())
 		{
 			$readstr = $target->read();

classes/httprequest/XEHttpRequest.class.php

@@ -125,7 +125,7 @@ class XEHttpRequest
 		$sock = @fsockopen($scheme . $this->m_host, $this->m_port, $errno, $errstr, $timeout);
 		if(!$sock)
 		{
-			return new Object(-1, 'socket_connect_failed');
+			return new BaseObject(-1, 'socket_connect_failed');
 		}
 
 		$headers = $this->m_headers + array();
@@ -242,7 +242,7 @@ class XEHttpRequest
 		$body = curl_exec($ch);
 		if(curl_errno($ch))
 		{
-			return new Object(-1, 'socket_connect_failed');
+			return new BaseObject(-1, 'socket_connect_failed');
 		}
 
 		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);

classes/module/ModuleHandler.class.php

@@ -18,7 +18,7 @@ class ModuleHandler extends Handler
 	var $mid = NULL; ///< Module ID
 	var $document_srl = NULL; ///< Document Number
 	var $module_srl = NULL; ///< Module Number
-	var $module_info = NULL; ///< Module Info. Object
+	var $module_info = NULL; ///< Module Info
 	var $error = NULL; ///< an error code.
 	var $httpStatusCode = NULL; ///< http status code.
 
@@ -1237,14 +1237,14 @@ class ModuleHandler extends Handler
 	 * @param string $trigger_name trigger's name to call
 	 * @param string $called_position called position
 	 * @param object $obj an object as a parameter to trigger
-	 * @return Object
+	 * @return BaseObject
 	 * */
 	public static function triggerCall($trigger_name, $called_position, &$obj)
 	{
 		// skip if not installed
 		if(!Context::isInstalled())
 		{
-			return new Object();
+			return new BaseObject();
 		}
 
 		$oModuleModel = getModel('module');
@@ -1292,7 +1292,7 @@ class ModuleHandler extends Handler
 				));
 			}
 
-			if(is_object($output) && method_exists($output, 'toBool') && !$output->toBool())
+			if($output instanceof BaseObject && !$output->toBool())
 			{
 				return $output;
 			}
@@ -1342,7 +1342,7 @@ class ModuleHandler extends Handler
 			}
 		}
 
-		return new Object();
+		return new BaseObject();
 	}
 
 	/**

classes/module/ModuleObject.class.php

@@ -6,7 +6,7 @@
  * @author NAVER (developers@xpressengine.com)
  * base class of ModuleHandler
  * */
-class ModuleObject extends Object
+class ModuleObject extends BaseObject
 {
 
 	var $mid = NULL; ///< string to represent run-time instance of Module (XE Module)
@@ -561,7 +561,7 @@ class ModuleObject extends Object
 		}
 
 		// check return value of action
-		if($output instanceof Object)
+		if($output instanceof BaseObject)
 		{
 			$this->setError($output->getError());
 			$this->setMessage($output->getMessage());
@@ -587,11 +587,11 @@ class ModuleObject extends Object
 		$addon_file = $oAddonController->getCacheFilePath($is_mobile ? "mobile" : "pc");
 		if(FileHandler::exists($addon_file)) include($addon_file);
 
-		if($original_output instanceof Object && !$original_output->toBool())
+		if($original_output instanceof BaseObject && !$original_output->toBool())
 		{
 			return FALSE;
 		}
-		elseif($output instanceof Object && $output->getError())
+		elseif($output instanceof BaseObject && $output->getError())
 		{
 			$this->setError($output->getError());
 			$this->setMessage($output->getMessage());

classes/object/Object.class.php

@@ -2,11 +2,11 @@
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
- * Every modules inherits from Object class. It includes error, message, and other variables for communicatin purpose.
+ * Every module inherits from BaseObject class.
  *
  * @author NAVER (developers@xpressengine.com)
  */
-class Object
+class BaseObject
 {
 
 	/**
@@ -180,18 +180,18 @@ class Object
 	/**
 	 * Method to set multiple key/value pairs as an additional variables
 	 *
-	 * @param Object|array $object Either object or array containg key/value pairs to be added
+	 * @param object|array $vars Either object or array containg key/value pairs to be added
 	 * @return $this
 	 */
-	function adds($object)
+	function adds($vars)
 	{
-		if(is_object($object))
+		if(is_object($vars))
 		{
-			$object = get_object_vars($object);
+			$vars = get_object_vars($vars);
 		}
-		if(is_array($object))
+		if(is_array($vars))
 		{
-			foreach($object as $key => $val)
+			foreach($vars as $key => $val)
 			{
 				$this->variables[$key] = $val;
 			}
@@ -213,7 +213,7 @@ class Object
 	/**
 	 * Method to retrieve an object containing a key/value pairs
 	 *
-	 * @return Object Returns an object containing key/value pairs
+	 * @return object Returns an object containing key/value pairs
 	 */
 	function gets()
 	{
@@ -239,7 +239,7 @@ class Object
 	/**
 	 * Method to retrieve an object of key/value pairs
 	 *
-	 * @return Object
+	 * @return object
 	 */
 	function getObjectVars()
 	{
@@ -271,7 +271,15 @@ class Object
 	{
 		return $this->toBool();
 	}
-
 }
+
+/**
+ * Alias to Object for backward compatibility.
+ */
+if (version_compare(PHP_VERSION, '7.2', '<'))
+{
+	class_alias('BaseObject', 'Object');
+}
+
 /* End of file Object.class.php */
-/* Location: ./classes/object/Object.class.php */
+/* Location: ./classes/object/Object.class.php */

classes/xml/xmlquery/argument/Argument.class.php

@@ -36,7 +36,7 @@ class Argument
 
 	/**
 	 * error message
-	 * @var Object
+	 * @var BaseObject
 	 */
 	var $errorMessage;
 
@@ -310,14 +310,14 @@ class Argument
 					if(!preg_match('/^[\w-]+((?:\.|\+|\~)[\w-]+)*@[\w-]+(\.[\w-]+)+$/is', $val))
 					{
 						$this->isValid = FALSE;
-						$this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_email, $lang->{$key} ? $lang->{$key} : $key));
+						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_email, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'homepage' :
 					if(!preg_match('/^(http|https)+(:\/\/)+[0-9a-z_-]+\.[^ ]+$/is', $val))
 					{
 						$this->isValid = FALSE;
-						$this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_homepage, $lang->{$key} ? $lang->{$key} : $key));
+						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_homepage, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'userid' :
@@ -325,7 +325,7 @@ class Argument
 					if(!preg_match('/^[a-zA-Z]+([_0-9a-zA-Z]+)*$/is', $val))
 					{
 						$this->isValid = FALSE;
-						$this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_userid, $lang->{$key} ? $lang->{$key} : $key));
+						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_userid, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'number' :
@@ -337,21 +337,21 @@ class Argument
 					if(!preg_match('/^(-?)[0-9]+(,\-?[0-9]+)*$/is', $val))
 					{
 						$this->isValid = FALSE;
-						$this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_number, $lang->{$key} ? $lang->{$key} : $key));
+						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_number, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'alpha' :
 					if(!preg_match('/^[a-z]+$/is', $val))
 					{
 						$this->isValid = FALSE;
-						$this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_alpha, $lang->{$key} ? $lang->{$key} : $key));
+						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_alpha, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'alpha_number' :
 					if(!preg_match('/^[0-9a-z]+$/is', $val))
 					{
 						$this->isValid = FALSE;
-						$this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_alpha_number, $lang->{$key} ? $lang->{$key} : $key));
+						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_alpha_number, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 			}
@@ -365,7 +365,7 @@ class Argument
 			global $lang;
 			$this->isValid = FALSE;
 			$key = $this->name;
-			$this->errorMessage = new Object(-1, sprintf($lang->filter->outofrange, $lang->{$key} ? $lang->{$key} : $key));
+			$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->outofrange, $lang->{$key} ? $lang->{$key} : $key));
 		}
 	}
 
@@ -376,7 +376,7 @@ class Argument
 			global $lang;
 			$this->isValid = FALSE;
 			$key = $this->name;
-			$this->errorMessage = new Object(-1, sprintf($lang->filter->outofrange, $lang->{$key} ? $lang->{$key} : $key));
+			$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->outofrange, $lang->{$key} ? $lang->{$key} : $key));
 		}
 	}
 
@@ -387,7 +387,7 @@ class Argument
 			global $lang;
 			$this->isValid = FALSE;
 			$key = $this->name;
-			$this->errorMessage = new Object(-1, sprintf($lang->filter->isnull, $lang->{$key} ? $lang->{$key} : $key));
+			$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->isnull, $lang->{$key} ? $lang->{$key} : $key));
 		}
 	}
 

common/autoload.php

@@ -98,6 +98,7 @@ $GLOBALS['RX_AUTOLOAD_FILE_MAP'] = array_change_key_case(array(
 	'Mobile' => 'classes/mobile/Mobile.class.php',
 	'ModuleHandler' => 'classes/module/ModuleHandler.class.php',
 	'ModuleObject' => 'classes/module/ModuleObject.class.php',
+	'BaseObject' => 'classes/object/Object.class.php',
 	'Object' => 'classes/object/Object.class.php',
 	'PageHandler' => 'classes/page/PageHandler.class.php',
 	'EmbedFilter' => 'classes/security/EmbedFilter.class.php',