Skip to content

Commit

Permalink
minor #5631 DX: config deduplication (keradus)
Browse files Browse the repository at this point in the history
This PR was merged into the 2.19-dev branch.

Discussion
----------

DX: config deduplication

Commits
-------

dcfa6fd DX: config deduplication
  • Loading branch information
keradus committed Apr 16, 2021
2 parents 72dd15d + dcfa6fd commit 456fe40
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 52 deletions.
52 changes: 2 additions & 50 deletions .php-cs-fixer.dist.php
Expand Up @@ -10,54 +10,6 @@
* with this source code in the file LICENSE.
*/

$header = <<<'EOF'
This file is part of PHP CS Fixer.
// @TODO 3.0: make this file the only distributed config file and remove `.php_cs.dist` file.

(c) Fabien Potencier <fabien@symfony.com>
Dariusz Rumiński <dariusz.ruminski@gmail.com>
This source file is subject to the MIT license that is bundled
with this source code in the file LICENSE.
EOF;

$finder = PhpCsFixer\Finder::create()
->exclude('tests/Fixtures')
->in(__DIR__)
->append([
__DIR__.'/dev-tools/doc.php',
__DIR__.'/php-cs-fixer',
])
;

$config = new PhpCsFixer\Config();
$config
->setRiskyAllowed(true)
->setRules([
'@PHP56Migration' => true,
'@PHPUnit75Migration:risky' => true,
'@PhpCsFixer' => true,
'@PhpCsFixer:risky' => true,
'header_comment' => ['header' => $header],
'list_syntax' => ['syntax' => 'long'],
])
->setFinder($finder)
;

// special handling of fabbot.io service if it's using too old PHP CS Fixer version
if (false !== getenv('FABBOT_IO')) {
try {
PhpCsFixer\FixerFactory::create()
->registerBuiltInFixers()
->registerCustomFixers($config->getCustomFixers())
->useRuleSet(new PhpCsFixer\RuleSet($config->getRules()))
;
} catch (PhpCsFixer\ConfigurationException\InvalidConfigurationException $e) {
$config->setRules([]);
} catch (UnexpectedValueException $e) {
$config->setRules([]);
} catch (InvalidArgumentException $e) {
$config->setRules([]);
}
}

return $config;
return require ".php_cs.dist";
2 changes: 0 additions & 2 deletions .php_cs.dist
Expand Up @@ -10,8 +10,6 @@
* with this source code in the file LICENSE.
*/

// HARD copy of .php-cs-fixer.dist.php file for fabbot.io compatibility for PHP CS Fixer v2

$header = <<<'EOF'
This file is part of PHP CS Fixer.
Expand Down

0 comments on commit 456fe40

Please sign in to comment.