#2248: Renamed `yii\base\Model::DEFAULT_SCENARIO` to `yii\base\Model::SCENARIO_DEFAULT`

framework/CHANGELOG.md

@@ -139,6 +139,7 @@ Yii Framework 2 Change Log
 - Chg #2173: Removed `StringHelper::diff()`, Moved `phpspec/php-diff` dependency from `yiisoft/yii2` to `yiisoft/yii2-gii` (samdark)
 - Chg #2175: QueryBuilder will now append UNION statements at the end of the primary SQL (qiangxue)
 - Chg #2210: Mysql driver will now treat `tinyint(1)` as integer instead of boolean (qiangxue)
+- Chg #2248: Renamed `yii\base\Model::DEFAULT_SCENARIO` to `yii\base\Model::SCENARIO_DEFAULT` (samdark)
 - Chg: Renamed `yii\jui\Widget::clientEventsMap` to `clientEventMap` (qiangxue)
 - Chg: Renamed `ActiveRecord::getPopulatedRelations()` to `getRelatedRecords()` (qiangxue)
 - Chg: Renamed `attributeName` and `className` to `targetAttribute` and `targetClass` for `UniqueValidator` and `ExistValidator` (qiangxue)

framework/base/Model.php

@@ -57,7 +57,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
 	/**
 	 * The name of the default scenario.
 	 */
-	const DEFAULT_SCENARIO = 'default';
+	const SCENARIO_DEFAULT = 'default';
 
 	/**
 	 * @event ModelEvent an event raised at the beginning of [[validate()]]. You may set
@@ -80,7 +80,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
 	/**
 	 * @var string current scenario
 	 */
-	private $_scenario = self::DEFAULT_SCENARIO;
+	private $_scenario = self::SCENARIO_DEFAULT;
 
 	/**
 	 * Returns the validation rules for attributes.
@@ -178,7 +178,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
 	 */
 	public function scenarios()
 	{
-		$scenarios = [self::DEFAULT_SCENARIO => []];
+		$scenarios = [self::SCENARIO_DEFAULT => []];
 		foreach ($this->getValidators() as $validator) {
 			foreach ($validator->on as $scenario) {
 				$scenarios[$scenario] = [];
@@ -214,7 +214,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
 		}
 
 		foreach ($scenarios as $scenario => $attributes) {
-			if (empty($attributes) && $scenario !== self::DEFAULT_SCENARIO) {
+			if (empty($attributes) && $scenario !== self::SCENARIO_DEFAULT) {
 				unset($scenarios[$scenario]);
 			} else {
 				$scenarios[$scenario] = array_keys($attributes);