Remove deprecated method className() for branch 2.2.

.github/workflows/build.yml

@@ -53,7 +53,6 @@ jobs:
         if: matrix.php != '8.1'
         run: vendor/bin/phpunit --exclude-group $PHPUNIT_EXCLUDE_GROUP --colors=always --verbose
 
-
       - name: Upload coverage to Codecov.
         if: matrix.php == '8.1'
         uses: codecov/codecov-action@v3

framework/UPGRADE.md

@@ -292,7 +292,7 @@ Upgrade from Yii 2.0.34
   public function rules()
   {
       return [
-          ['attribute', 'each', 'rule' => ['exist', 'targetClass' => static::className(), 'targetAttribute' => 'id']],
+          ['attribute', 'each', 'rule' => ['exist', 'targetClass' => static::class, 'targetAttribute' => 'id']],
       ];
   }
   ```
@@ -521,9 +521,8 @@ Upgrade from Yii 2.0.13
 
 * Log targets (like `yii\log\EmailTarget`) are now throwing `yii\log\LogRuntimeException` in case log can not be properly exported.
 
-* You can start preparing your application for Yii 2.1 by doing the following:
+* You can start preparing your application for Yii 2.2 by doing the following:
 
-  - Replace `::className()` calls with `::class` (if you’re running PHP 5.5+).
   - Replace usages of `yii\base\InvalidParamException` with `yii\base\InvalidArgumentException`.
   - Replace calls to `Yii::trace()` with `Yii::debug()`.
   - Remove calls to `yii\BaseYii::powered()`.

framework/base/BaseObject.php

@@ -76,16 +76,6 @@
  */
 class BaseObject implements Configurable
 {
-    /**
-     * Returns the fully qualified name of this class.
-     * @return string the fully qualified name of this class.
-     * @deprecated since 2.0.14. On PHP >=5.5, use `::class` instead.
-     */
-    public static function className()
-    {
-        return get_called_class();
-    }
-
     /**
      * Constructor.
      *

framework/base/Controller.php

@@ -102,8 +102,8 @@ public function __construct($id, $module, $config = [])
     public function init()
     {
         parent::init();
-        $this->request = Instance::ensure($this->request, Request::className());
-        $this->response = Instance::ensure($this->response, Response::className());
+        $this->request = Instance::ensure($this->request, Request::class);
+        $this->response = Instance::ensure($this->response, Response::class);
     }
 
     /**

framework/behaviors/SluggableBehavior.php

@@ -243,7 +243,7 @@ protected function validateSlug($slug)
         /* @var $model BaseActiveRecord */
         $validator = Yii::createObject(array_merge(
             [
-                'class' => UniqueValidator::className(),
+                'class' => UniqueValidator::class,
             ],
             $this->uniqueValidator
         ));

framework/caching/DbCache.php

@@ -95,7 +95,7 @@ class DbCache extends Cache
     public function init()
     {
         parent::init();
-        $this->db = Instance::ensure($this->db, Connection::className());
+        $this->db = Instance::ensure($this->db, Connection::class);
     }
 
     /**

framework/caching/DbDependency.php

@@ -50,7 +50,7 @@ class DbDependency extends Dependency
     protected function generateDependencyData($cache)
     {
         /* @var $db Connection */
-        $db = Instance::ensure($this->db, Connection::className());
+        $db = Instance::ensure($this->db, Connection::class);
         if ($this->sql === null) {
             throw new InvalidConfigException('DbDependency::sql must be set.');
         }

framework/console/controllers/CacheController.php

@@ -300,6 +300,6 @@ private function isCacheClass($className)
      */
     private function canBeFlushed($className)
     {
-        return !is_a($className, ApcCache::className(), true) || PHP_SAPI !== 'cli';
+        return !is_a($className, ApcCache::class, true) || PHP_SAPI !== 'cli';
     }
 }

framework/console/controllers/FixtureController.php

@@ -258,7 +258,7 @@
         $fixtureClassNames = [];
 
         foreach ($fixtures as $fixture) {
-            $fixtureClassNames[] = $fixture::className();
+            $fixtureClassNames[] = $fixture::class;
         }
 
         $this->outputList($fixtureClassNames);

framework/console/controllers/MessageController.php

@@ -318,7 +318,7 @@ public function actionExtract($configFile = null)
             }
         } elseif ($this->config['format'] === 'db') {
             /** @var Connection $db */
-            $db = Instance::ensure($this->config['db'], Connection::className());
+            $db = Instance::ensure($this->config['db'], Connection::class);
             $sourceMessageTable = isset($this->config['sourceMessageTable']) ? $this->config['sourceMessageTable'] : '{{%source_message}}';
             $messageTable = isset($this->config['messageTable']) ? $this->config['messageTable'] : '{{%message}}';
             $this->saveMessagesToDb(

framework/console/controllers/MigrateController.php

@@ -180,7 +180,7 @@
     public function beforeAction($action)
     {
         if (parent::beforeAction($action)) {
-            $this->db = Instance::ensure($this->db, Connection::className());
+            $this->db = Instance::ensure($this->db, Connection::class);
             return true;
         }
 
@@ -471,7 +471,7 @@
             if ($relatedColumn === null) {
                 $relatedColumn = 'id';
                 try {
-                    $this->db = Instance::ensure($this->db, Connection::className());
+                    $this->db = Instance::ensure($this->db, Connection::class);
                     $relatedTableSchema = $this->db->getTableSchema($relatedTable);
                     if ($relatedTableSchema !== null) {
                         $primaryKeyCount = count($relatedTableSchema->primaryKey);

framework/data/BaseDataProvider.php

@@ -211,7 +211,7 @@ public function getPagination()
     public function setPagination($value)
     {
         if (is_array($value)) {
-            $config = ['class' => Pagination::className()];
+            $config = ['class' => Pagination::class];
             if ($this->id !== null) {
                 $config['pageParam'] = $this->id . '-page';
                 $config['pageSizeParam'] = $this->id . '-per-page';
@@ -252,7 +252,7 @@ public function getSort()
     public function setSort($value)
     {
         if (is_array($value)) {
-            $config = ['class' => Sort::className()];
+            $config = ['class' => Sort::class];
             if ($this->id !== null) {
                 $config['sortParam'] = $this->id . '-sort';
             }

framework/data/DataFilter.php

@@ -288,7 +288,7 @@
         if (!is_object($this->_searchModel) || $this->_searchModel instanceof \Closure) {
             $model = Yii::createObject($this->_searchModel);
             if (!$model instanceof Model) {
-                throw new InvalidConfigException('`' . get_class($this) . '::$searchModel` should be an instance of `' . Model::className() . '` or its DI compatible configuration.');
+                throw new InvalidConfigException('`' . get_class($this) . '::$searchModel` should be an instance of `' . Model::class . '` or its DI compatible configuration.');
             }
             $this->_searchModel = $model;
         }
@@ -302,7 +302,7 @@
     public function setSearchModel($model)
     {
         if (is_object($model) && !$model instanceof Model && !$model instanceof \Closure) {
-            throw new InvalidConfigException('`' . get_class($this) . '::$searchModel` should be an instance of `' . Model::className() . '` or its DI compatible configuration.');
+            throw new InvalidConfigException('`' . get_class($this) . '::$searchModel` should be an instance of `' . Model::class . '` or its DI compatible configuration.');
         }
         $this->_searchModel = $model;
     }

framework/data/SqlDataProvider.php

@@ -96,7 +96,7 @@ class SqlDataProvider extends BaseDataProvider
     public function init()
     {
         parent::init();
-        $this->db = Instance::ensure($this->db, Connection::className());
+        $this->db = Instance::ensure($this->db, Connection::class);
         if ($this->sql === null) {
             throw new InvalidConfigException('The "sql" property must be set.');
         }

framework/db/ActiveRecord.php

@@ -411,7 +411,7 @@ public static function deleteAll($condition = null, $params = [])
      */
     public static function find()
     {
-        return Yii::createObject(ActiveQuery::className(), [get_called_class()]);
+        return Yii::createObject(ActiveQuery::class, [get_called_class()]);
     }
 
     /**

framework/db/Migration.php

@@ -87,7 +87,7 @@ class Migration extends Component implements MigrationInterface
     public function init()
     {
         parent::init();
-        $this->db = Instance::ensure($this->db, Connection::className());
+        $this->db = Instance::ensure($this->db, Connection::class);
         $this->db->getSchema()->refresh();
         $this->db->enableSlaves = false;
     }
@@ -311,15 +311,15 @@ public function delete($table, $condition = '', $params = [])
      *
      * If a column is specified with definition only (e.g. 'PRIMARY KEY (name, type)'), it will be directly
      * put into the generated SQL.
-     * 
+     *
      * Example usage:
      * ```php
      * class m200000_000000_create_table_fruits extends \yii\db\Migration
      * {
      *     public function safeUp()
      *     {
      *          $this->createTable('{{%fruits}}', [
-     *              // ...              
+     *              // ...
      *              'column_name double precision null default null',
      * ```
 

framework/db/Query.php

@@ -198,7 +198,7 @@ public function prepare($builder)
     public function batch($batchSize = 100, $db = null)
     {
         return Yii::createObject([
-            'class' => BatchQueryResult::className(),
+            'class' => BatchQueryResult::class,
             'query' => $this,
             'batchSize' => $batchSize,
             'db' => $db,
@@ -226,7 +226,7 @@ public function batch($batchSize = 100, $db = null)
     public function each($batchSize = 100, $db = null)
     {
         return Yii::createObject([
-            'class' => BatchQueryResult::className(),
+            'class' => BatchQueryResult::class,
             'query' => $this,
             'batchSize' => $batchSize,
             'db' => $db,

framework/db/Schema.php

@@ -313,7 +313,7 @@
      */
     public function createQueryBuilder()
     {
-        return Yii::createObject(QueryBuilder::className(), [$this->db]);
+        return Yii::createObject(QueryBuilder::class, [$this->db]);
     }
 
     /**
@@ -328,7 +328,7 @@
      */
     public function createColumnSchemaBuilder($type, $length = null)
     {
-        return Yii::createObject(ColumnSchemaBuilder::className(), [$type, $length]);
+        return Yii::createObject(ColumnSchemaBuilder::class, [$type, $length]);
     }
 
     /**

framework/db/cubrid/Schema.php

@@ -249,7 +249,7 @@
      */
     public function createQueryBuilder()
     {
-        return Yii::createObject(QueryBuilder::className(), [$this->db]);
+        return Yii::createObject(QueryBuilder::class, [$this->db]);
     }
 
     /**

framework/db/mssql/Schema.php

@@ -332,7 +332,7 @@ public function rollBackSavepoint($name)
      */
     public function createQueryBuilder()
     {
-        return Yii::createObject(QueryBuilder::className(), [$this->db]);
+        return Yii::createObject(QueryBuilder::class, [$this->db]);
     }
 
     /**
@@ -811,6 +811,6 @@ public function insert($table, $columns)
      */
     public function createColumnSchemaBuilder($type, $length = null)
     {
-        return Yii::createObject(ColumnSchemaBuilder::className(), [$type, $length, $this->db]);
+        return Yii::createObject(ColumnSchemaBuilder::class, [$type, $length, $this->db]);
     }
 }

framework/db/mysql/Schema.php

@@ -222,7 +222,7 @@ protected function loadTableDefaultValues($tableName)
      */
     public function createQueryBuilder()
     {
-        return Yii::createObject(QueryBuilder::className(), [$this->db]);
+        return Yii::createObject(QueryBuilder::class, [$this->db]);
     }
 
     /**
@@ -472,7 +472,7 @@ public function findUniqueIndexes($table)
      */
     public function createColumnSchemaBuilder($type, $length = null)
     {
-        return Yii::createObject(ColumnSchemaBuilder::className(), [$type, $length, $this->db]);
+        return Yii::createObject(ColumnSchemaBuilder::class, [$type, $length, $this->db]);
     }
 
     /**

framework/db/oci/Schema.php

@@ -262,15 +262,15 @@ public function quoteSimpleTableName($name)
      */
     public function createQueryBuilder()
     {
-        return Yii::createObject(QueryBuilder::className(), [$this->db]);
+        return Yii::createObject(QueryBuilder::class, [$this->db]);
     }
 
     /**
      * {@inheritdoc}
      */
     public function createColumnSchemaBuilder($type, $length = null)
     {
-        return Yii::createObject(ColumnSchemaBuilder::className(), [$type, $length]);
+        return Yii::createObject(ColumnSchemaBuilder::class, [$type, $length]);
     }
 
     /**

framework/db/pgsql/Schema.php

@@ -289,7 +289,7 @@ protected function loadTableDefaultValues($tableName)
      */
     public function createQueryBuilder()
     {
-        return Yii::createObject(QueryBuilder::className(), [$this->db]);
+        return Yii::createObject(QueryBuilder::class, [$this->db]);
     }
 
     /**

framework/db/sqlite/Schema.php

@@ -207,7 +207,7 @@ protected function loadTableDefaultValues($tableName)
      */
     public function createQueryBuilder()
     {
-        return Yii::createObject(QueryBuilder::className(), [$this->db]);
+        return Yii::createObject(QueryBuilder::class, [$this->db]);
     }
 
     /**
@@ -216,7 +216,7 @@ public function createQueryBuilder()
      */
     public function createColumnSchemaBuilder($type, $length = null)
     {
-        return Yii::createObject(ColumnSchemaBuilder::className(), [$type, $length]);
+        return Yii::createObject(ColumnSchemaBuilder::class, [$type, $length]);
     }
 
     /**

framework/filters/AccessControl.php

@@ -99,7 +99,7 @@ public function init()
     {
         parent::init();
         if ($this->user !== false) {
-            $this->user = Instance::ensure($this->user, User::className());
+            $this->user = Instance::ensure($this->user, User::class);
         }
         foreach ($this->rules as $i => $rule) {
             if (is_array($rule)) {