diff --git a/apps/advanced/README.md b/apps/advanced/README.md index 59a1b77..7055360 100644 --- a/apps/advanced/README.md +++ b/apps/advanced/README.md @@ -34,7 +34,7 @@ backend models/ contains backend-specific model classes runtime/ contains files generated during runtime views/ contains view files for the Web application - www/ contains the entry script and Web resources + web/ contains the entry script and Web resources frontend assets/ contains application assets such as JavaScript and CSS config/ contains frontend configurations @@ -42,7 +42,7 @@ frontend models/ contains frontend-specific model classes runtime/ contains files generated during runtime views/ contains view files for the Web application - www/ contains the entry script and Web resources + web/ contains the entry script and Web resources vendor/ contains dependent 3rd-party packages environments/ contains environment-based overrides ``` @@ -107,8 +107,8 @@ the installed application. You only need to do these once for all. Now you should be able to access: -- the frontend using the URL `http://localhost/yii-advanced/frontend/www/` -- the backend using the URL `http://localhost/yii-advanced/backend/www/` +- the frontend using the URL `http://localhost/yii-advanced/frontend/web/` +- the backend using the URL `http://localhost/yii-advanced/backend/web/` assuming `yii-advanced` is directly under the document root of your Web server. diff --git a/apps/advanced/backend/config/AppAsset.php b/apps/advanced/backend/config/AppAsset.php index 525b693..944807a 100644 --- a/apps/advanced/backend/config/AppAsset.php +++ b/apps/advanced/backend/config/AppAsset.php @@ -14,8 +14,8 @@ use yii\web\AssetBundle; */ class AppAsset extends AssetBundle { - public $basePath = '@wwwroot'; - public $baseUrl = '@www'; + public $basePath = '@webroot'; + public $baseUrl = '@web'; public $css = array( 'css/site.css', ); diff --git a/apps/advanced/backend/www/.gitignore b/apps/advanced/backend/web/.gitignore similarity index 100% rename from apps/advanced/backend/www/.gitignore rename to apps/advanced/backend/web/.gitignore diff --git a/apps/advanced/backend/www/assets/.gitignore b/apps/advanced/backend/web/assets/.gitignore similarity index 100% rename from apps/advanced/backend/www/assets/.gitignore rename to apps/advanced/backend/web/assets/.gitignore diff --git a/apps/advanced/backend/www/css/site.css b/apps/advanced/backend/web/css/site.css similarity index 100% rename from apps/advanced/backend/www/css/site.css rename to apps/advanced/backend/web/css/site.css diff --git a/apps/advanced/composer.json b/apps/advanced/composer.json index 0e393cf..2d5b987 100644 --- a/apps/advanced/composer.json +++ b/apps/advanced/composer.json @@ -26,13 +26,13 @@ "extra": { "yii-install-writable": [ "backend/runtime", - "backend/www/assets", + "backend/web/assets", "console/runtime", "console/migrations", "frontend/runtime", - "frontend/www/assets" + "frontend/web/assets" ] } } diff --git a/apps/advanced/frontend/config/AppAsset.php b/apps/advanced/frontend/config/AppAsset.php index 0a3a5e8..0ba2c1d 100644 --- a/apps/advanced/frontend/config/AppAsset.php +++ b/apps/advanced/frontend/config/AppAsset.php @@ -14,8 +14,8 @@ use yii\web\AssetBundle; */ class AppAsset extends AssetBundle { - public $basePath = '@wwwroot'; - public $baseUrl = '@www'; + public $basePath = '@webroot'; + public $baseUrl = '@web'; public $css = array( 'css/site.css', ); diff --git a/apps/advanced/frontend/www/.gitignore b/apps/advanced/frontend/web/.gitignore similarity index 100% rename from apps/advanced/frontend/www/.gitignore rename to apps/advanced/frontend/web/.gitignore diff --git a/apps/advanced/frontend/www/assets/.gitignore b/apps/advanced/frontend/web/assets/.gitignore similarity index 100% rename from apps/advanced/frontend/www/assets/.gitignore rename to apps/advanced/frontend/web/assets/.gitignore diff --git a/apps/advanced/frontend/www/css/site.css b/apps/advanced/frontend/web/css/site.css similarity index 100% rename from apps/advanced/frontend/www/css/site.css rename to apps/advanced/frontend/web/css/site.css diff --git a/apps/basic/README.md b/apps/basic/README.md index 31b5ecc..b5e1ec2 100644 --- a/apps/basic/README.md +++ b/apps/basic/README.md @@ -24,7 +24,7 @@ DIRECTORY STRUCTURE runtime/ contains files generated during runtime vendor/ contains dependent 3rd-party packages views/ contains view files for the Web application - www/ contains the entry script and Web resources + web/ contains the entry script and Web resources @@ -53,7 +53,7 @@ You can then install the Bootstrap Application using the following command: php composer.phar create-project --stability=dev yiisoft/yii2-app-basic yii-basic ~~~ -Now you should be able to access the application using the URL `http://localhost/yii-basic/www/`, +Now you should be able to access the application using the URL `http://localhost/yii-basic/web/`, assuming `yii-basic` is directly under the document root of your Web server. diff --git a/apps/basic/composer.json b/apps/basic/composer.json index b01c56c..dd50b69 100644 --- a/apps/basic/composer.json +++ b/apps/basic/composer.json @@ -26,7 +26,7 @@ "extra": { "yii-install-writable": [ "runtime", - "www/assets" + "web/assets" ], "yii-install-executable": [ "yii" diff --git a/apps/basic/config/AppAsset.php b/apps/basic/config/AppAsset.php index 2546969..94369bf 100644 --- a/apps/basic/config/AppAsset.php +++ b/apps/basic/config/AppAsset.php @@ -15,8 +15,8 @@ use yii\web\AssetBundle; */ class AppAsset extends AssetBundle { - public $basePath = '@wwwroot'; - public $baseUrl = '@www'; + public $basePath = '@webroot'; + public $baseUrl = '@web'; public $css = array( 'css/site.css', ); diff --git a/apps/basic/tests/functional.suite.dist.yml b/apps/basic/tests/functional.suite.dist.yml index aa777ac..6dd9193 100644 --- a/apps/basic/tests/functional.suite.dist.yml +++ b/apps/basic/tests/functional.suite.dist.yml @@ -11,5 +11,5 @@ modules: enabled: [Filesystem, TestHelper, Yii2] config: Yii2: - entryScript: 'www/index-test.php' + entryScript: 'web/index-test.php' url: 'http://localhost/' diff --git a/apps/basic/www/assets/.gitignore b/apps/basic/web/assets/.gitignore similarity index 100% rename from apps/basic/www/assets/.gitignore rename to apps/basic/web/assets/.gitignore diff --git a/apps/basic/www/css/site.css b/apps/basic/web/css/site.css similarity index 100% rename from apps/basic/www/css/site.css rename to apps/basic/web/css/site.css diff --git a/apps/basic/www/index-test.php b/apps/basic/web/index-test.php similarity index 100% rename from apps/basic/www/index-test.php rename to apps/basic/web/index-test.php diff --git a/apps/basic/www/index.php b/apps/basic/web/index.php similarity index 100% rename from apps/basic/www/index.php rename to apps/basic/web/index.php diff --git a/docs/guide/bootstrap.md b/docs/guide/bootstrap.md index e6cfb1f..c1a40b6 100644 --- a/docs/guide/bootstrap.md +++ b/docs/guide/bootstrap.md @@ -22,7 +22,7 @@ You can then install the Bootstrap Application using the following command: php composer.phar create-project --stability=dev yiisoft/yii2-app-basic yii-basic ~~~ -Now you should be able to access the Bootstrap Application using the URL `http://localhost/yii-basic/www/`, +Now you should be able to access the Bootstrap Application using the URL `http://localhost/yii-basic/web/`, assuming `yii-basic` is directly under the document root of your Web server. @@ -59,7 +59,7 @@ yii-basic/ contact.php the view for the 'contact' action index.php the view for the 'index' action login.php the view for the 'login' action - www/ containing Web-accessible resources + web/ containing Web-accessible resources index.php Web application entry script file assets/ containing published resource files css/ containing CSS files diff --git a/docs/guide/upgrade-from-v1.md b/docs/guide/upgrade-from-v1.md index 79c6c3f..51118d9 100644 --- a/docs/guide/upgrade-from-v1.md +++ b/docs/guide/upgrade-from-v1.md @@ -245,8 +245,8 @@ Themes Themes work completely different in 2.0. They are now based on a path map to "translate" a source view into a themed view. For example, if the path map for a theme is -`array('/www/views' => '/www/themes/basic')`, then the themed version for a view file -`/www/views/site/index.php` will be `/www/themes/basic/site/index.php`. +`array('/web/views' => '/web/themes/basic')`, then the themed version for a view file +`/web/views/site/index.php` will be `/web/themes/basic/site/index.php`. For this reason, theme can now be applied to any view file, even if a view rendered outside of the context of a controller or a widget. diff --git a/framework/yii/base/Theme.php b/framework/yii/base/Theme.php index 91c32dc..ffd2732 100644 --- a/framework/yii/base/Theme.php +++ b/framework/yii/base/Theme.php @@ -21,9 +21,9 @@ use yii\helpers\FileHelper; * with its themed version if part of its path matches one of the keys in [[pathMap]]. * Then the matched part will be replaced with the corresponding array value. * - * For example, if [[pathMap]] is `array('/www/views' => '/www/themes/basic')`, - * then the themed version for a view file `/www/views/site/index.php` will be - * `/www/themes/basic/site/index.php`. + * For example, if [[pathMap]] is `array('/web/views' => '/web/themes/basic')`, + * then the themed version for a view file `/web/views/site/index.php` will be + * `/web/themes/basic/site/index.php`. * * To use a theme, you should configure the [[View::theme|theme]] property of the "view" application * component like the following: @@ -31,8 +31,8 @@ use yii\helpers\FileHelper; * ~~~ * 'view' => array( * 'theme' => array( - * 'basePath' => '@wwwroot/themes/basic', - * 'baseUrl' => '@www/themes/basic', + * 'basePath' => '@webroot/themes/basic', + * 'baseUrl' => '@web/themes/basic', * ), * ), * ~~~ diff --git a/framework/yii/console/controllers/AssetController.php b/framework/yii/console/controllers/AssetController.php index 1fa99dd..c4d4b5a 100644 --- a/framework/yii/console/controllers/AssetController.php +++ b/framework/yii/console/controllers/AssetController.php @@ -22,7 +22,7 @@ use yii\console\Controller; * yii asset /path/to/myapp/config.php /path/to/myapp/config/assets_compressed.php * 4. Adjust your web application config to use compressed assets. * - * Note: in the console environment some path aliases like '@wwwroot' and '@www' may not exist, + * Note: in the console environment some path aliases like '@webroot' and '@web' may not exist, * so corresponding paths inside the configuration should be specified directly. * * Note: by default this command relies on an external tools to perform actual files compression, @@ -587,7 +587,7 @@ EOD; array( 'app\config\AllAsset' => array( - 'basePath' => 'path/to/www', + 'basePath' => 'path/to/web', 'baseUrl' => '', 'js' => 'js/all-{ts}.js', 'css' => 'css/all-{ts}.css', diff --git a/framework/yii/web/Application.php b/framework/yii/web/Application.php index 8753ebe..249b0b4 100644 --- a/framework/yii/web/Application.php +++ b/framework/yii/web/Application.php @@ -55,8 +55,8 @@ class Application extends \yii\base\Application */ public function handleRequest($request) { - Yii::setAlias('@wwwroot', dirname($request->getScriptFile())); - Yii::setAlias('@www', $request->getBaseUrl()); + Yii::setAlias('@webroot', dirname($request->getScriptFile())); + Yii::setAlias('@web', $request->getBaseUrl()); if (empty($this->catchAll)) { list ($route, $params) = $request->resolve(); diff --git a/framework/yii/web/AssetManager.php b/framework/yii/web/AssetManager.php index eeffb01..702fd30 100644 --- a/framework/yii/web/AssetManager.php +++ b/framework/yii/web/AssetManager.php @@ -30,11 +30,11 @@ class AssetManager extends Component /** * @return string the root directory storing the published asset files. */ - public $basePath = '@wwwroot/assets'; + public $basePath = '@webroot/assets'; /** * @return string the base URL through which the published asset files can be accessed. */ - public $baseUrl = '@www/assets'; + public $baseUrl = '@web/assets'; /** * @var boolean whether to use symbolic link to publish asset files. Defaults to false, meaning * asset files are copied to [[basePath]]. Using symbolic links has the benefit that the published