diff --git a/docs/configuration.md b/docs/configuration.md index 043df7e1..c31f8dd8 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -12,7 +12,8 @@ By default, the twig-cs-fixer standard is enabled with the twig coding standard - `TrailingSpaceRule`: ensures that files have no trailing spaces. If you want to use the basic Twig standard, another standard and/or add/disable a rule, you can provide -your own configuration with a `.twig-cs-fixer.php` file which returns a `TwigCsFixer\Config\Config` class: +your own configuration with a `.twig-cs-fixer.php` or `.twig-cs-fixer.dist.php` file which returns +a `TwigCsFixer\Config\Config` class: ```php getConfigFromPath($defaultPath); } + $defaultDistPath = $this->getAbsolutePath(Config::DEFAULT_DIST_PATH); + if (file_exists($defaultDistPath)) { + return $this->getConfigFromPath($defaultDistPath); + } + return new Config(); } diff --git a/tests/Config/ConfigResolverTest.php b/tests/Config/ConfigResolverTest.php index 040f73de..41c16da1 100644 --- a/tests/Config/ConfigResolverTest.php +++ b/tests/Config/ConfigResolverTest.php @@ -47,6 +47,7 @@ public static function resolveConfigDataProvider(): iterable { yield [__DIR__.'/Fixtures/directoryWithoutConfig', null, 'Default']; yield [__DIR__.'/Fixtures/directoryWithCustomRuleset', null, 'Custom']; + yield [__DIR__.'/Fixtures/directoryWithCustomRuleset2', null, 'CustomDist']; yield [__DIR__, 'Fixtures/directoryWithCustomRuleset/.twig-cs-fixer.php', 'Custom']; yield ['/tmp', __DIR__.'/Fixtures/directoryWithCustomRuleset/.twig-cs-fixer.php', 'Custom']; } diff --git a/tests/Config/Fixtures/directoryWithCustomRuleset/.twig-cs-fixer.dist.php b/tests/Config/Fixtures/directoryWithCustomRuleset/.twig-cs-fixer.dist.php new file mode 100644 index 00000000..845a7897 --- /dev/null +++ b/tests/Config/Fixtures/directoryWithCustomRuleset/.twig-cs-fixer.dist.php @@ -0,0 +1,17 @@ +addStandard(new TwigCsFixer()); +$ruleset->removeRule(DelimiterSpacingRule::class); + +$config = new Config('CustomDist'); +$config->setRuleset($ruleset); + +return $config; diff --git a/tests/Config/Fixtures/directoryWithCustomRuleset2/.twig-cs-fixer.dist.php b/tests/Config/Fixtures/directoryWithCustomRuleset2/.twig-cs-fixer.dist.php new file mode 100644 index 00000000..845a7897 --- /dev/null +++ b/tests/Config/Fixtures/directoryWithCustomRuleset2/.twig-cs-fixer.dist.php @@ -0,0 +1,17 @@ +addStandard(new TwigCsFixer()); +$ruleset->removeRule(DelimiterSpacingRule::class); + +$config = new Config('CustomDist'); +$config->setRuleset($ruleset); + +return $config;