Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable include rule in php-cs-fixer #14418

Merged
merged 4 commits into from
Jul 10, 2017
Merged

Enable include rule in php-cs-fixer #14418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92e2f24
Enable `include` rule in php-cs-fixer config.
rob006 Jul 9, 2017
f039388
Fix docs and some exceptions missed by php-cs-fixer.
rob006 Jul 9, 2017
4ccb1e2
Merge branch 'master' into cs-fixer-include
rob006 Jul 10, 2017
a91efec
Merge branch 'master' into cs-fixer-include
samdark Jul 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ $composerAutoload = [

foreach ($composerAutoload as $autoload) {
if (file_exists($autoload)) {
require($autoload);
require $autoload;
$vendorPath = dirname($autoload);
break;
}
Expand All @@ -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__);

Expand Down
4 changes: 2 additions & 2 deletions build/controllers/PhpDocController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])) {
Expand All @@ -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/';
Expand Down
2 changes: 1 addition & 1 deletion build/controllers/ReleaseController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion cs/src/YiiConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
],
Expand Down
4 changes: 2 additions & 2 deletions docs/guide-es/concept-autoloading.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions docs/guide-es/concept-configurations.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
];
```

Expand Down Expand Up @@ -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();
```

Expand Down
6 changes: 3 additions & 3 deletions docs/guide-es/structure-applications.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion docs/guide-es/structure-assets.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
],
],
];
Expand Down
12 changes: 6 additions & 6 deletions docs/guide-es/structure-entry-scripts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion docs/guide-es/structure-modules.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
```

Expand Down
18 changes: 9 additions & 9 deletions docs/guide-es/tutorial-yii-integration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <span id="using-downloaded-libs"></span>
Expand Down Expand Up @@ -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í
```

Expand Down Expand Up @@ -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();
```

Expand All @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions docs/guide-fr/concept-autoloading.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions docs/guide-fr/concept-configurations.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
];
```

Expand Down Expand Up @@ -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();
```

Expand Down
6 changes: 3 additions & 3 deletions docs/guide-fr/structure-applications.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion docs/guide-fr/structure-assets.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
],
],
];
Expand Down
12 changes: 6 additions & 6 deletions docs/guide-fr/structure-entry-scripts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion docs/guide-fr/structure-modules.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
```

Expand Down
6 changes: 3 additions & 3 deletions docs/guide-id/structure-applications.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
12 changes: 6 additions & 6 deletions docs/guide-id/structure-entry-scripts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions docs/guide-ja/concept-autoloading.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 のオートローダーだけを単独で使用することもできます。しかし、そうすることによって、
Expand Down
Loading