fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 01:01:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Convert Object class to BaseObject in core classes

Browse source
This commit is contained in:
Kijin Sung 2017-11-27 22:34:28 +09:00
parent 5bdf95932f
commit 1a81fd43f3
16 changed files with 129 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

32
classes/object/Object.class.php
View file

@ -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 */