diff --git a/build/build b/build/build
index 31d54a2d89a..1d34560e505 100755
--- a/build/build
+++ b/build/build
@@ -17,7 +17,7 @@ $composerAutoload = [
foreach ($composerAutoload as $autoload) {
if (file_exists($autoload)) {
- require($autoload);
+ require $autoload;
$vendorPath = dirname($autoload);
break;
}
@@ -27,7 +27,7 @@ if (!isset($vendorPath)) {
echo "composer autoloader could not be found.\nYou should run `composer install` in repo root directory.\n";
exit(1);
}
-require(__DIR__ . '/../framework/Yii.php');
+require __DIR__ . '/../framework/Yii.php';
Yii::setAlias('@yii/build', __DIR__);
diff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php
index d4284e8696c..5a3abaca241 100644
--- a/build/controllers/PhpDocController.php
+++ b/build/controllers/PhpDocController.php
@@ -178,7 +178,7 @@ protected function findFiles($root, $needsInclude = true)
list(, $extension) = $matches;
Yii::setAlias("@yii/$extension", "$root");
if (is_file($autoloadFile = Yii::getAlias("@yii/$extension/vendor/autoload.php"))) {
- include($autoloadFile);
+ include $autoloadFile;
}
if (isset($extensionExcept[$extension])) {
@@ -201,7 +201,7 @@ protected function findFiles($root, $needsInclude = true)
list(, $appName) = $matches;
Yii::setAlias("@app-$appName", "$root");
if (is_file($autoloadFile = Yii::getAlias("@app-$appName/vendor/autoload.php"))) {
- include($autoloadFile);
+ include $autoloadFile;
}
$except[] = '/runtime/';
diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php
index 7158d5cadfe..97585caa5ec 100644
--- a/build/controllers/ReleaseController.php
+++ b/build/controllers/ReleaseController.php
@@ -637,7 +637,7 @@ protected function setAppAliases($app, $path)
break;
case 'advanced':
// setup @frontend, @backend etc...
- require("$path/common/config/bootstrap.php");
+ require "$path/common/config/bootstrap.php";
break;
}
}
diff --git a/cs/src/YiiConfig.php b/cs/src/YiiConfig.php
index 96291f442c5..0ff0ebfa225 100644
--- a/cs/src/YiiConfig.php
+++ b/cs/src/YiiConfig.php
@@ -45,8 +45,8 @@ public function __construct($name = 'yii-cs-config')
'ereg_to_preg' => true,
'function_typehint_space' => true,
'hash_to_slash_comment' => true,
+ 'include' => true,
'heredoc_to_nowdoc' => true,
-// 'include' => true, // needs more discussion
'is_null' => [
'use_yoda_style' => false,
],
diff --git a/docs/guide-es/concept-autoloading.md b/docs/guide-es/concept-autoloading.md
index 6c913291fe1..1034311f8a0 100644
--- a/docs/guide-es/concept-autoloading.md
+++ b/docs/guide-es/concept-autoloading.md
@@ -73,8 +73,8 @@ sido extraido del [script de entrada](structure-entry-scripts.md) de la [Plantil
La primera línea instala el autocargador de Composer, mientras que la segunda línea instala el autocargador de Yii.
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
```
Puedes usar el autocargador de Composer sin el autocargador de Yii. Sin embargo, al hacerlo, la eficacia de la carga de
diff --git a/docs/guide-es/concept-configurations.md b/docs/guide-es/concept-configurations.md
index 3027a8266c2..0336a394bec 100644
--- a/docs/guide-es/concept-configurations.md
+++ b/docs/guide-es/concept-configurations.md
@@ -76,7 +76,7 @@ Configuración para una [aplicación](structure-applications.md) es probablement
$config = [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
'components' => [
'cache' => [
'class' => 'yii\caching\FileCache',
@@ -143,8 +143,8 @@ Cuando una configuración es muy compleja, una práctica común es almacenarla e
return [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
- 'components' => require(__DIR__ . '/components.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
+ 'components' => require __DIR__ . '/components.php',
];
```
@@ -180,7 +180,7 @@ return [
Para obtener una configuración almacenada en un archivo de configuración, simplemente "requerir" este, como el siguiente:
```php
-$config = require('path/to/web.php');
+$config = require 'path/to/web.php';
(new yii\web\Application($config))->run();
```
diff --git a/docs/guide-es/structure-applications.md b/docs/guide-es/structure-applications.md
index 2f5babf921a..14b01627bbe 100644
--- a/docs/guide-es/structure-applications.md
+++ b/docs/guide-es/structure-applications.md
@@ -20,11 +20,11 @@ Cuando un [script de entrada](structure-entry-scripts.md) crea una aplicación,
una [configuración](concept-configurations.md) y la aplicará a la aplicación, como se muestra a continuación:
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// carga la configuración de la aplicación
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// instancia y configura la aplicación
(new yii\web\Application($config))->run();
diff --git a/docs/guide-es/structure-assets.md b/docs/guide-es/structure-assets.md
index 438cf2baa04..0231d53c430 100644
--- a/docs/guide-es/structure-assets.md
+++ b/docs/guide-es/structure-assets.md
@@ -557,7 +557,7 @@ se incluya condicionalmente este archivo en la configuración de la aplicación.
return [
'components' => [
'assetManager' => [
- 'bundles' => require(__DIR__ . '/' . (YII_ENV_PROD ? 'assets-prod.php' : 'assets-dev.php')),
+ 'bundles' => require __DIR__ . '/' . (YII_ENV_PROD ? 'assets-prod.php' : 'assets-dev.php'),
],
],
];
diff --git a/docs/guide-es/structure-entry-scripts.md b/docs/guide-es/structure-entry-scripts.md
index 4488c1ce3a0..162f9ecb6ed 100644
--- a/docs/guide-es/structure-entry-scripts.md
+++ b/docs/guide-es/structure-entry-scripts.md
@@ -34,13 +34,13 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'dev');
// registrar el cargador automático de Composer
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// incluir el fichero de clase Yii
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// cargar la configuración de la aplicación
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// crear, configurar y ejecutar la aplicación
(new yii\web\Application($config))->run();
@@ -64,13 +64,13 @@ De la misma manera, el siguiente código es el script de entrada para la [aplica
defined('YII_DEBUG') or define('YII_DEBUG', true);
// registrar el cargador automático de Composer
-require(__DIR__ . '/vendor/autoload.php');
+require __DIR__ . '/vendor/autoload.php';
// incluir el fichero de clase Yii
-require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';
// cargar la configuración de la aplicación
-$config = require(__DIR__ . '/config/console.php');
+$config = require __DIR__ . '/config/console.php';
$application = new yii\console\Application($config);
$exitCode = $application->run();
diff --git a/docs/guide-es/structure-modules.md b/docs/guide-es/structure-modules.md
index 3907f0998aa..5e7c282220e 100644
--- a/docs/guide-es/structure-modules.md
+++ b/docs/guide-es/structure-modules.md
@@ -59,7 +59,7 @@ public function init()
{
parent::init();
// inicializa el módulo con la configuración cargada desde config.php
- \Yii::configure($this, require(__DIR__ . '/config.php'));
+ \Yii::configure($this, require __DIR__ . '/config.php');
}
```
diff --git a/docs/guide-es/tutorial-yii-integration.md b/docs/guide-es/tutorial-yii-integration.md
index 5eab4d7e8ff..d97b78fbb9c 100644
--- a/docs/guide-es/tutorial-yii-integration.md
+++ b/docs/guide-es/tutorial-yii-integration.md
@@ -25,10 +25,10 @@ para instalar el cargador automático de Composer:
```php
// instalar el cargador automático de Composer
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// incluir rl fichero de la clase Yii
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
```
### Usando librerías Descargadas
@@ -114,9 +114,9 @@ y desempaquetarla en el directorio `BasePath/vendor`.
Después, debes de modificar el script de entrada de sistema de terceros para incluir el siguiente código al principio:
```php
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
-$yiiConfig = require(__DIR__ . '/../config/yii/web.php');
+$yiiConfig = require __DIR__ . '/../config/yii/web.php';
new yii\web\Application($yiiConfig); // No ejecutes run() aquí
```
@@ -149,14 +149,14 @@ Segundo, modifica el script de entrada de la aplicación como sigue,
```php
// incluir la clase Yii personalizada descrita debajo
-require(__DIR__ . '/../components/Yii.php');
+require __DIR__ . '/../components/Yii.php';
// configuración para la aplicación Yii 2
-$yii2Config = require(__DIR__ . '/../config/yii2/web.php');
+$yii2Config = require __DIR__ . '/../config/yii2/web.php';
new yii\web\Application($yii2Config); // No llamar a run()
// configuración para la aplicación Yii 1
-$yii1Config = require(__DIR__ . '/../config/yii1/main.php');
+$yii1Config = require __DIR__ . '/../config/yii1/main.php';
Yii::createWebApplication($yii1Config)->run();
```
@@ -165,10 +165,10 @@ El código anterior incluye el fichero con la clase `Yii` personalizada, que tie
```php
$yii2path = '/path/to/yii2';
-require($yii2path . '/BaseYii.php'); // Yii 2.x
+require $yii2path . '/BaseYii.php'; // Yii 2.x
$yii1path = '/path/to/yii1';
-require($yii1path . '/YiiBase.php'); // Yii 1.x
+require $yii1path . '/YiiBase.php'; // Yii 1.x
class Yii extends \yii\BaseYii
{
diff --git a/docs/guide-fr/concept-autoloading.md b/docs/guide-fr/concept-autoloading.md
index c5c6862d611..708fec14cfd 100644
--- a/docs/guide-fr/concept-autoloading.md
+++ b/docs/guide-fr/concept-autoloading.md
@@ -47,8 +47,8 @@ Comme Yii utilise Composer comme gestionnaire de dépendances de paquets, il est
Lors de l'utilisation conjointe du chargeur automatique de Yii et d'autres chargeurs automatiques, vous devez inclure le fichier `Yii.php` *après* que tous les autres chargeurs automatiques sont installés. Cela fait du chargeur automatique de Yii le premier à répondre à une requête de chargement automatique de classe. Par exemple, le code suivant est extrait du [script d'entrée](structure-entry-scripts.md) du [modèle de projet *basic*](start-installation.md). La première ligne installe le chargeur automatique de Composer, tandis que la seconde installe le chargeur automatique de Yii :
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
```
Vous pouvez utiliser le chargeur automatique de Composer seul sans celui de Yii. Néanmoins, en faisant de cette manière, la performance de chargement de vos classes est dégradée et vous devez appliquer les règles de Composer pour que vos classes puissent être chargées automatiquement.
diff --git a/docs/guide-fr/concept-configurations.md b/docs/guide-fr/concept-configurations.md
index 47da48b9068..baa5500024c 100644
--- a/docs/guide-fr/concept-configurations.md
+++ b/docs/guide-fr/concept-configurations.md
@@ -78,7 +78,7 @@ La configuration d'une [application](structure-applications.md) est probablement
$config = [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
'components' => [
'cache' => [
'class' => 'yii\caching\FileCache',
@@ -144,8 +144,8 @@ Lorsqu'une configuration est très complexe, une pratique courante est de la sto
return [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
- 'components' => require(__DIR__ . '/components.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
+ 'components' => require __DIR__ . '/components.php',
];
```
@@ -181,7 +181,7 @@ return [
Pour obtenir une configuration stockée dans un fichier de configuration, il vous suffit requérir ce fichier avec "require", comme ceci :
```php
-$config = require('path/to/web.php');
+$config = require 'path/to/web.php';
(new yii\web\Application($config))->run();
```
diff --git a/docs/guide-fr/structure-applications.md b/docs/guide-fr/structure-applications.md
index 500eeda59f2..72e67bfac11 100644
--- a/docs/guide-fr/structure-applications.md
+++ b/docs/guide-fr/structure-applications.md
@@ -16,11 +16,11 @@ Il existe deux types d'application : [[yii\web\Application|les applications We
Losqu'un [script d'entrée](structure-entry-scripts.md) crée une application, il charge une [configuration](concept-configurations.md) et l'applique à cette application de la manière suivante :
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// charger la configuration de l'application
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// instancier et configurer l'application
(new yii\web\Application($config))->run();
diff --git a/docs/guide-fr/structure-assets.md b/docs/guide-fr/structure-assets.md
index 5a75a8cb03e..064efada149 100644
--- a/docs/guide-fr/structure-assets.md
+++ b/docs/guide-fr/structure-assets.md
@@ -421,7 +421,7 @@ Il y a un truc final pour rendre l'approche ci-dessus plus lisse. Au lieu de mod
return [
'components' => [
'assetManager' => [
- 'bundles' => require(__DIR__ . '/' . (YII_ENV_PROD ? 'assets-prod.php' : 'assets-dev.php')),
+ 'bundles' => require __DIR__ . '/' . (YII_ENV_PROD ? 'assets-prod.php' : 'assets-dev.php'),
],
],
];
diff --git a/docs/guide-fr/structure-entry-scripts.md b/docs/guide-fr/structure-entry-scripts.md
index 001f727c461..6b166d4d193 100644
--- a/docs/guide-fr/structure-entry-scripts.md
+++ b/docs/guide-fr/structure-entry-scripts.md
@@ -34,13 +34,13 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'dev');
// register Composer autoloader
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// include Yii class file
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// load application configuration
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// create, configure and run application
(new yii\web\Application($config))->run();
@@ -65,13 +65,13 @@ De même, le code qui suit est le code du script de démarrage d'une application
defined('YII_DEBUG') or define('YII_DEBUG', true);
// register Composer autoloader
-require(__DIR__ . '/vendor/autoload.php');
+require __DIR__ . '/vendor/autoload.php';
// include Yii class file
-require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';
// load application configuration
-$config = require(__DIR__ . '/config/console.php');
+$config = require __DIR__ . '/config/console.php';
$application = new yii\console\Application($config);
$exitCode = $application->run();
diff --git a/docs/guide-fr/structure-modules.md b/docs/guide-fr/structure-modules.md
index 86f395c5195..e797f8d63db 100644
--- a/docs/guide-fr/structure-modules.md
+++ b/docs/guide-fr/structure-modules.md
@@ -49,7 +49,7 @@ public function init()
{
parent::init();
// initialise le module à partir de la configuration chargée depuis config.php
- \Yii::configure($this, require(__DIR__ . '/config.php'));
+ \Yii::configure($this, require __DIR__ . '/config.php');
}
```
diff --git a/docs/guide-id/structure-applications.md b/docs/guide-id/structure-applications.md
index ff0278e27bf..c171c78a380 100644
--- a/docs/guide-id/structure-applications.md
+++ b/docs/guide-id/structure-applications.md
@@ -19,11 +19,11 @@ Ketika [skrip masuk](structure-entry-scripts.md) membuat objek aplikasi, objek i
sebuah [array konfigurasi](concept-configurations.md) dan menerapkannya pada objek aplikasi seperti berikut ini:
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// memuat konfigurasi aplikasi
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// membuat objek aplikasi & menerapkan konfigurasi
(new yii\web\Application($config))->run();
diff --git a/docs/guide-id/structure-entry-scripts.md b/docs/guide-id/structure-entry-scripts.md
index f9facadf261..1c4e686cbf1 100644
--- a/docs/guide-id/structure-entry-scripts.md
+++ b/docs/guide-id/structure-entry-scripts.md
@@ -34,13 +34,13 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'dev');
// mendaftarkan autoloader Composer
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// memasukkan file class Yii
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// Mengambil konfigurasi aplikasi
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// Membuat, mengkonfigurasi, dan menjalankan aplikasi
(new yii\web\Application($config))->run();
@@ -66,13 +66,13 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'dev');
// mendaftarkan autoloader composer
-require(__DIR__ . '/vendor/autoload.php');
+require __DIR__ . '/vendor/autoload.php';
// memasukkan file class Yii
-require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';
// Mengambil konfigurasi aplikasi
-$config = require(__DIR__ . '/config/console.php');
+$config = require __DIR__ . '/config/console.php';
$application = new yii\console\Application($config);
$exitCode = $application->run();
diff --git a/docs/guide-ja/concept-autoloading.md b/docs/guide-ja/concept-autoloading.md
index eb3fff93a28..d524cb56360 100644
--- a/docs/guide-ja/concept-autoloading.md
+++ b/docs/guide-ja/concept-autoloading.md
@@ -66,8 +66,8 @@ Yii オートローダーを他のオートローダーと一緒に使うとき
最初の行は、Composer のオートローダーをインストールしており、二行目は Yii のオートローダーをインストールしています。
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
```
あなたは Yii のオートローダーを使わず、Composer のオートローダーだけを単独で使用することもできます。しかし、そうすることによって、
diff --git a/docs/guide-ja/concept-configurations.md b/docs/guide-ja/concept-configurations.md
index 26979c25ec1..8dd2a4fdce5 100644
--- a/docs/guide-ja/concept-configurations.md
+++ b/docs/guide-ja/concept-configurations.md
@@ -93,7 +93,7 @@ Yii::configure($object, $config);
$config = [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
'components' => [
'cache' => [
'class' => 'yii\caching\FileCache',
@@ -136,7 +136,7 @@ $config = [
$config = [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
'container' => [
'definitions' => [
'yii\widgets\LinkPager' => ['maxButtonCount' => 5]
@@ -185,8 +185,8 @@ echo Menu::widget([
return [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
- 'components' => require(__DIR__ . '/components.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
+ 'components' => require __DIR__ . '/components.php',
];
```
`components` の構成もまた複雑になるため、上記のように、 `components.php` と呼ぶ別のファイルにそれを格納し `web.php` でそのファイルを "require" しています。
@@ -222,7 +222,7 @@ return [
構成情報ファイルに格納されている構成情報を取得するには、以下のように、それを "require" するだけです:
```php
-$config = require('path/to/web.php');
+$config = require 'path/to/web.php';
(new yii\web\Application($config))->run();
```
diff --git a/docs/guide-ja/structure-applications.md b/docs/guide-ja/structure-applications.md
index 1d3913816c9..df58f57099b 100644
--- a/docs/guide-ja/structure-applications.md
+++ b/docs/guide-ja/structure-applications.md
@@ -16,11 +16,11 @@
[エントリスクリプト](structure-entry-scripts.md) は、アプリケーションを作成するときに、下記のように、[構成情報](concept-configurations.md) を読み込んで、それをアプリケーションに適用します。
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// アプリケーションの構成情報を読み込む
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// アプリケーションのインスタンスを作成し、構成情報を適用する
(new yii\web\Application($config))->run();
diff --git a/docs/guide-ja/structure-assets.md b/docs/guide-ja/structure-assets.md
index f0cd1544697..822c2b36bb5 100644
--- a/docs/guide-ja/structure-assets.md
+++ b/docs/guide-ja/structure-assets.md
@@ -600,7 +600,7 @@ return [
return [
'components' => [
'assetManager' => [
- 'bundles' => require(__DIR__ . '/' . (YII_ENV_PROD ? 'assets-prod.php' : 'assets-dev.php')),
+ 'bundles' => require __DIR__ . '/' . (YII_ENV_PROD ? 'assets-prod.php' : 'assets-dev.php'),
],
],
];
diff --git a/docs/guide-ja/structure-entry-scripts.md b/docs/guide-ja/structure-entry-scripts.md
index fab93df3139..30852ad0363 100644
--- a/docs/guide-ja/structure-entry-scripts.md
+++ b/docs/guide-ja/structure-entry-scripts.md
@@ -32,13 +32,13 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'dev');
// Composer のオートローダを登録
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// Yii クラスファイルをインクルード
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// アプリケーションの構成情報を読み出す
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// アプリケーションを作成し、構成して、走らせる
(new yii\web\Application($config))->run();
@@ -64,13 +64,13 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'dev');
// Composer のオートローダを登録
-require(__DIR__ . '/vendor/autoload.php');
+require __DIR__ . '/vendor/autoload.php';
// Yii クラスファイルをインクルード
-require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';
// アプリケーションの構成情報を読み出す
-$config = require(__DIR__ . '/config/console.php');
+$config = require __DIR__ . '/config/console.php';
$application = new yii\console\Application($config);
$exitCode = $application->run();
diff --git a/docs/guide-ja/structure-modules.md b/docs/guide-ja/structure-modules.md
index b8ebbef624e..c17004767e9 100644
--- a/docs/guide-ja/structure-modules.md
+++ b/docs/guide-ja/structure-modules.md
@@ -57,7 +57,7 @@ public function init()
{
parent::init();
// config.php からロードした構成情報でモジュールを初期化する
- \Yii::configure($this, require(__DIR__ . '/config.php'));
+ \Yii::configure($this, require __DIR__ . '/config.php');
}
```
diff --git a/docs/guide-ja/tutorial-console.md b/docs/guide-ja/tutorial-console.md
index 6b4a5a4a0b6..1fb8931165a 100644
--- a/docs/guide-ja/tutorial-console.md
+++ b/docs/guide-ja/tutorial-console.md
@@ -69,10 +69,10 @@ yii migrate/up 5 --migrationTable=migrations
defined('YII_DEBUG') or define('YII_DEBUG', true);
-require(__DIR__ . '/vendor/autoload.php');
-require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/vendor/autoload.php';
+require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';
-$config = require(__DIR__ . '/config/console.php');
+$config = require __DIR__ . '/config/console.php';
$application = new yii\console\Application($config);
$exitCode = $application->run();
diff --git a/docs/guide-ja/tutorial-yii-integration.md b/docs/guide-ja/tutorial-yii-integration.md
index b4f9f438598..ed415f42374 100644
--- a/docs/guide-ja/tutorial-yii-integration.md
+++ b/docs/guide-ja/tutorial-yii-integration.md
@@ -24,10 +24,10 @@ Yii アプリケーションの中でサードパーティのライブラリを
```php
// Composer のオートローダをインストール
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// Yii クラスファイルをインクルード
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
```
### ダウンロードしたライブラリを使う
@@ -107,9 +107,9 @@ Composer に関する更なる情報や、インストールの過程で出現
次のコードをエントリスクリプトの先頭に追加してください。
```php
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
-$yiiConfig = require(__DIR__ . '/../config/yii/web.php');
+$yiiConfig = require __DIR__ . '/../config/yii/web.php';
new yii\web\Application($yiiConfig); // ここで run() を呼ばない
```
@@ -140,14 +140,14 @@ Yii 2 を Yii 1 とともに使う
```php
// カスタマイズされた Yii クラスをインクルード (下記で説明)
-require(__DIR__ . '/../components/Yii.php');
+require __DIR__ . '/../components/Yii.php';
// Yii 2 アプリケーションの構成
-$yii2Config = require(__DIR__ . '/../config/yii2/web.php');
+$yii2Config = require __DIR__ . '/../config/yii2/web.php';
new yii\web\Application($yii2Config); // ここで run() を呼ばない。yii2 app はサービスロケータとしてのみ使用される。
// Yii 1 アプリケーションの構成
-$yii1Config = require(__DIR__ . '/../config/yii1/main.php');
+$yii1Config = require __DIR__ . '/../config/yii1/main.php';
Yii::createWebApplication($yii1Config)->run();
```
@@ -156,10 +156,10 @@ Yii 1 と Yii 2 の両者が `Yii` クラスを持っているため、二つを
```php
$yii2path = '/path/to/yii2';
-require($yii2path . '/BaseYii.php'); // Yii 2.x
+require $yii2path . '/BaseYii.php'; // Yii 2.x
$yii1path = '/path/to/yii1';
-require($yii1path . '/YiiBase.php'); // Yii 1.x
+require $yii1path . '/YiiBase.php'; // Yii 1.x
class Yii extends \yii\BaseYii
{
diff --git a/docs/guide-pl/concept-autoloading.md b/docs/guide-pl/concept-autoloading.md
index 46ccfcd4a3e..078b60b0f1b 100644
--- a/docs/guide-pl/concept-autoloading.md
+++ b/docs/guide-pl/concept-autoloading.md
@@ -68,8 +68,8 @@ w [skrypcie wejściowym](structure-entry-scripts.md) [podstawowego szablonu proj
instrukcją instalacji autoloadera composera, a druga instaluje autoloader Yii:
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
```
Możesz używać jedynie autoloadera composera bez autoloadera Yii, ale wydajność autoładowania klas może być wtedy obniżona i, dodatkowo,
diff --git a/docs/guide-pl/structure-entry-scripts.md b/docs/guide-pl/structure-entry-scripts.md
index 6a420b2fc87..2abca2dcd3c 100644
--- a/docs/guide-pl/structure-entry-scripts.md
+++ b/docs/guide-pl/structure-entry-scripts.md
@@ -33,13 +33,13 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'dev');
// register Composer autoloader
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// include Yii class file
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// load application configuration
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// create, configure and run application
(new yii\web\Application($config))->run();
@@ -64,13 +64,13 @@ Podobnie poniżej kod skryptu wejściowego dla aplikacji konsolowej:
defined('YII_DEBUG') or define('YII_DEBUG', true);
// register Composer autoloader
-require(__DIR__ . '/vendor/autoload.php');
+require __DIR__ . '/vendor/autoload.php';
// include Yii class file
-require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';
// load application configuration
-$config = require(__DIR__ . '/config/console.php');
+$config = require __DIR__ . '/config/console.php';
$application = new yii\console\Application($config);
$exitCode = $application->run();
diff --git a/docs/guide-pt-BR/concept-autoloading.md b/docs/guide-pt-BR/concept-autoloading.md
index 8b976db88b3..7e51b7d065d 100644
--- a/docs/guide-pt-BR/concept-autoloading.md
+++ b/docs/guide-pt-BR/concept-autoloading.md
@@ -48,8 +48,8 @@ Uma vez que o Yii utiliza o Composer como seu gerenciador de dependência de pac
Ao usar o Yii autoloader junto com outros autoloaders, você deve incluir o arquivo `Yii.php` *depois* de todos os outros autoloaders serem instalados. Isso fará com que o Yii autoloader seja o primeiro a responder a qualquer solicitação de autoloading de classe. Por exemplo, o código a seguir foi extraído do [script de entrada](structure-entry-scripts.md) do [Template Básico de Projeto](start-installation.md). A primeira linha instala o Composer autoloader, enquanto a segunda linha instala o Yii autoloader:
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
```
Você pode usar o autoloader do Composer sozinho sem o autoloader do Yii. No entanto, ao fazê-lo, o desempenho do carregamento automático das classes pode ser degradada, e você deve seguir as regras estabelecidas pelo Composer para que suas classes sejam auto carregáveis.
diff --git a/docs/guide-pt-BR/concept-configurations.md b/docs/guide-pt-BR/concept-configurations.md
index 617e8a939c7..92f3e39bcc9 100644
--- a/docs/guide-pt-BR/concept-configurations.md
+++ b/docs/guide-pt-BR/concept-configurations.md
@@ -81,7 +81,7 @@ Mais importante, suas propriedades [[yii\web\Application::components|components]
$config = [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
'components' => [
'cache' => [
'class' => 'yii\caching\FileCache',
@@ -150,8 +150,8 @@ Por exemplo, você pode guardar uma configuração da aplicação em um arquivo
return [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
- 'components' => require(__DIR__ . '/components.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
+ 'components' => require __DIR__ . '/components.php',
];
```
@@ -187,7 +187,7 @@ return [
Para pegar a configuração armazenada em um arquivo de configuração, simplismente faça um "require" deste arquivo, como o exemplo abaixo:
```php
-$config = require('path/to/web.php');
+$config = require 'path/to/web.php';
(new yii\web\Application($config))->run();
```
diff --git a/docs/guide-pt-BR/structure-applications.md b/docs/guide-pt-BR/structure-applications.md
index aa344cadb83..16923e77a52 100644
--- a/docs/guide-pt-BR/structure-applications.md
+++ b/docs/guide-pt-BR/structure-applications.md
@@ -22,11 +22,11 @@ carregará uma [configuração](concept-configurations.md) e a aplicará à apli
da seguinte forma:
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// carrega a configuração da aplicação
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// instancia e configura a aplicação
(new yii\web\Application($config))->run();
diff --git a/docs/guide-pt-BR/structure-assets.md b/docs/guide-pt-BR/structure-assets.md
index 9106c693981..304e7f0950b 100644
--- a/docs/guide-pt-BR/structure-assets.md
+++ b/docs/guide-pt-BR/structure-assets.md
@@ -701,7 +701,7 @@ condicionalmente incluir este arquivo na configuração da aplicação. Por exem
return [
'components' => [
'assetManager' => [
- 'bundles' => require(__DIR__ . '/' . (YII_ENV_PROD ? 'assets-prod.php' : 'assets-dev.php')),
+ 'bundles' => require __DIR__ . '/' . (YII_ENV_PROD ? 'assets-prod.php' : 'assets-dev.php'),
],
],
];
diff --git a/docs/guide-pt-BR/structure-entry-scripts.md b/docs/guide-pt-BR/structure-entry-scripts.md
index 0c295dc23d5..1b887f0616a 100644
--- a/docs/guide-pt-BR/structure-entry-scripts.md
+++ b/docs/guide-pt-BR/structure-entry-scripts.md
@@ -38,13 +38,13 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'dev');
// registra o autoloader do Composer
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// inclui o arquivo da classe Yii
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// carrega a configuração da aplicação
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// cria, configura e executa a aplicação
(new yii\web\Application($config))->run();
@@ -70,13 +70,13 @@ do console:
defined('YII_DEBUG') or define('YII_DEBUG', true);
// registra o autoloader do Composer
-require(__DIR__ . '/vendor/autoload.php');
+require __DIR__ . '/vendor/autoload.php';
// inclui o arquivo da classe Yii
-require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';
// carrega a configuração da aplicação
-$config = require(__DIR__ . '/config/console.php');
+$config = require __DIR__ . '/config/console.php';
$application = new yii\console\Application($config);
$exitCode = $application->run();
diff --git a/docs/guide-pt-BR/structure-modules.md b/docs/guide-pt-BR/structure-modules.md
index d0cc39090f0..9186321108b 100644
--- a/docs/guide-pt-BR/structure-modules.md
+++ b/docs/guide-pt-BR/structure-modules.md
@@ -69,7 +69,7 @@ public function init()
{
parent::init();
// inicializa o módulo com as configurações carregadas de config.php
- \Yii::configure($this, require(__DIR__ . '/config.php'));
+ \Yii::configure($this, require __DIR__ . '/config.php');
}
```
diff --git a/docs/guide-pt-BR/tutorial-yii-integration.md b/docs/guide-pt-BR/tutorial-yii-integration.md
index b6c88c8a30f..d319ac2a81b 100644
--- a/docs/guide-pt-BR/tutorial-yii-integration.md
+++ b/docs/guide-pt-BR/tutorial-yii-integration.md
@@ -21,10 +21,10 @@ As classes nos pacotes Composer instalados podem ser carregadas automaticamente
```php
// Instala o Composer autoloader
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// faz o include da classe Yii
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
```
@@ -79,9 +79,9 @@ Caso contrário, você pode fazer o [download](http://www.yiiframework.com/downl
Em seguida, você deve modificar o script de entrada do sistema de terceiros incluindo o seguinte código no início:
```php
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
-$yiiConfig = require(__DIR__ . '/../config/yii/web.php');
+$yiiConfig = require __DIR__ . '/../config/yii/web.php';
new yii\web\Application($yiiConfig); // NÃO execute o método run() aqui
```
@@ -105,14 +105,14 @@ Segundo, altere o script de entrada da sua aplicação como a seguir,
```php
// incluir a classe Yii personalizado descrito abaixo
-require(__DIR__ . '/../components/Yii.php');
+require __DIR__ . '/../components/Yii.php';
// configuração para aplicação Yii 2
-$yii2Config = require(__DIR__ . '/../config/yii2/web.php');
+$yii2Config = require __DIR__ . '/../config/yii2/web.php';
new yii\web\Application($yii2Config); // NÃO execute o método run() aqui
// configuração para aplicação Yii 1
-$yii1Config = require(__DIR__ . '/../config/yii1/main.php');
+$yii1Config = require __DIR__ . '/../config/yii1/main.php';
Yii::createWebApplication($yii1Config)->run();
```
@@ -120,10 +120,10 @@ Uma vez que ambos Yii 1 e Yii 2 possuem a classe `Yii`, você deve criar uma ver
```php
$yii2path = '/path/to/yii2';
-require($yii2path . '/BaseYii.php'); // Yii 2.x
+require $yii2path . '/BaseYii.php'; // Yii 2.x
$yii1path = '/path/to/yii1';
-require($yii1path . '/YiiBase.php'); // Yii 1.x
+require $yii1path . '/YiiBase.php'; // Yii 1.x
class Yii extends \yii\BaseYii
{
diff --git a/docs/guide-ru/concept-autoloading.md b/docs/guide-ru/concept-autoloading.md
index 5005d8a298e..4e9188d207e 100644
--- a/docs/guide-ru/concept-autoloading.md
+++ b/docs/guide-ru/concept-autoloading.md
@@ -71,8 +71,8 @@ Yii::$classMap['foo\bar\MyClass'] = 'path/to/MyClass.php';
автозагрузчик Composer, а вторая — автозагрузчик Yii:
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
```
Вы можете использовать автозагрузчик Composer без автозагрузчика Yii. Однако, скорость автозагрузки в этом случае
diff --git a/docs/guide-ru/concept-configurations.md b/docs/guide-ru/concept-configurations.md
index 2a755380c78..0dac8fedfea 100644
--- a/docs/guide-ru/concept-configurations.md
+++ b/docs/guide-ru/concept-configurations.md
@@ -97,7 +97,7 @@ Yii::configure($object, $config);
$config = [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
'components' => [
'cache' => [
'class' => 'yii\caching\FileCache',
@@ -142,7 +142,7 @@ $config = [
$config = [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
'container' => [
'definitions' => [
'yii\widgets\LinkPager' => ['maxButtonCount' => 5]
@@ -194,8 +194,8 @@ echo Menu::widget([
return [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
- 'components' => require(__DIR__ . '/components.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
+ 'components' => require __DIR__ . '/components.php',
];
```
@@ -233,7 +233,7 @@ return [
Чтобы получить конфигурацию, хранящуюся в файле, достаточно подключить файл с помощью `require`:
```php
-$config = require('path/to/web.php');
+$config = require 'path/to/web.php';
(new yii\web\Application($config))->run();
```
diff --git a/docs/guide-ru/structure-applications.md b/docs/guide-ru/structure-applications.md
index 0f3cee62098..47c4e66432b 100644
--- a/docs/guide-ru/structure-applications.md
+++ b/docs/guide-ru/structure-applications.md
@@ -18,11 +18,11 @@
и применит её к приложению, например:
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// загрузка конфигурации приложения
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// создание объекта приложения и его конфигурирование
(new yii\web\Application($config))->run();
diff --git a/docs/guide-ru/structure-assets.md b/docs/guide-ru/structure-assets.md
index a407d959f1a..3efd56c4ae9 100644
--- a/docs/guide-ru/structure-assets.md
+++ b/docs/guide-ru/structure-assets.md
@@ -583,7 +583,7 @@ return [
return [
'components' => [
'assetManager' => [
- 'bundles' => require(__DIR__ . '/' . (YII_ENV_PROD ? 'assets-prod.php' : 'assets-dev.php')),
+ 'bundles' => require __DIR__ . '/' . (YII_ENV_PROD ? 'assets-prod.php' : 'assets-dev.php'),
],
],
];
diff --git a/docs/guide-ru/structure-entry-scripts.md b/docs/guide-ru/structure-entry-scripts.md
index a16109e8a44..71fbf54ebd9 100644
--- a/docs/guide-ru/structure-entry-scripts.md
+++ b/docs/guide-ru/structure-entry-scripts.md
@@ -34,13 +34,13 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'dev');
// регистрация загрузчика классов Composer
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// подключение файла класса Yii
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// загрузка конфигурации приложения
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// создание и конфигурация приложения, а также вызов метода для обработки входящего запроса
(new yii\web\Application($config))->run();
@@ -65,13 +65,13 @@ $config = require(__DIR__ . '/../config/web.php');
defined('YII_DEBUG') or define('YII_DEBUG', true);
// регистрация загрузчика классов Composer
-require(__DIR__ . '/vendor/autoload.php');
+require __DIR__ . '/vendor/autoload.php';
// подключение файла класса Yii
-require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';
// загрузка конфигурации приложения
-$config = require(__DIR__ . '/config/console.php');
+$config = require __DIR__ . '/config/console.php';
$application = new yii\console\Application($config);
$exitCode = $application->run();
diff --git a/docs/guide-ru/structure-modules.md b/docs/guide-ru/structure-modules.md
index b554cf29751..78d3e67c973 100644
--- a/docs/guide-ru/structure-modules.md
+++ b/docs/guide-ru/structure-modules.md
@@ -56,7 +56,7 @@ public function init()
{
parent::init();
// инициализация модуля с помощью конфигурации, загруженной из config.php
- \Yii::configure($this, require(__DIR__ . '/config.php'));
+ \Yii::configure($this, require __DIR__ . '/config.php');
}
```
diff --git a/docs/guide-ru/tutorial-console.md b/docs/guide-ru/tutorial-console.md
index 022554a9995..8eb5b282755 100644
--- a/docs/guide-ru/tutorial-console.md
+++ b/docs/guide-ru/tutorial-console.md
@@ -71,10 +71,10 @@ yii migrate/up 5 --migrationTable=migrations
defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'dev');
-require(__DIR__ . '/vendor/autoload.php');
-require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/vendor/autoload.php';
+require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';
-$config = require(__DIR__ . '/config/console.php');
+$config = require __DIR__ . '/config/console.php';
$application = new yii\console\Application($config);
$exitCode = $application->run();
diff --git a/docs/guide-ru/tutorial-yii-integration.md b/docs/guide-ru/tutorial-yii-integration.md
index 3000912ca0c..6df394f094a 100644
--- a/docs/guide-ru/tutorial-yii-integration.md
+++ b/docs/guide-ru/tutorial-yii-integration.md
@@ -21,10 +21,10 @@
```php
// подключение автозагрузчика Composer
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// подключение файла класса Yii
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
```
### Использование отдельных библиотек
@@ -79,9 +79,9 @@ composer require yiisoft/yii2
Далее следует изменить входной скрипт сторонней системы, поместив в его начало следующий код:
```php
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
-$yiiConfig = require(__DIR__ . '/../config/yii/web.php');
+$yiiConfig = require __DIR__ . '/../config/yii/web.php';
new yii\web\Application($yiiConfig); // НЕ ВЫЗЫВАЙТЕ run() в этом месте
```
@@ -106,14 +106,14 @@ new yii\web\Application($yiiConfig); // НЕ ВЫЗЫВАЙТЕ run() в это
```php
// подключение модифицированного класса Yii, описанного ниже
-require(__DIR__ . '/../components/Yii.php');
+require __DIR__ . '/../components/Yii.php';
// настройка приложения Yii 2
-$yii2Config = require(__DIR__ . '/../config/yii2/web.php');
+$yii2Config = require __DIR__ . '/../config/yii2/web.php';
new yii\web\Application($yii2Config); // НЕ ВЫЗЫВАЙТЕ run()
// настройка приложения Yii 1
-$yii1Config = require(__DIR__ . '/../config/yii1/main.php');
+$yii1Config = require __DIR__ . '/../config/yii1/main.php';
Yii::createWebApplication($yii1Config)->run();
```
@@ -122,10 +122,10 @@ Yii::createWebApplication($yii1Config)->run();
```php
$yii2path = '/path/to/yii2';
-require($yii2path . '/BaseYii.php'); // Yii 2.x
+require $yii2path . '/BaseYii.php'; // Yii 2.x
$yii1path = '/path/to/yii1';
-require($yii1path . '/YiiBase.php'); // Yii 1.x
+require $yii1path . '/YiiBase.php'; // Yii 1.x
class Yii extends \yii\BaseYii
{
diff --git a/docs/guide-uk/concept-autoloading.md b/docs/guide-uk/concept-autoloading.md
index 60bbebdbc1b..171a9731094 100644
--- a/docs/guide-uk/concept-autoloading.md
+++ b/docs/guide-uk/concept-autoloading.md
@@ -69,8 +69,8 @@ Yii::$classMap['foo\bar\MyClass'] = 'path/to/MyClass.php';
Перший рядок встановлює автозавантажувач Composer, а другий - автозавантажувач Yii:
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
```
Ви можете використовувати автозавантажувач Composer без автозавантажувачa Yii, однак, швидкість автозавантаження в
diff --git a/docs/guide-uk/structure-applications.md b/docs/guide-uk/structure-applications.md
index 6579b187924..82d1842fd2a 100644
--- a/docs/guide-uk/structure-applications.md
+++ b/docs/guide-uk/structure-applications.md
@@ -19,11 +19,11 @@
[конфігурацію](concept-configurations.md) та застосує її до додатка, наприклад:
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// завантаження конфігурації додатка
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// створення екземпляру додатка і його налаштування
(new yii\web\Application($config))->run();
diff --git a/docs/guide-uk/structure-entry-scripts.md b/docs/guide-uk/structure-entry-scripts.md
index aa750cc55b1..c15bf3a08f8 100644
--- a/docs/guide-uk/structure-entry-scripts.md
+++ b/docs/guide-uk/structure-entry-scripts.md
@@ -34,13 +34,13 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'dev');
// реєстрація автозавантажувача класів Composer
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// підключення файлу класу Yii
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// завантаження конфігурації додатка
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// створення, конфігурація та виконання додатка
(new yii\web\Application($config))->run();
@@ -65,13 +65,13 @@ $config = require(__DIR__ . '/../config/web.php');
defined('YII_DEBUG') or define('YII_DEBUG', true);
// реєстрація автозавантажувача класів Composer
-require(__DIR__ . '/vendor/autoload.php');
+require __DIR__ . '/vendor/autoload.php';
// підключення файлу класу Yii
-require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';
// завантаження конфігурації додатка
-$config = require(__DIR__ . '/config/console.php');
+$config = require __DIR__ . '/config/console.php';
$application = new yii\console\Application($config);
$exitCode = $application->run();
diff --git a/docs/guide-uk/tutorial-console.md b/docs/guide-uk/tutorial-console.md
index 7ec4a218ff4..468201da477 100644
--- a/docs/guide-uk/tutorial-console.md
+++ b/docs/guide-uk/tutorial-console.md
@@ -69,10 +69,10 @@ yii migrate/up 5 --migrationTable=migrations
defined('YII_DEBUG') or define('YII_DEBUG', true);
-require(__DIR__ . '/vendor/autoload.php');
-require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/vendor/autoload.php';
+require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';
-$config = require(__DIR__ . '/config/console.php');
+$config = require __DIR__ . '/config/console.php';
$application = new yii\console\Application($config);
$exitCode = $application->run();
diff --git a/docs/guide-uk/tutorial-yii-integration.md b/docs/guide-uk/tutorial-yii-integration.md
index e61d3fba997..1c494d5ae57 100644
--- a/docs/guide-uk/tutorial-yii-integration.md
+++ b/docs/guide-uk/tutorial-yii-integration.md
@@ -26,10 +26,10 @@
```php
// встановлення автозавантажувача Composer
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// підключення файлу класа Yii
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
```
### Використовуйте завантажені бібліотеки
@@ -117,9 +117,9 @@ Yii::$classMap['Class2'] = 'path/to/Class2.php';
Далі вам необхідно змінити вхідний скрипт сторонньої системи помістивши на його початок наступний код:
```php
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
-$yiiConfig = require(__DIR__ . '/../config/yii/web.php');
+$yiiConfig = require __DIR__ . '/../config/yii/web.php';
new yii\web\Application($yiiConfig); // НЕ ВИКЛИКАЙТЕ run() в цьому місці
```
@@ -152,14 +152,14 @@ new yii\web\Application($yiiConfig); // НЕ ВИКЛИКАЙТЕ run() в ць
```php
// підключення модифікованого класу Yii, описаного нижче
-require(__DIR__ . '/../components/Yii.php');
+require __DIR__ . '/../components/Yii.php';
// налаштування додатку Yii 2
-$yii2Config = require(__DIR__ . '/../config/yii2/web.php');
+$yii2Config = require __DIR__ . '/../config/yii2/web.php';
new yii\web\Application($yii2Config); // не викликайте run()
// налаштування додатку Yii 1
-$yii1Config = require(__DIR__ . '/../config/yii1/main.php');
+$yii1Config = require __DIR__ . '/../config/yii1/main.php';
Yii::createWebApplication($yii1Config)->run();
```
@@ -168,10 +168,10 @@ Yii::createWebApplication($yii1Config)->run();
```php
$yii2path = '/path/to/yii2';
-require($yii2path . '/BaseYii.php'); // Yii 2.x
+require $yii2path . '/BaseYii.php'; // Yii 2.x
$yii1path = '/path/to/yii1';
-require($yii1path . '/YiiBase.php'); // Yii 1.x
+require $yii1path . '/YiiBase.php'; // Yii 1.x
class Yii extends \yii\BaseYii
{
diff --git a/docs/guide-zh-CN/concept-autoloading.md b/docs/guide-zh-CN/concept-autoloading.md
index 471b98ca025..e317a1f7397 100644
--- a/docs/guide-zh-CN/concept-autoloading.md
+++ b/docs/guide-zh-CN/concept-autoloading.md
@@ -49,8 +49,8 @@ Yii::$classMap['foo\bar\MyClass'] = 'path/to/MyClass.php';
当你同时使用其他自动加载器和 Yii 自动加载器时，应该在其他自动加载器安装成功**之后**，再包含 `Yii.php` 文件。这将使 Yii 成为第一个响应任何类自动加载请求的自动加载器。举例来说，以下代码提取自[基本应用模版](start-installation.md)的[入口脚本](structure-entry-scripts.md) 。第一行安装了 Composer 的自动加载器，第二行才是 Yii 的自动加载器：
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
```
你也可以只使用 Composer 的自动加载，而不用 Yii 的自动加载。不过这样做的话，类的加载效率会下降，且你必须遵循 Composer 所设定的规则，从而让你的类满足可以被自动加载的要求。
diff --git a/docs/guide-zh-CN/concept-configurations.md b/docs/guide-zh-CN/concept-configurations.md
index bbd3f0c823b..fbdcb23290f 100644
--- a/docs/guide-zh-CN/concept-configurations.md
+++ b/docs/guide-zh-CN/concept-configurations.md
@@ -79,7 +79,7 @@ Yii 中的配置可以用在很多场景。本章开头我们展示了如何使
$config = [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
'components' => [
'cache' => [
'class' => 'yii\caching\FileCache',
@@ -146,8 +146,8 @@ echo Menu::widget([
return [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
- 'components' => require(__DIR__ . '/components.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
+ 'components' => require __DIR__ . '/components.php',
];
```
@@ -183,7 +183,7 @@ return [
仅仅需要 “require”，就可以取得一个配置文件的配置内容，像这样：
```php
-$config = require('path/to/web.php');
+$config = require 'path/to/web.php';
(new yii\web\Application($config))->run();
```
diff --git a/docs/guide-zh-CN/structure-applications.md b/docs/guide-zh-CN/structure-applications.md
index 35c2be70af1..1bf63b66752 100644
--- a/docs/guide-zh-CN/structure-applications.md
+++ b/docs/guide-zh-CN/structure-applications.md
@@ -15,11 +15,11 @@ Yii有两种应用主体: [[yii\web\Application|网页应用主体]] and
如下所示，当 [入口脚本](structure-entry-scripts.md) 创建了一个应用主体，它会加载一个 [配置](concept-configurations.md) 文件并传给应用主体。
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// 加载应用主体配置
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// 实例化应用主体、配置应用主体
(new yii\web\Application($config))->run();
diff --git a/docs/guide-zh-CN/structure-assets.md b/docs/guide-zh-CN/structure-assets.md
index fa0e3482b50..669c7310d64 100644
--- a/docs/guide-zh-CN/structure-assets.md
+++ b/docs/guide-zh-CN/structure-assets.md
@@ -449,7 +449,7 @@ return [
return [
'components' => [
'assetManager' => [
- 'bundles' => require(__DIR__ . '/' . (YII_ENV_PROD ? 'assets-prod.php' : 'assets-dev.php')),
+ 'bundles' => require __DIR__ . '/' . (YII_ENV_PROD ? 'assets-prod.php' : 'assets-dev.php'),
],
],
];
diff --git a/docs/guide-zh-CN/structure-entry-scripts.md b/docs/guide-zh-CN/structure-entry-scripts.md
index 08415f16531..2efaf609a43 100644
--- a/docs/guide-zh-CN/structure-entry-scripts.md
+++ b/docs/guide-zh-CN/structure-entry-scripts.md
@@ -28,13 +28,13 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'dev');
// 注册 Composer 自动加载器
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// 包含 Yii 类文件
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// 加载应用配置
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// 创建、配置、运行一个应用
(new yii\web\Application($config))->run();
@@ -59,13 +59,13 @@ $config = require(__DIR__ . '/../config/web.php');
defined('YII_DEBUG') or define('YII_DEBUG', true);
// 注册 Composer 自动加载器
-require(__DIR__ . '/vendor/autoload.php');
+require __DIR__ . '/vendor/autoload.php';
// 包含 Yii 类文件
-require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';
// 加载应用配置
-$config = require(__DIR__ . '/config/console.php');
+$config = require __DIR__ . '/config/console.php';
$application = new yii\console\Application($config);
$exitCode = $application->run();
diff --git a/docs/guide-zh-CN/structure-modules.md b/docs/guide-zh-CN/structure-modules.md
index 5c65a1fbb49..19974b709b8 100644
--- a/docs/guide-zh-CN/structure-modules.md
+++ b/docs/guide-zh-CN/structure-modules.md
@@ -58,7 +58,7 @@ public function init()
{
parent::init();
// 从config.php加载配置来初始化模块
- \Yii::configure($this, require(__DIR__ . '/config.php'));
+ \Yii::configure($this, require __DIR__ . '/config.php');
}
```
diff --git a/docs/guide-zh-CN/tutorial-yii-integration.md b/docs/guide-zh-CN/tutorial-yii-integration.md
index 3d069ae316f..2e5403dce31 100644
--- a/docs/guide-zh-CN/tutorial-yii-integration.md
+++ b/docs/guide-zh-CN/tutorial-yii-integration.md
@@ -21,10 +21,10 @@
```php
// install Composer autoloader （安装 Composer 自动加载器）
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// include Yii class file （加载 Yii 的类文件）
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
```
@@ -77,9 +77,9 @@ Yii::$classMap['Class2'] = 'path/to/Class2.php';
之后，你需要修改该第三方应用的入口脚本，在开头位置添加 Yii 的引入代码：
```php
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
-$yiiConfig = require(__DIR__ . '/../config/yii/web.php');
+$yiiConfig = require __DIR__ . '/../config/yii/web.php';
new yii\web\Application($yiiConfig); // 千万别在这调用 run() 方法。（笑）
```
@@ -103,14 +103,14 @@ Yii 2 独占功能的支持来增强这个系统。下面我们就来详细描
```php
// 导入下面会详细说明的定制 Yii 类文件。
-require(__DIR__ . '/../components/Yii.php');
+require __DIR__ . '/../components/Yii.php';
// Yii 2 应用的配置文件
-$yii2Config = require(__DIR__ . '/../config/yii2/web.php');
+$yii2Config = require __DIR__ . '/../config/yii2/web.php';
new yii\web\Application($yii2Config); // Do NOT call run()
// Yii 1 应用的配置文件
-$yii1Config = require(__DIR__ . '/../config/yii1/main.php');
+$yii1Config = require __DIR__ . '/../config/yii1/main.php';
Yii::createWebApplication($yii1Config)->run();
```
@@ -118,10 +118,10 @@ Yii::createWebApplication($yii1Config)->run();
```php
$yii2path = '/path/to/yii2';
-require($yii2path . '/BaseYii.php'); // Yii 2.x
+require $yii2path . '/BaseYii.php'; // Yii 2.x
$yii1path = '/path/to/yii1';
-require($yii1path . '/YiiBase.php'); // Yii 1.x
+require $yii1path . '/YiiBase.php'; // Yii 1.x
class Yii extends \yii\BaseYii
{
diff --git a/docs/guide/concept-autoloading.md b/docs/guide/concept-autoloading.md
index fe5055bccae..90d17d7842c 100644
--- a/docs/guide/concept-autoloading.md
+++ b/docs/guide/concept-autoloading.md
@@ -72,8 +72,8 @@ the [entry script](structure-entry-scripts.md) of the [Basic Project Template](s
line installs the Composer autoloader, while the second line installs the Yii autoloader:
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
```
You may use the Composer autoloader alone without the Yii autoloader. However, by doing so, the performance
diff --git a/docs/guide/concept-configurations.md b/docs/guide/concept-configurations.md
index 0afefb2e04f..ef361c0d13f 100644
--- a/docs/guide/concept-configurations.md
+++ b/docs/guide/concept-configurations.md
@@ -97,7 +97,7 @@ configuration file for the [Basic Project Template](start-installation.md).
$config = [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
'components' => [
'cache' => [
'class' => 'yii\caching\FileCache',
@@ -142,7 +142,7 @@ configuration using `container` property. For example:
$config = [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
'container' => [
'definitions' => [
'yii\widgets\LinkPager' => ['maxButtonCount' => 5]
@@ -193,8 +193,8 @@ For example, you may keep an application configuration in a file named `web.php`
return [
'id' => 'basic',
'basePath' => dirname(__DIR__),
- 'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
- 'components' => require(__DIR__ . '/components.php'),
+ 'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
+ 'components' => require __DIR__ . '/components.php',
];
```
@@ -231,7 +231,7 @@ return [
To get a configuration stored in a configuration file, simply "require" it, like the following:
```php
-$config = require('path/to/web.php');
+$config = require 'path/to/web.php';
(new yii\web\Application($config))->run();
```
diff --git a/docs/guide/structure-applications.md b/docs/guide/structure-applications.md
index 786b388bb48..89a33e3f5a8 100644
--- a/docs/guide/structure-applications.md
+++ b/docs/guide/structure-applications.md
@@ -19,11 +19,11 @@ When an [entry script](structure-entry-scripts.md) creates an application, it wi
a [configuration](concept-configurations.md) and apply it to the application, as follows:
```php
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// load application configuration
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// instantiate and configure the application
(new yii\web\Application($config))->run();
diff --git a/docs/guide/structure-assets.md b/docs/guide/structure-assets.md
index 58c4339dd0d..fda7a8b8e88 100644
--- a/docs/guide/structure-assets.md
+++ b/docs/guide/structure-assets.md
@@ -737,7 +737,7 @@ include this file in the application configuration. For example,
return [
'components' => [
'assetManager' => [
- 'bundles' => require(__DIR__ . '/' . (YII_ENV_PROD ? 'assets-prod.php' : 'assets-dev.php')),
+ 'bundles' => require __DIR__ . '/' . (YII_ENV_PROD ? 'assets-prod.php' : 'assets-dev.php'),
],
],
];
diff --git a/docs/guide/structure-entry-scripts.md b/docs/guide/structure-entry-scripts.md
index 8ec8eb4d9e3..93f92963b09 100644
--- a/docs/guide/structure-entry-scripts.md
+++ b/docs/guide/structure-entry-scripts.md
@@ -34,13 +34,13 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'dev');
// register Composer autoloader
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// include Yii class file
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
// load application configuration
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
// create, configure and run application
(new yii\web\Application($config))->run();
@@ -66,13 +66,13 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'dev');
// register Composer autoloader
-require(__DIR__ . '/vendor/autoload.php');
+require __DIR__ . '/vendor/autoload.php';
// include Yii class file
-require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';
// load application configuration
-$config = require(__DIR__ . '/config/console.php');
+$config = require __DIR__ . '/config/console.php';
$application = new yii\console\Application($config);
$exitCode = $application->run();
diff --git a/docs/guide/structure-modules.md b/docs/guide/structure-modules.md
index e2da7b4d2c7..d9ac8913460 100644
--- a/docs/guide/structure-modules.md
+++ b/docs/guide/structure-modules.md
@@ -60,7 +60,7 @@ public function init()
{
parent::init();
// initialize the module with the configuration loaded from config.php
- \Yii::configure($this, require(__DIR__ . '/config.php'));
+ \Yii::configure($this, require __DIR__ . '/config.php');
}
```
diff --git a/docs/guide/tutorial-console.md b/docs/guide/tutorial-console.md
index 0d5ab1c4ba8..f955800b59a 100644
--- a/docs/guide/tutorial-console.md
+++ b/docs/guide/tutorial-console.md
@@ -71,10 +71,10 @@ It contains code like the following:
defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'dev');
-require(__DIR__ . '/vendor/autoload.php');
-require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/vendor/autoload.php';
+require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';
-$config = require(__DIR__ . '/config/console.php');
+$config = require __DIR__ . '/config/console.php';
$application = new yii\console\Application($config);
$exitCode = $application->run();
diff --git a/docs/guide/tutorial-yii-integration.md b/docs/guide/tutorial-yii-integration.md
index 86fa743cb21..1066be8b00c 100644
--- a/docs/guide/tutorial-yii-integration.md
+++ b/docs/guide/tutorial-yii-integration.md
@@ -25,10 +25,10 @@ the Composer autoloader:
```php
// install Composer autoloader
-require(__DIR__ . '/../vendor/autoload.php');
+require __DIR__ . '/../vendor/autoload.php';
// include Yii class file
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
```
### Using Downloaded Libraries
@@ -99,9 +99,9 @@ the `BasePath/vendor` directory.
Next, you should modify the entry script of the 3rd-party system by including the following code at the beginning:
```php
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
-$yiiConfig = require(__DIR__ . '/../config/yii/web.php');
+$yiiConfig = require __DIR__ . '/../config/yii/web.php';
new yii\web\Application($yiiConfig); // Do NOT call run() here
```
@@ -134,14 +134,14 @@ Second, modify the entry script of the application as follows,
```php
// include the customized Yii class described below
-require(__DIR__ . '/../components/Yii.php');
+require __DIR__ . '/../components/Yii.php';
// configuration for Yii 2 application
-$yii2Config = require(__DIR__ . '/../config/yii2/web.php');
+$yii2Config = require __DIR__ . '/../config/yii2/web.php';
new yii\web\Application($yii2Config); // Do NOT call run(), yii2 app is only used as service locator
// configuration for Yii 1 application
-$yii1Config = require(__DIR__ . '/../config/yii1/main.php');
+$yii1Config = require __DIR__ . '/../config/yii1/main.php';
Yii::createWebApplication($yii1Config)->run();
```
@@ -150,10 +150,10 @@ The above code includes the customized `Yii` class file, which can be created as
```php
$yii2path = '/path/to/yii2';
-require($yii2path . '/BaseYii.php'); // Yii 2.x
+require $yii2path . '/BaseYii.php'; // Yii 2.x
$yii1path = '/path/to/yii1';
-require($yii1path . '/YiiBase.php'); // Yii 1.x
+require $yii1path . '/YiiBase.php'; // Yii 1.x
class Yii extends \yii\BaseYii
{
diff --git a/framework/BaseYii.php b/framework/BaseYii.php
index 7e586f0ef69..64a2d9c8fe9 100644
--- a/framework/BaseYii.php
+++ b/framework/BaseYii.php
@@ -289,7 +289,7 @@ public static function autoload($className)
return;
}
- include($classFile);
+ include $classFile;
if (YII_DEBUG && !class_exists($className, false) && !interface_exists($className, false) && !trait_exists($className, false)) {
throw new UnknownClassException("Unable to find '$className' in file: $classFile. Namespace missing?");
diff --git a/framework/Yii.php b/framework/Yii.php
index 6b787a6ddf9..4226770df37 100644
--- a/framework/Yii.php
+++ b/framework/Yii.php
@@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/
-require(__DIR__ . '/BaseYii.php');
+require __DIR__ . '/BaseYii.php';
/**
* Yii is a helper class serving common framework functionalities.
@@ -21,5 +21,5 @@ class Yii extends \yii\BaseYii
}
spl_autoload_register(['Yii', 'autoload'], true, true);
-Yii::$classMap = require(__DIR__ . '/classes.php');
+Yii::$classMap = require __DIR__ . '/classes.php';
Yii::$container = new yii\di\Container();
diff --git a/framework/base/Application.php b/framework/base/Application.php
index 3d5f498df7c..2cb68cac9ea 100644
--- a/framework/base/Application.php
+++ b/framework/base/Application.php
@@ -281,7 +281,7 @@ protected function bootstrap()
{
if ($this->extensions === null) {
$file = Yii::getAlias('@vendor/yiisoft/extensions.php');
- $this->extensions = is_file($file) ? include($file) : [];
+ $this->extensions = is_file($file) ? include $file : [];
}
foreach ($this->extensions as $extension) {
if (!empty($extension['alias'])) {
diff --git a/framework/base/ErrorHandler.php b/framework/base/ErrorHandler.php
index 8b74d568591..779db7c51d0 100644
--- a/framework/base/ErrorHandler.php
+++ b/framework/base/ErrorHandler.php
@@ -207,7 +207,7 @@ public function handleError($code, $message, $file, $line)
// load ErrorException manually here because autoloading them will not work
// when error occurs while autoloading a class
if (!class_exists('yii\\base\\ErrorException', false)) {
- require_once(__DIR__ . '/ErrorException.php');
+ require_once __DIR__ . '/ErrorException.php';
}
$exception = new ErrorException($message, $code, $code, $file, $line);
@@ -239,7 +239,7 @@ public function handleFatalError()
// load ErrorException manually here because autoloading them will not work
// when error occurs while autoloading a class
if (!class_exists('yii\\base\\ErrorException', false)) {
- require_once(__DIR__ . '/ErrorException.php');
+ require_once __DIR__ . '/ErrorException.php';
}
$error = error_get_last();
diff --git a/framework/base/View.php b/framework/base/View.php
index ecfa616d21f..5b6c79114d4 100644
--- a/framework/base/View.php
+++ b/framework/base/View.php
@@ -327,7 +327,7 @@ public function renderPhpFile($_file_, $_params_ = [])
ob_implicit_flush(false);
extract($_params_, EXTR_OVERWRITE);
try {
- require($_file_);
+ require $_file_;
return ob_get_clean();
} catch (\Exception $e) {
while (ob_get_level() > $_obInitialLevel_) {
diff --git a/framework/console/Application.php b/framework/console/Application.php
index 6210d866eed..d2fd4a30711 100644
--- a/framework/console/Application.php
+++ b/framework/console/Application.php
@@ -105,7 +105,7 @@ protected function loadConfig($config)
if (strpos($param, $option) !== false) {
$path = substr($param, strlen($option));
if (!empty($path) && is_file($file = Yii::getAlias($path))) {
- return require($file);
+ return require $file;
}
exit("The configuration file does not exist: $path\n");
diff --git a/framework/console/controllers/AssetController.php b/framework/console/controllers/AssetController.php
index 3417fa19204..ac13645f2df 100644
--- a/framework/console/controllers/AssetController.php
+++ b/framework/console/controllers/AssetController.php
@@ -216,7 +216,8 @@ public function actionCompress($configFile, $bundleFile)
protected function loadConfiguration($configFile)
{
$this->stdout("Loading configuration from '{$configFile}'...\n");
- foreach (require($configFile) as $name => $value) {
+ $config = require $configFile;
+ foreach ($config as $name => $value) {
if (property_exists($this, $name) || $this->canSetProperty($name)) {
$this->$name = $value;
} else {
diff --git a/framework/console/controllers/BaseMigrateController.php b/framework/console/controllers/BaseMigrateController.php
index e8f5e46827b..15577fe01a4 100644
--- a/framework/console/controllers/BaseMigrateController.php
+++ b/framework/console/controllers/BaseMigrateController.php
@@ -737,13 +737,13 @@ protected function includeMigrationFile($class)
foreach ($this->migrationPath as $path) {
$file = $path . DIRECTORY_SEPARATOR . $class . '.php';
if (is_file($file)) {
- require_once($file);
+ require_once $file;
break;
}
}
} else {
$file = $this->migrationPath . DIRECTORY_SEPARATOR . $class . '.php';
- require_once($file);
+ require_once $file;
}
}
}
diff --git a/framework/console/controllers/MessageController.php b/framework/console/controllers/MessageController.php
index c2f2f05254c..0e4fb52734f 100644
--- a/framework/console/controllers/MessageController.php
+++ b/framework/console/controllers/MessageController.php
@@ -277,7 +277,7 @@ public function actionExtract($configFile = null)
if (!is_file($configFile)) {
throw new Exception("The configuration file does not exist: $configFile");
}
- $configFileContent = require($configFile);
+ $configFileContent = require $configFile;
}
$config = array_merge(
@@ -538,7 +538,6 @@ protected function extractMessagesFromTokens(array $tokens, array $translatorTok
$category = mb_substr($category, 1, -1);
if (!$this->isCategoryIgnored($category, $ignoreCategories)) {
-
$fullMessage = mb_substr($buffer[2][1], 1, -1);
$i = 3;
while ($i < count($buffer) - 1 && !is_array($buffer[$i]) && $buffer[$i] === '.') {
@@ -687,7 +686,7 @@ protected function saveMessagesToPHP($messages, $dirName, $overwrite, $removeUnu
protected function saveMessagesCategoryToPHP($messages, $fileName, $overwrite, $removeUnused, $sort, $category, $markUnused)
{
if (is_file($fileName)) {
- $rawExistingMessages = require($fileName);
+ $rawExistingMessages = require $fileName;
$existingMessages = $rawExistingMessages;
sort($messages);
ksort($existingMessages);
diff --git a/framework/helpers/BaseFileHelper.php b/framework/helpers/BaseFileHelper.php
index 3e0c90308f5..7e294edef6f 100644
--- a/framework/helpers/BaseFileHelper.php
+++ b/framework/helpers/BaseFileHelper.php
@@ -207,7 +207,7 @@ protected static function loadMimeTypes($magicFile)
}
$magicFile = Yii::getAlias($magicFile);
if (!isset(self::$_mimeTypes[$magicFile])) {
- self::$_mimeTypes[$magicFile] = require($magicFile);
+ self::$_mimeTypes[$magicFile] = require $magicFile;
}
return self::$_mimeTypes[$magicFile];
}
diff --git a/framework/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php
index cbbc3ed4d64..1e0f41dc137 100644
--- a/framework/i18n/PhpMessageSource.php
+++ b/framework/i18n/PhpMessageSource.php
@@ -153,7 +153,7 @@ protected function getMessageFilePath($category, $language)
protected function loadMessagesFromFile($messageFile)
{
if (is_file($messageFile)) {
- $messages = include($messageFile);
+ $messages = include $messageFile;
if (!is_array($messages)) {
$messages = [];
}
diff --git a/framework/rbac/PhpManager.php b/framework/rbac/PhpManager.php
index f9354958f8c..14e79c74d88 100644
--- a/framework/rbac/PhpManager.php
+++ b/framework/rbac/PhpManager.php
@@ -779,7 +779,7 @@ protected function save()
protected function loadFromFile($file)
{
if (is_file($file)) {
- return require($file);
+ return require $file;
}
return [];
diff --git a/framework/requirements/YiiRequirementChecker.php b/framework/requirements/YiiRequirementChecker.php
index 8df5a41c450..5c82453a8ea 100644
--- a/framework/requirements/YiiRequirementChecker.php
+++ b/framework/requirements/YiiRequirementChecker.php
@@ -17,7 +17,7 @@
* Example:
*
* ```php
- * require_once('path/to/YiiRequirementChecker.php');
+ * require_once 'path/to/YiiRequirementChecker.php';
* $requirementsChecker = new YiiRequirementChecker();
* $requirements = array(
* array(
@@ -68,7 +68,7 @@ class YiiRequirementChecker
function check($requirements)
{
if (is_string($requirements)) {
- $requirements = require($requirements);
+ $requirements = require $requirements;
}
if (!is_array($requirements)) {
$this->usageError('Requirements must be an array, "' . gettype($requirements) . '" has been given!');
@@ -311,11 +311,11 @@ function renderViewFile($_viewFile_, $_data_ = null, $_return_ = false)
if ($_return_) {
ob_start();
ob_implicit_flush(false);
- require($_viewFile_);
+ require $_viewFile_;
return ob_get_clean();
} else {
- require($_viewFile_);
+ require $_viewFile_;
}
}
diff --git a/framework/test/ActiveFixture.php b/framework/test/ActiveFixture.php
index da06502571a..12a1300688a 100644
--- a/framework/test/ActiveFixture.php
+++ b/framework/test/ActiveFixture.php
@@ -98,7 +98,7 @@ protected function getData()
$class = new \ReflectionClass($this);
$dataFile = dirname($class->getFileName()) . '/data/' . $this->getTableSchema()->fullName . '.php';
- return is_file($dataFile) ? require($dataFile) : [];
+ return is_file($dataFile) ? require $dataFile : [];
}
return parent::getData();
diff --git a/framework/test/ArrayFixture.php b/framework/test/ArrayFixture.php
index 9b0ca3e7a78..793538c17ac 100644
--- a/framework/test/ArrayFixture.php
+++ b/framework/test/ArrayFixture.php
@@ -61,7 +61,7 @@ protected function getData()
}
$dataFile = Yii::getAlias($this->dataFile);
if (is_file($dataFile)) {
- return require($dataFile);
+ return require $dataFile;
}
throw new InvalidConfigException("Fixture data file does not exist: {$this->dataFile}");
diff --git a/framework/test/BaseActiveFixture.php b/framework/test/BaseActiveFixture.php
index acc1732d347..1e952cca9ca 100644
--- a/framework/test/BaseActiveFixture.php
+++ b/framework/test/BaseActiveFixture.php
@@ -100,7 +100,7 @@ protected function getData()
}
$dataFile = Yii::getAlias($this->dataFile);
if (is_file($dataFile)) {
- return require($dataFile);
+ return require $dataFile;
}
throw new InvalidConfigException("Fixture data file does not exist: {$this->dataFile}");
diff --git a/framework/test/InitDbFixture.php b/framework/test/InitDbFixture.php
index 4212f4b87f5..ea72f42904c 100644
--- a/framework/test/InitDbFixture.php
+++ b/framework/test/InitDbFixture.php
@@ -66,7 +66,7 @@ public function load()
{
$file = Yii::getAlias($this->initScript);
if (is_file($file)) {
- require($file);
+ require $file;
}
}
diff --git a/framework/web/ErrorHandler.php b/framework/web/ErrorHandler.php
index 7ca0bad2211..481e01e1ee9 100644
--- a/framework/web/ErrorHandler.php
+++ b/framework/web/ErrorHandler.php
@@ -247,7 +247,7 @@ public function renderFile($_file_, $_params_)
ob_start();
ob_implicit_flush(false);
extract($_params_, EXTR_OVERWRITE);
- require(Yii::getAlias($_file_));
+ require Yii::getAlias($_file_);
return ob_get_clean();
}
diff --git a/framework/yii b/framework/yii
index 94a8050145b..4cbdc47dda7 100755
--- a/framework/yii
+++ b/framework/yii
@@ -17,14 +17,14 @@ $composerAutoload = [
$vendorPath = null;
foreach ($composerAutoload as $autoload) {
if (file_exists($autoload)) {
- require($autoload);
+ require $autoload;
$vendorPath = dirname($autoload);
break;
}
}
-require(__DIR__ . '/Yii.php');
+require __DIR__ . '/Yii.php';
$application = new yii\console\Application([
'id' => 'yii-console',
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 7d1e2fb93cd..e396abe2758 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -36,7 +36,7 @@ public static function tearDownAfterClass()
public static function getParam($name, $default = null)
{
if (static::$params === null) {
- static::$params = require(__DIR__ . '/data/config.php');
+ static::$params = require __DIR__ . '/data/config.php';
}
return isset(static::$params[$name]) ? static::$params[$name] : $default;
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index db6bb10537c..9b8a1bb8cb1 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -17,11 +17,11 @@
// require composer autoloader if available
$composerAutoload = __DIR__ . '/../vendor/autoload.php';
if (is_file($composerAutoload)) {
- require_once($composerAutoload);
+ require_once $composerAutoload;
}
-require_once(__DIR__ . '/../framework/Yii.php');
+require_once __DIR__ . '/../framework/Yii.php';
Yii::setAlias('@yiiunit', __DIR__);
-require_once(__DIR__ . '/compatibility.php');
-require_once(__DIR__ . '/TestCase.php');
+require_once __DIR__ . '/compatibility.php';
+require_once __DIR__ . '/TestCase.php';
diff --git a/tests/data/config-docker.php b/tests/data/config-docker.php
index cef8189f9c7..ba1ca645eb1 100644
--- a/tests/data/config-docker.php
+++ b/tests/data/config-docker.php
@@ -55,7 +55,7 @@
];
if (is_file(__DIR__ . '/config.local.php')) {
- include(__DIR__ . '/config.local.php');
+ include __DIR__ . '/config.local.php';
}
return $config;
diff --git a/tests/data/config.php b/tests/data/config.php
index 60cddd1774e..22694f4eab7 100644
--- a/tests/data/config.php
+++ b/tests/data/config.php
@@ -55,7 +55,7 @@
];
if (is_file(__DIR__ . '/config.local.php')) {
- include(__DIR__ . '/config.local.php');
+ include __DIR__ . '/config.local.php';
}
return $config;
diff --git a/tests/framework/console/controllers/AssetControllerTest.php b/tests/framework/console/controllers/AssetControllerTest.php
index 15aa565f658..881ac98b2fd 100644
--- a/tests/framework/console/controllers/AssetControllerTest.php
+++ b/tests/framework/console/controllers/AssetControllerTest.php
@@ -257,7 +257,7 @@ public function testActionTemplate()
$configFileName = $this->testFilePath . DIRECTORY_SEPARATOR . 'config.php';
$this->runAssetControllerAction('template', [$configFileName]);
$this->assertFileExists($configFileName, 'Unable to create config file template!');
- $config = require($configFileName);
+ $config = require $configFileName;
$this->assertInternalType('array', $config, 'Invalid config created!');
}
@@ -303,7 +303,7 @@ public function testActionCompress()
// Then :
$this->assertFileExists($bundleFile, 'Unable to create output bundle file!');
- $compressedBundleConfig = require($bundleFile);
+ $compressedBundleConfig = require $bundleFile;
$this->assertInternalType('array', $compressedBundleConfig, 'Output bundle file has incorrect format!');
$this->assertCount(2, $compressedBundleConfig, 'Output bundle config contains wrong bundle count!');
@@ -383,7 +383,7 @@ public function testCompressExternalAsset()
// Then :
$this->assertFileExists($bundleFile, 'Unable to create output bundle file!');
- $compressedBundleConfig = require($bundleFile);
+ $compressedBundleConfig = require $bundleFile;
$this->assertInternalType('array', $compressedBundleConfig, 'Output bundle file has incorrect format!');
$this->assertArrayHasKey($externalAssetBundleClassName, $compressedBundleConfig, 'External bundle is lost!');
diff --git a/tests/framework/requirements/YiiRequirementCheckerTest.php b/tests/framework/requirements/YiiRequirementCheckerTest.php
index 1182d37fc67..be909038488 100644
--- a/tests/framework/requirements/YiiRequirementCheckerTest.php
+++ b/tests/framework/requirements/YiiRequirementCheckerTest.php
@@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/
*/
-require_once(__DIR__ . '/../../../framework/requirements/YiiRequirementChecker.php');
+require_once __DIR__ . '/../../../framework/requirements/YiiRequirementChecker.php';
use yiiunit\TestCase;