Refactored View

apps/advanced/backend/views/layouts/main.php

@@ -6,7 +6,7 @@ use yii\bootstrap\NavBar;
 use yii\widgets\Breadcrumbs;
 
 /**
- * @var $this \yii\base\View
+ * @var $this \yii\web\View
  * @var $content string
  */
 AppAsset::register($this);

apps/advanced/backend/views/site/error.php

@@ -3,7 +3,7 @@
 use yii\helpers\Html;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var string $name
  * @var string $message
  * @var Exception $exception

apps/advanced/backend/views/site/index.php

 <?php
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  */
 $this->title = 'My Yii Application';
 ?>

apps/advanced/backend/views/site/login.php

@@ -3,7 +3,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
  * @var app\models\LoginForm $model
  */

apps/advanced/frontend/views/emails/passwordResetToken.php

@@ -2,7 +2,7 @@
 use yii\helpers\Html;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var common\models\User $user;
  */
 

apps/advanced/frontend/views/layouts/main.php

@@ -7,7 +7,7 @@ use yii\widgets\Breadcrumbs;
 use frontend\widgets\Alert;
 
 /**
- * @var $this \yii\base\View
+ * @var $this \yii\web\View
  * @var $content string
  */
 AppAsset::register($this);

apps/advanced/frontend/views/site/about.php

@@ -2,7 +2,7 @@
 use yii\helpers\Html;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  */
 $this->title = 'About';
 $this->params['breadcrumbs'][] = $this->title;

apps/advanced/frontend/views/site/contact.php

@@ -4,7 +4,7 @@ use yii\widgets\ActiveForm;
 use yii\captcha\Captcha;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
  * @var app\models\ContactForm $model
  */

apps/advanced/frontend/views/site/error.php

@@ -3,7 +3,7 @@
 use yii\helpers\Html;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var string $name
  * @var string $message
  * @var Exception $exception

apps/advanced/frontend/views/site/index.php

 <?php
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  */
 $this->title = 'My Yii Application';
 ?>

apps/advanced/frontend/views/site/login.php

@@ -3,7 +3,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
  * @var app\models\LoginForm $model
  */

apps/advanced/frontend/views/site/requestPasswordResetToken.php

@@ -3,7 +3,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
  * @var common\models\User $model
  */

apps/advanced/frontend/views/site/resetPassword.php

@@ -3,7 +3,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
  * @var common\models\User $model
  */

apps/advanced/frontend/views/site/signup.php

@@ -3,7 +3,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
  * @var common\models\User $model
  */

apps/basic/views/layouts/main.php

@@ -5,7 +5,7 @@ use yii\bootstrap\NavBar;
 use yii\widgets\Breadcrumbs;
 
 /**
- * @var $this \yii\base\View
+ * @var $this \yii\web\View
  * @var $content string
  */
 app\config\AppAsset::register($this);

apps/basic/views/site/about.php

@@ -2,7 +2,7 @@
 use yii\helpers\Html;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  */
 $this->title = 'About';
 $this->params['breadcrumbs'][] = $this->title;

apps/basic/views/site/contact.php

@@ -4,7 +4,7 @@ use yii\widgets\ActiveForm;
 use yii\captcha\Captcha;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
  * @var app\models\ContactForm $model
  */

apps/basic/views/site/error.php

@@ -3,7 +3,7 @@
 use yii\helpers\Html;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var string $name
  * @var string $message
  * @var Exception $exception

apps/basic/views/site/index.php

 <?php
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  */
 $this->title = 'My Yii Application';
 ?>

apps/basic/views/site/login.php

@@ -3,7 +3,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
  * @var app\models\LoginForm $model
  */

docs/guide/template.md

@@ -10,7 +10,7 @@ a custom template engines by reconfiguring this component's behavior:
 [
 	'components' => [
 		'view' => [
-			'class' => 'yii\base\View',
+			'class' => 'yii\web\View',
 			'renderers' => [
 				'tpl' => [
 					'class' => 'yii\renderers\SmartyViewRenderer',

docs/guide/view.md

@@ -113,7 +113,7 @@ to learn more refer to [Using template engines](template.md) section of the guid
 Using View object in templates
 ------------------------------
 
-An instance of `yii\base\View` component is available in view templates as `$this` variable. Using it in templates you
+An instance of `yii\web\View` component is available in view templates as `$this` variable. Using it in templates you
 can do many useful things including setting page title and meta, registering scripts and accessing the context.
 
 ### Setting page title
@@ -342,7 +342,7 @@ Customizing View component
 --------------------------
 
 Since view is also an application component named `view` you can replace it with your own component that extends
-from `yii\base\View`. It can be done via application configuration file such as `config/web.php`:
+from `yii\base\View` or `yii\web\View`. It can be done via application configuration file such as `config/web.php`:
 
 ```php
 return [

extensions/debug/Module.php

@@ -9,7 +9,7 @@ namespace yii\debug;
 
 use Yii;
 use yii\base\Application;
-use yii\base\View;
+use yii\web\View;
 use yii\web\HttpException;
 
 /**

extensions/debug/views/default/index.php

@@ -3,7 +3,7 @@
 use yii\helpers\Html;
 
 /**
- * @var \yii\base\View $this
+ * @var \yii\web\View $this
  * @var array $manifest
  */
 

extensions/debug/views/default/toolbar.php

 <?php
 /**
- * @var \yii\base\View $this
+ * @var \yii\web\View $this
  * @var \yii\debug\Panel[] $panels
  * @var string $tag
  */

extensions/debug/views/default/view.php

@@ -5,7 +5,7 @@ use yii\bootstrap\ButtonGroup;
 use yii\helpers\Html;
 
 /**
- * @var \yii\base\View $this
+ * @var \yii\web\View $this
  * @var array $summary
  * @var string $tag
  * @var array $manifest

extensions/debug/views/layouts/main.php

 <?php
 /**
- * @var \yii\base\View $this
+ * @var \yii\web\View $this
  * @var string $content
  */
 use yii\helpers\Html;

extensions/gii/Generator.php

@@ -11,7 +11,7 @@ use Yii;
 use ReflectionClass;
 use yii\base\InvalidConfigException;
 use yii\base\Model;
-use yii\base\View;
+use yii\web\View;
 
 
 /**

extensions/gii/generators/controller/form.php

 <?php
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
  * @var yii\gii\generators\controller\Generator $generator
  */

extensions/gii/generators/controller/templates/controller.php

@@ -5,7 +5,7 @@ use yii\helpers\Inflector;
 /**
  * This is the template for generating a controller class file.
  *
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\generators\controller\Generator $generator
  */
 

extensions/gii/generators/controller/templates/view.php

@@ -2,7 +2,7 @@
 /**
  * This is the template for generating an action view file.
  *
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\generators\controller\Generator $generator
  * @var string $action the action ID
  */
@@ -10,7 +10,7 @@
 echo "<?php\n";
 ?>
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  */
 <?= "?>" ?>
 

extensions/gii/generators/crud/form.php

 <?php
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
  * @var yii\gii\generators\crud\Generator $generator
  */

extensions/gii/generators/crud/templates/controller.php

@@ -5,7 +5,7 @@ use yii\helpers\StringHelper;
 /**
  * This is the template for generating a CRUD controller class file.
  *
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\generators\crud\Generator $generator
  */
 

extensions/gii/generators/crud/templates/search.php

@@ -5,7 +5,7 @@ use yii\helpers\StringHelper;
 /**
  * This is the template for generating a CRUD controller class file.
  *
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\generators\crud\Generator $generator
  */
 

extensions/gii/generators/crud/templates/views/_form.php

@@ -4,7 +4,7 @@ use yii\helpers\Inflector;
 use yii\helpers\StringHelper;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\generators\crud\Generator $generator
  */
 
@@ -22,7 +22,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var <?= ltrim($generator->modelClass, '\\') ?> $model
  * @var yii\widgets\ActiveForm $form
  */

extensions/gii/generators/crud/templates/views/_search.php

@@ -4,7 +4,7 @@ use yii\helpers\Inflector;
 use yii\helpers\StringHelper;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\generators\crud\Generator $generator
  */
 
@@ -15,7 +15,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var <?= ltrim($generator->searchModelClass, '\\') ?> $model
  * @var yii\widgets\ActiveForm $form
  */

extensions/gii/generators/crud/templates/views/create.php

@@ -4,7 +4,7 @@ use yii\helpers\Inflector;
 use yii\helpers\StringHelper;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\generators\crud\Generator $generator
  */
 
@@ -14,7 +14,7 @@ echo "<?php\n";
 use yii\helpers\Html;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var <?= ltrim($generator->modelClass, '\\') ?> $model
  */
 

extensions/gii/generators/crud/templates/views/index.php

@@ -4,7 +4,7 @@ use yii\helpers\Inflector;
 use yii\helpers\StringHelper;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\generators\crud\Generator $generator
  */
 
@@ -18,7 +18,7 @@ use yii\helpers\Html;
 use <?= $generator->indexWidgetType === 'grid' ? "yii\\grid\\GridView" : "yii\\widgets\\ListView" ?>;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\data\ActiveDataProvider $dataProvider
  * @var <?= ltrim($generator->searchModelClass, '\\') ?> $searchModel
  */

extensions/gii/generators/crud/templates/views/update.php

@@ -4,7 +4,7 @@ use yii\helpers\Inflector;
 use yii\helpers\StringHelper;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\generators\crud\Generator $generator
  */
 
@@ -16,7 +16,7 @@ echo "<?php\n";
 use yii\helpers\Html;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var <?= ltrim($generator->modelClass, '\\') ?> $model
  */
 

extensions/gii/generators/crud/templates/views/view.php

@@ -4,7 +4,7 @@ use yii\helpers\Inflector;
 use yii\helpers\StringHelper;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\generators\crud\Generator $generator
  */
 
@@ -17,7 +17,7 @@ use yii\helpers\Html;
 use yii\widgets\DetailView;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var <?= ltrim($generator->modelClass, '\\') ?> $model
  */
 

extensions/gii/generators/form/form.php

 <?php
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
  * @var yii\gii\generators\form\Generator $generator
  */

extensions/gii/generators/form/templates/action.php

@@ -5,7 +5,7 @@ use yii\helpers\Inflector;
 /**
  * This is the template for generating an action view file.
  *
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\generators\form\Generator $generator
  */
 

extensions/gii/generators/form/templates/form.php

@@ -2,7 +2,7 @@
 /**
  * This is the template for generating an action view file.
  *
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\generators\form\Generator $generator
  */
 
@@ -13,7 +13,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var <?= $generator->modelClass ?> $model
  * @var ActiveForm $form
  */

extensions/gii/generators/model/form.php

 <?php
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
  * @var yii\gii\generators\form\Generator $generator
  */

extensions/gii/generators/model/templates/model.php

@@ -2,7 +2,7 @@
 /**
  * This is the template for generating the model class of a specified table.
  *
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\generators\model\Generator $generator
  * @var string $tableName full table name
  * @var string $className class name

extensions/gii/generators/module/form.php

 <?php
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
  * @var yii\gii\generators\module\Generator $generator
  */

extensions/gii/generators/module/templates/controller.php

@@ -2,7 +2,7 @@
 /**
  * This is the template for generating a controller class within a module.
  *
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\generators\module\Generator $generator
  */
 echo "<?php\n";

extensions/gii/generators/module/templates/module.php

@@ -2,7 +2,7 @@
 /**
  * This is the template for generating a module class file.
  *
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\generators\module\Generator $generator
  */
 $className = $generator->moduleClass;

extensions/gii/generators/module/templates/view.php

 <?php
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\generators\module\Generator $generator
  */
 ?>

extensions/gii/views/default/diff.php

 <?php
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var mixed $diff
  */
 ?>

extensions/gii/views/default/index.php

@@ -2,7 +2,7 @@
 use yii\helpers\Html;
 
 /**
- * @var $this \yii\base\View
+ * @var $this \yii\web\View
  * @var $content string
  * @var yii\gii\Generator[] $generators
  * @var yii\gii\Generator $activeGenerator

extensions/gii/views/default/view.php

@@ -6,7 +6,7 @@ use yii\gii\components\ActiveField;
 use yii\gii\CodeFile;
 
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\Generator $generator
  * @var string $id
  * @var yii\widgets\ActiveForm $form

extensions/gii/views/default/view/files.php

@@ -4,7 +4,7 @@ use yii\helpers\Html;
 use yii\gii\CodeFile;
 
 /**
- * @var $this \yii\base\View
+ * @var $this \yii\web\View
  * @var $generator \yii\gii\Generator
  * @var CodeFile[] $files
  * @var array $answers

extensions/gii/views/default/view/results.php

 <?php
 /**
- * @var yii\base\View $this
+ * @var yii\web\View $this
  * @var yii\gii\Generator $generator
  * @var string $results
  * @var boolean $hasError

extensions/gii/views/layouts/generator.php

@@ -2,7 +2,7 @@
 use yii\helpers\Html;
 
 /**
- * @var $this \yii\base\View
+ * @var $this \yii\web\View
  * @var $content string
  * @var yii\gii\Generator[] $generators
  * @var yii\gii\Generator $activeGenerator

extensions/gii/views/layouts/main.php

@@ -4,7 +4,7 @@ use yii\bootstrap\Nav;
 use yii\helpers\Html;
 
 /**
- * @var $this \yii\base\View
+ * @var $this \yii\web\View
  * @var $content string
  */
 $asset = yii\gii\GiiAsset::register($this);

framework/yii/base/Application.php

@@ -471,7 +471,7 @@ abstract class Application extends Module
 			'formatter' => ['class' => 'yii\base\Formatter'],
 			'i18n' => ['class' => 'yii\i18n\I18N'],
 			'urlManager' => ['class' => 'yii\web\UrlManager'],
-			'view' => ['class' => 'yii\base\View'],
+			'view' => ['class' => 'yii\web\View'],
 		]);
 	}
 

framework/yii/captcha/CaptchaValidator.php

@@ -96,7 +96,7 @@ class CaptchaValidator extends Validator
 	 * Returns the JavaScript needed for performing client-side validation.
 	 * @param \yii\base\Model $object the data object being validated
 	 * @param string $attribute the name of the attribute to be validated.
-	 * @param \yii\base\View $view the view object that is going to be used to render views or view files
+	 * @param \yii\web\View $view the view object that is going to be used to render views or view files
 	 * containing a model form with this validator applied.
 	 * @return string the client-side validation script.
 	 */

framework/yii/classes.php

@@ -213,6 +213,7 @@ return [
 	'yii\web\User' => YII_PATH . '/web/User.php',
 	'yii\web\UserEvent' => YII_PATH . '/web/UserEvent.php',
 	'yii\web\VerbFilter' => YII_PATH . '/web/VerbFilter.php',
+	'yii\web\View' => YII_PATH . '/web/View.php',
 	'yii\web\XmlResponseFormatter' => YII_PATH . '/web/XmlResponseFormatter.php',
 	'yii\web\YiiAsset' => YII_PATH . '/web/YiiAsset.php',
 	'yii\widgets\ActiveField' => YII_PATH . '/widgets/ActiveField.php',

framework/yii/validators/BooleanValidator.php

@@ -79,7 +79,7 @@ class BooleanValidator extends Validator
 	 * Returns the JavaScript needed for performing client-side validation.
 	 * @param \yii\base\Model $object the data object being validated
 	 * @param string $attribute the name of the attribute to be validated.
-	 * @param \yii\base\View $view the view object that is going to be used to render views or view files
+	 * @param \yii\web\View $view the view object that is going to be used to render views or view files
 	 * containing a model form with this validator applied.
 	 * @return string the client-side validation script.
 	 */

framework/yii/validators/CompareValidator.php

@@ -179,7 +179,7 @@ class CompareValidator extends Validator
 	 * @param \yii\base\Model $object the data object being validated
 	 * @param string $attribute the name of the attribute to be validated
 	 * @return string the client-side validation script
-	 * @param \yii\base\View $view the view object that is going to be used to render views or view files
+	 * @param \yii\web\View $view the view object that is going to be used to render views or view files
 	 * containing a model form with this validator applied.
 	 * @throws InvalidConfigException if CompareValidator::operator is invalid
 	 */

framework/yii/validators/EmailValidator.php

@@ -119,7 +119,7 @@ class EmailValidator extends Validator
 	 * Returns the JavaScript needed for performing client-side validation.
 	 * @param \yii\base\Model $object the data object being validated
 	 * @param string $attribute the name of the attribute to be validated.
-	 * @param \yii\base\View $view the view object that is going to be used to render views or view files
+	 * @param \yii\web\View $view the view object that is going to be used to render views or view files
 	 * containing a model form with this validator applied.
 	 * @return string the client-side validation script.
 	 */

framework/yii/validators/InlineValidator.php

@@ -79,7 +79,7 @@ class InlineValidator extends Validator
 	 *
 	 * @param \yii\base\Model $object the data object being validated
 	 * @param string $attribute the name of the attribute to be validated.
-	 * @param \yii\base\View $view the view object that is going to be used to render views or view files
+	 * @param \yii\web\View $view the view object that is going to be used to render views or view files
 	 * containing a model form with this validator applied.
 	 * @return string the client-side validation script. Null if the validator does not support
 	 * client-side validation.

framework/yii/validators/NumberValidator.php

@@ -114,7 +114,7 @@ class NumberValidator extends Validator
 	 * Returns the JavaScript needed for performing client-side validation.
 	 * @param \yii\base\Model $object the data object being validated
 	 * @param string $attribute the name of the attribute to be validated.
-	 * @param \yii\base\View $view the view object that is going to be used to render views or view files
+	 * @param \yii\web\View $view the view object that is going to be used to render views or view files
 	 * containing a model form with this validator applied.
 	 * @return string the client-side validation script.
 	 */

framework/yii/validators/RangeValidator.php

@@ -81,7 +81,7 @@ class RangeValidator extends Validator
 	 * Returns the JavaScript needed for performing client-side validation.
 	 * @param \yii\base\Model $object the data object being validated
 	 * @param string $attribute the name of the attribute to be validated.
-	 * @param \yii\base\View $view the view object that is going to be used to render views or view files
+	 * @param \yii\web\View $view the view object that is going to be used to render views or view files
 	 * containing a model form with this validator applied.
 	 * @return string the client-side validation script.
 	 */

framework/yii/validators/RegularExpressionValidator.php

@@ -78,7 +78,7 @@ class RegularExpressionValidator extends Validator
 	 * Returns the JavaScript needed for performing client-side validation.
 	 * @param \yii\base\Model $object the data object being validated
 	 * @param string $attribute the name of the attribute to be validated.
-	 * @param \yii\base\View $view the view object that is going to be used to render views or view files
+	 * @param \yii\web\View $view the view object that is going to be used to render views or view files
 	 * containing a model form with this validator applied.
 	 * @return string the client-side validation script.
 	 */

framework/yii/validators/RequiredValidator.php

@@ -102,7 +102,7 @@ class RequiredValidator extends Validator
 	 * Returns the JavaScript needed for performing client-side validation.
 	 * @param \yii\base\Model $object the data object being validated
 	 * @param string $attribute the name of the attribute to be validated.
-	 * @param \yii\base\View $view the view object that is going to be used to render views or view files
+	 * @param \yii\web\View $view the view object that is going to be used to render views or view files
 	 * containing a model form with this validator applied.
 	 * @return string the client-side validation script.
 	 */

framework/yii/validators/StringValidator.php

@@ -142,7 +142,7 @@ class StringValidator extends Validator
 	 * Returns the JavaScript needed for performing client-side validation.
 	 * @param \yii\base\Model $object the data object being validated
 	 * @param string $attribute the name of the attribute to be validated.
-	 * @param \yii\base\View $view the view object that is going to be used to render views or view files
+	 * @param \yii\web\View $view the view object that is going to be used to render views or view files
 	 * containing a model form with this validator applied.
 	 * @return string the client-side validation script.
 	 */

framework/yii/validators/UrlValidator.php

@@ -115,7 +115,7 @@ class UrlValidator extends Validator
 	 * Returns the JavaScript needed for performing client-side validation.
 	 * @param \yii\base\Model $object the data object being validated
 	 * @param string $attribute the name of the attribute to be validated.
-	 * @param \yii\base\View $view the view object that is going to be used to render views or view files
+	 * @param \yii\web\View $view the view object that is going to be used to render views or view files
 	 * containing a model form with this validator applied.
 	 * @return string the client-side validation script.
 	 * @see \yii\Web\ActiveForm::enableClientValidation

framework/yii/validators/Validator.php

@@ -215,7 +215,7 @@ abstract class Validator extends Component
 	 *
 	 * @param \yii\base\Model $object the data object being validated
 	 * @param string $attribute the name of the attribute to be validated.
-	 * @param \yii\base\View $view the view object that is going to be used to render views or view files
+	 * @param \yii\web\View $view the view object that is going to be used to render views or view files
 	 * containing a model form with this validator applied.
 	 * @return string the client-side validation script. Null if the validator does not support
 	 * client-side validation.

framework/yii/web/AssetBundle.php

@@ -10,7 +10,7 @@ namespace yii\web;
 use Yii;
 use yii\base\InvalidConfigException;
 use yii\base\Object;
-use yii\base\View;
+use yii\web\View;
 
 /**
  * AssetBundle represents a collection of asset files, such as CSS, JS, images.
@@ -97,12 +97,12 @@ class AssetBundle extends Object
 	 */
 	public $css = [];
 	/**
-	 * @var array the options that will be passed to [[\yii\base\View::registerJsFile()]]
+	 * @var array the options that will be passed to [[\yii\web\View::registerJsFile()]]
 	 * when registering the JS files in this bundle.
 	 */
 	public $jsOptions = [];
 	/**
-	 * @var array the options that will be passed to [[\yii\base\View::registerCssFile()]]
+	 * @var array the options that will be passed to [[\yii\web\View::registerCssFile()]]
 	 * when registering the CSS files in this bundle.
 	 */
 	public $cssOptions = [];
@@ -140,7 +140,7 @@ class AssetBundle extends Object
 
 	/**
 	 * Registers the CSS and JS files with the given view.
-	 * @param \yii\base\View $view the view that the asset files are to be registered with.
+	 * @param \yii\web\View $view the view that the asset files are to be registered with.
 	 */
 	public function registerAssetFiles($view)
 	{

tests/unit/data/views/layout.php

 <?php
 /**
- * @var $this \yii\base\View
+ * @var $this \yii\web\View
  * @var $content string
  */
 ?>

tests/unit/data/views/rawlayout.php

 <?php
 /**
- * @var $this \yii\base\View
+ * @var $this \yii\web\View
  */
 ?><?php $this->beginPage(); ?>1<?php $this->head(); ?>2<?php $this->beginBody(); ?>3<?php $this->endBody(); ?>4<?php $this->endPage(); ?>
\ No newline at end of file

tests/unit/framework/web/AssetBundleTest.php

@@ -8,7 +8,7 @@
 namespace yiiunit\framework\web;
 
 use Yii;
-use yii\base\View;
+use yii\web\View;
 use yii\web\AssetBundle;
 use yii\web\AssetManager;