Rename Object -> BaseObject for PHP 7.2 compatibility

issue #7936

framework/base/Object.php → framework/base/BaseObject.php

@@ -74,7 +74,7 @@
  * @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 @@
  * @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 @@
  * @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 @@
  * @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 @@
  * @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 @@
  * @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 @@
  * @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 @@
 
 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 @@
  * @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 @@
  * @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,15 +7,15 @@
 
 namespace yii\db;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * ColumnSchema class describes the metadata of a column in a database table.
  *
  * @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 @@
  * @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,15 +7,15 @@
 
 namespace yii\db;
 
-use yii\base\Object;
+use yii\base\BaseObject;
 
 /**
  * Constraint represents the metadata of a table constraint.
  *
  * @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 @@
  * @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 @@
  * @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 @@
  * @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\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 @@
  * @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 @@
  * @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 @@
  * @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 @@
  * @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 @@
  * @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 @@
 
 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 @@
  * @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 @@
  * @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,15 +7,15 @@
 
 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).
  *
  * @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 @@
  * @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 @@
  * @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 @@
  * @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.