Rename Object -> BaseObject for PHP 7.2 compatibility

issue #7936

framework/base/BaseObject.php

@@ -74,7 +74,7 @@ use Yii;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Object implements Configurable
+class BaseObject implements Configurable
 {
     /**
      * Returns the fully qualified name of this class.

framework/base/Behavior.php

@@ -20,7 +20,7 @@ namespace yii\base;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Behavior extends Object
+class Behavior extends BaseObject
 {
     /**
      * @var Component|null the owner of this behavior

framework/base/Component.php

@@ -97,7 +97,7 @@ use Yii;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Component extends Object
+class Component extends BaseObject
 {
     /**
      * @var array the attached event handlers (event name => handlers)

framework/base/Event.php

@@ -24,7 +24,7 @@ namespace yii\base;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Event extends Object
+class Event extends BaseObject
 {
     /**
      * @var string the event name. This property is set by [[Component::trigger()]] and [[trigger()]].

framework/caching/Dependency.php

@@ -18,7 +18,7 @@ namespace yii\caching;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-abstract class Dependency extends \yii\base\Object
+abstract class Dependency extends \yii\base\BaseObject
 {
     /**
      * @var mixed the dependency data that is saved in cache and later is compared with the

framework/caching/MemCacheServer.php

@@ -18,7 +18,7 @@ namespace yii\caching;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class MemCacheServer extends \yii\base\Object
+class MemCacheServer extends \yii\base\BaseObject
 {
     /**
      * @var string memcache server hostname or IP address

framework/data/Pagination.php

@@ -8,7 +8,7 @@
 namespace yii\data;
 
 use Yii;
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\web\Link;
 use yii\web\Linkable;
 use yii\web\Request;
@@ -73,7 +73,7 @@ use yii\web\Request;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Pagination extends Object implements Linkable
+class Pagination extends BaseObject implements Linkable
 {
     const LINK_NEXT = 'next';
     const LINK_PREV = 'prev';

framework/data/Sort.php

@@ -9,7 +9,7 @@ namespace yii\data;
 
 use Yii;
 use yii\base\InvalidConfigException;
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\helpers\Html;
 use yii\helpers\Inflector;
 use yii\web\Request;
@@ -77,7 +77,7 @@ use yii\web\Request;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Sort extends Object
+class Sort extends BaseObject
 {
     /**
      * @var bool whether the sorting can be applied to multiple attributes simultaneously.

framework/db/BatchQueryResult.php

@@ -7,7 +7,7 @@
 
 namespace yii\db;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * BatchQueryResult represents a batch query from which you can retrieve data in batches.
@@ -28,7 +28,7 @@ use yii\base\Object;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class BatchQueryResult extends Object implements \Iterator
+class BatchQueryResult extends BaseObject implements \Iterator
 {
     /**
      * @var Connection the DB connection to be used when performing batch query.

framework/db/ColumnSchema.php

@@ -7,7 +7,7 @@
 
 namespace yii\db;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * ColumnSchema class describes the metadata of a column in a database table.
@@ -15,7 +15,7 @@ use yii\base\Object;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class ColumnSchema extends Object
+class ColumnSchema extends BaseObject
 {
     /**
      * @var string name of this column (without quotes).

framework/db/ColumnSchemaBuilder.php

@@ -8,7 +8,7 @@
 namespace yii\db;
 
 use Yii;
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * ColumnSchemaBuilder helps to define database schema types using a PHP interface.
@@ -18,7 +18,7 @@ use yii\base\Object;
  * @author Vasenin Matvey <vaseninm@gmail.com>
  * @since 2.0.6
  */
-class ColumnSchemaBuilder extends Object
+class ColumnSchemaBuilder extends BaseObject
 {
     // Internally used constants representing categories that abstract column types fall under.
     // See [[$categoryMap]] for mappings of abstract column types to category.

framework/db/Constraint.php

@@ -7,7 +7,7 @@
 
 namespace yii\db;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * Constraint represents the metadata of a table constraint.
@@ -15,7 +15,7 @@ use yii\base\Object;
  * @author Sergey Makinen <sergey@makinen.ru>
  * @since 2.0.13
  */
-class Constraint extends Object
+class Constraint extends BaseObject
 {
     /**
      * @var string[]|null list of column names the constraint belongs to.

framework/db/DataReader.php

@@ -48,7 +48,7 @@ use yii\base\InvalidCallException;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class DataReader extends \yii\base\Object implements \Iterator, \Countable
+class DataReader extends \yii\base\BaseObject implements \Iterator, \Countable
 {
     /**
      * @var \PDOStatement the PDOStatement associated with the command

framework/db/Expression.php

@@ -28,7 +28,7 @@ namespace yii\db;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Expression extends \yii\base\Object
+class Expression extends \yii\base\BaseObject
 {
     /**
      * @var string the DB expression

framework/db/QueryBuilder.php

@@ -23,7 +23,7 @@ use yii\helpers\ArrayHelper;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class QueryBuilder extends \yii\base\Object
+class QueryBuilder extends \yii\base\BaseObject
 {
     /**
      * The prefix for automatically generated query binding parameters.

framework/db/Schema.php

@@ -11,7 +11,7 @@ use Yii;
 use yii\base\InvalidCallException;
 use yii\base\InvalidConfigException;
 use yii\base\NotSupportedException;
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\caching\Cache;
 use yii\caching\CacheInterface;
 use yii\caching\TagDependency;
@@ -38,7 +38,7 @@ use yii\caching\TagDependency;
  * @author Sergey Makinen <sergey@makinen.ru>
  * @since 2.0
  */
-abstract class Schema extends Object
+abstract class Schema extends BaseObject
 {
     // The following are the supported abstract column data types.
     const TYPE_PK = 'pk';

framework/db/SqlToken.php

@@ -7,7 +7,7 @@
 
 namespace yii\db;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * SqlToken represents SQL tokens produced by [[SqlTokenizer]] or its child classes.
@@ -21,7 +21,7 @@ use yii\base\Object;
  * @author Sergey Makinen <sergey@makinen.ru>
  * @since 2.0.13
  */
-class SqlToken extends Object implements \ArrayAccess
+class SqlToken extends BaseObject implements \ArrayAccess
 {
     const TYPE_CODE = 0;
     const TYPE_STATEMENT = 1;

framework/db/TableSchema.php

@@ -8,7 +8,7 @@
 namespace yii\db;
 
 use yii\base\InvalidParamException;
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * TableSchema represents the metadata of a database table.
@@ -18,7 +18,7 @@ use yii\base\Object;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class TableSchema extends Object
+class TableSchema extends BaseObject
 {
     /**
      * @var string the name of the schema that this table belongs to.

framework/db/Transaction.php

@@ -49,7 +49,7 @@ use yii\base\InvalidConfigException;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Transaction extends \yii\base\Object
+class Transaction extends \yii\base\BaseObject
 {
     /**
      * A constant representing the transaction isolation level `READ UNCOMMITTED`.

framework/grid/Column.php

@@ -8,7 +8,7 @@
 namespace yii\grid;
 
 use Closure;
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\helpers\Html;
 
 /**
@@ -19,7 +19,7 @@ use yii\helpers\Html;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Column extends Object
+class Column extends BaseObject
 {
     /**
      * @var GridView the grid view object that owns this column.

framework/mail/BaseMessage.php

@@ -9,7 +9,7 @@ namespace yii\mail;
 
 use Yii;
 use yii\base\ErrorHandler;
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * BaseMessage serves as a base class that implements the [[send()]] method required by [[MessageInterface]].
@@ -22,7 +22,7 @@ use yii\base\Object;
  * @author Paul Klimov <klimov.paul@gmail.com>
  * @since 2.0
  */
-abstract class BaseMessage extends Object implements MessageInterface
+abstract class BaseMessage extends BaseObject implements MessageInterface
 {
     /**
      * @var MailerInterface the mailer instance that created this message.

framework/rbac/Assignment.php

@@ -8,7 +8,7 @@
 namespace yii\rbac;
 
 use Yii;
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * Assignment represents an assignment of a role to a user.
@@ -19,7 +19,7 @@ use yii\base\Object;
  * @author Alexander Kochetov <creocoder@gmail.com>
  * @since 2.0
  */
-class Assignment extends Object
+class Assignment extends BaseObject
 {
     /**
      * @var string|int user ID (see [[\yii\web\User::id]])

framework/rbac/Item.php

@@ -7,7 +7,7 @@
 
 namespace yii\rbac;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * For more details and usage information on Item, see the [guide article on security authorization](guide:security-authorization).
@@ -15,7 +15,7 @@ use yii\base\Object;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Item extends Object
+class Item extends BaseObject
 {
     const TYPE_ROLE = 1;
     const TYPE_PERMISSION = 2;

framework/rbac/Rule.php

@@ -7,7 +7,7 @@
 
 namespace yii\rbac;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * Rule represents a business constraint that may be associated with a role, permission or assignment.
@@ -17,7 +17,7 @@ use yii\base\Object;
  * @author Alexander Makarov <sam@rmcreative.ru>
  * @since 2.0
  */
-abstract class Rule extends Object
+abstract class Rule extends BaseObject
 {
     /**
      * @var string name of the rule

framework/test/DbFixture.php

@@ -8,7 +8,7 @@
 namespace yii\test;
 
 use Yii;
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\db\Connection;
 use yii\di\Instance;
 
@@ -39,6 +39,6 @@ abstract class DbFixture extends Fixture
     public function init()
     {
         parent::init();
-        $this->db = Instance::ensure($this->db, Object::className());
+        $this->db = Instance::ensure($this->db, BaseObject::className());
     }
 }

framework/web/AssetBundle.php

@@ -8,7 +8,7 @@
 namespace yii\web;
 
 use Yii;
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Url;
 
@@ -27,7 +27,7 @@ use yii\helpers\Url;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class AssetBundle extends Object
+class AssetBundle extends BaseObject
 {
     /**
      * @var string the directory that contains the source asset files for this asset bundle.

framework/web/CompositeUrlRule.php

@@ -8,7 +8,7 @@
 namespace yii\web;
 
 use Yii;
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * CompositeUrlRule is the base class for URL rule classes that consist of multiple simpler rules.
@@ -19,7 +19,7 @@ use yii\base\Object;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-abstract class CompositeUrlRule extends Object implements UrlRuleInterface
+abstract class CompositeUrlRule extends BaseObject implements UrlRuleInterface
 {
     /**
      * @var UrlRuleInterface[] the URL rules contained in this composite rule.

framework/web/Cookie.php

@@ -15,7 +15,7 @@ namespace yii\web;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Cookie extends \yii\base\Object
+class Cookie extends \yii\base\BaseObject
 {
     /**
      * @var string name of the cookie

framework/web/CookieCollection.php

@@ -10,7 +10,7 @@ namespace yii\web;
 use ArrayIterator;
 use Yii;
 use yii\base\InvalidCallException;
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * CookieCollection maintains the cookies available in the current request.
@@ -24,7 +24,7 @@ use yii\base\Object;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class CookieCollection extends Object implements \IteratorAggregate, \ArrayAccess, \Countable
+class CookieCollection extends BaseObject implements \IteratorAggregate, \ArrayAccess, \Countable
 {
     /**
      * @var bool whether this collection is read only.

framework/web/HeaderCollection.php

@@ -9,7 +9,7 @@ namespace yii\web;
 
 use ArrayIterator;
 use Yii;
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * HeaderCollection is used by [[Response]] to maintain the currently registered HTTP headers.
@@ -21,7 +21,7 @@ use yii\base\Object;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class HeaderCollection extends Object implements \IteratorAggregate, \ArrayAccess, \Countable
+class HeaderCollection extends BaseObject implements \IteratorAggregate, \ArrayAccess, \Countable
 {
     /**
      * @var array the headers in this collection (indexed by the header names)

framework/web/JsExpression.php

@@ -7,7 +7,7 @@
 
 namespace yii\web;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * JsExpression marks a string as a JavaScript expression.
@@ -18,7 +18,7 @@ use yii\base\Object;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class JsExpression extends Object
+class JsExpression extends BaseObject
 {
     /**
      * @var string the JavaScript expression represented by this object

framework/web/Link.php

@@ -7,7 +7,7 @@
 
 namespace yii\web;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * Link represents a link object as defined in [JSON Hypermedia API Language](https://tools.ietf.org/html/draft-kelly-json-hal-03).
@@ -15,7 +15,7 @@ use yii\base\Object;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Link extends Object
+class Link extends BaseObject
 {
     /**
      * The self link.

framework/web/MultipartFormDataParser.php

@@ -7,7 +7,7 @@
 
 namespace yii\web;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\helpers\ArrayHelper;
 use yii\helpers\StringHelper;
 
@@ -63,7 +63,7 @@ use yii\helpers\StringHelper;
  * @author Paul Klimov <klimov.paul@gmail.com>
  * @since 2.0.10
  */
-class MultipartFormDataParser extends Object implements RequestParserInterface
+class MultipartFormDataParser extends BaseObject implements RequestParserInterface
 {
     /**
      * @var int upload file max size in bytes.

framework/web/UploadedFile.php

@@ -7,7 +7,7 @@
 
 namespace yii\web;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\helpers\Html;
 
 /**
@@ -28,7 +28,7 @@ use yii\helpers\Html;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class UploadedFile extends Object
+class UploadedFile extends BaseObject
 {
     /**
      * @var string the original name of the file being uploaded

framework/web/UrlNormalizer.php

@@ -9,7 +9,7 @@ namespace yii\web;
 
 use Yii;
 use yii\base\InvalidConfigException;
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * UrlNormalizer normalizes URLs for [[UrlManager]] and [[UrlRule]].
@@ -18,7 +18,7 @@ use yii\base\Object;
  * @author Cronfy <cronfy@gmail.com>
  * @since 2.0.10
  */
-class UrlNormalizer extends Object
+class UrlNormalizer extends BaseObject
 {
     /**
      * Represents permament redirection during route normalization.

framework/web/UrlRule.php

@@ -9,7 +9,7 @@ namespace yii\web;
 
 use Yii;
 use yii\base\InvalidConfigException;
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * UrlRule represents a rule used by [[UrlManager]] for parsing and generating URLs.
@@ -30,7 +30,7 @@ use yii\base\Object;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class UrlRule extends Object implements UrlRuleInterface
+class UrlRule extends BaseObject implements UrlRuleInterface
 {
     /**
      * Set [[mode]] with this value to mark that this rule is for URL parsing only

tests/framework/base/ObjectTest.php

@@ -7,7 +7,7 @@
 
 namespace yiiunit\framework\base;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 use yiiunit\TestCase;
 
 /**
@@ -162,7 +162,7 @@ class ObjectTest extends TestCase
 }
 
 
-class NewObject extends Object
+class NewObject extends BaseObject
 {
     private $_object = null;
     private $_text = 'default';

tests/framework/behaviors/BlameableBehaviorTest.php

@@ -8,7 +8,7 @@
 namespace yiiunit\framework\behaviors;
 
 use Yii;
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\behaviors\BlameableBehavior;
 use yii\db\ActiveRecord;
 use yii\db\BaseActiveRecord;
@@ -195,7 +195,7 @@ class ActiveRecordBlameable extends ActiveRecord
     }
 }
 
-class UserMock extends Object
+class UserMock extends BaseObject
 {
     public $id;
 

tests/framework/db/CompareValue.php

@@ -7,8 +7,8 @@
 
 namespace yiiunit\framework\db;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
-abstract class CompareValue extends Object
+abstract class CompareValue extends BaseObject
 {
 }

tests/framework/di/ServiceLocatorTest.php

@@ -7,7 +7,7 @@
 
 namespace yiiunit\framework\di;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\di\ServiceLocator;
 use yiiunit\TestCase;
 
@@ -19,7 +19,7 @@ class Creator
     }
 }
 
-class TestClass extends Object
+class TestClass extends BaseObject
 {
     public $prop1 = 1;
     public $prop2;

tests/framework/di/stubs/Bar.php

@@ -7,13 +7,13 @@
 
 namespace yiiunit\framework\di\stubs;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Bar extends Object
+class Bar extends BaseObject
 {
     public $qux;
 

tests/framework/di/stubs/Foo.php

@@ -7,13 +7,13 @@
 
 namespace yiiunit\framework\di\stubs;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Foo extends Object
+class Foo extends BaseObject
 {
     public $bar;
 

tests/framework/di/stubs/Qux.php

@@ -7,13 +7,13 @@
 
 namespace yiiunit\framework\di\stubs;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Qux extends Object implements QuxInterface
+class Qux extends BaseObject implements QuxInterface
 {
     public $a;
 

tests/framework/filters/stubs/RateLimit.php

@@ -7,10 +7,10 @@
 
 namespace yiiunit\framework\filters\stubs;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\filters\RateLimitInterface;
 
-class RateLimit extends Object implements RateLimitInterface
+class RateLimit extends BaseObject implements RateLimitInterface
 {
     private $_rateLimit;
 

tests/framework/helpers/ArrayHelperTest.php

@@ -7,7 +7,7 @@
 
 namespace yiiunit\framework\helpers;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\data\Sort;
 use yii\helpers\ArrayHelper;
 use yiiunit\TestCase;
@@ -18,7 +18,7 @@ class Post1
     public $title = 'tt';
 }
 
-class Post2 extends Object
+class Post2 extends BaseObject
 {
     public $id = 123;
     public $content = 'test';
@@ -29,7 +29,7 @@ class Post2 extends Object
     }
 }
 
-class Post3 extends Object
+class Post3 extends BaseObject
 {
     public $id = 33;
     /** @var Object */

tests/framework/web/Post.php

@@ -7,9 +7,9 @@
 
 namespace yiiunit\framework\web;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
-class Post extends Object
+class Post extends BaseObject
 {
     public $id;
     public $title;