Skip to content

Commit

Permalink
Rename
Browse files Browse the repository at this point in the history
  • Loading branch information
VincentLanglet committed Jan 26, 2024
1 parent 0390c54 commit 2ce06dd
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 15 deletions.
2 changes: 1 addition & 1 deletion docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ By default, the twig-cs-fixer disable all the non-fixable-rules, but you can sti
<?php

$config = new TwigCsFixer\Config\Config();
$config->useOnlyFixableRules(false);
$config->allowNonFixableRules();

return $config;
```
Expand Down
10 changes: 5 additions & 5 deletions src/Config/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ final class Config
*/
private array $tokenParsers = [];

private bool $useOnlyFixableRules = true;
private bool $allowNonFixableRules = false;

public function __construct(private string $name = 'Default')
{
Expand Down Expand Up @@ -149,15 +149,15 @@ public function getTokenParsers(): array
/**
* @return $this
*/
public function useOnlyFixableRules(bool $useOnlyFixableRules = true): self
public function allowNonFixableRules(bool $allowNonFixableRules = true): self
{
$this->useOnlyFixableRules = $useOnlyFixableRules;
$this->allowNonFixableRules = $allowNonFixableRules;

return $this;
}

public function getUseOnlyFixableRules(): bool
public function areNonFixableRulesAllowed(): bool
{
return $this->useOnlyFixableRules;
return $this->allowNonFixableRules;
}
}
2 changes: 1 addition & 1 deletion src/Config/ConfigResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function resolveConfig(
$config->setFinder($this->resolveFinder($config->getFinder(), $paths));

// Override ruleset with config
$config->getRuleset()->useOnlyFixableRules($config->getUseOnlyFixableRules());
$config->getRuleset()->allowNonFixableRules($config->areNonFixableRulesAllowed());

if ($disableCache) {
$config->setCacheFile(null);
Expand Down
8 changes: 4 additions & 4 deletions src/Ruleset/Ruleset.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ final class Ruleset
*/
private array $rules = [];

private bool $useOnlyFixableRules = false;
private bool $allowNonFixableRules = true;

public function useOnlyFixableRules(bool $useOnlyFixableRules = true): self
public function allowNonFixableRules(bool $allowNonFixableRules = true): self
{
$this->useOnlyFixableRules = $useOnlyFixableRules;
$this->allowNonFixableRules = $allowNonFixableRules;

return $this;
}
Expand All @@ -32,7 +32,7 @@ public function useOnlyFixableRules(bool $useOnlyFixableRules = true): self
*/
public function getRules(): array
{
if ($this->useOnlyFixableRules) {
if (!$this->allowNonFixableRules) {
return array_filter(
$this->rules,
static fn (RuleInterface $rule): bool => $rule instanceof FixableRuleInterface,
Expand Down
11 changes: 7 additions & 4 deletions tests/Config/ConfigTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,16 @@ public function testConfigTwigExtensions(): void
static::assertSame([$twigExtension, $twigExtension2], $config->getTwigExtensions());
}

public function testUseOnlyFixableRules(): void
public function testAllowNonFixableRules(): void
{
$config = new Config();

static::assertTrue($config->getUseOnlyFixableRules());
static::assertFalse($config->areNonFixableRulesAllowed());

$config->useOnlyFixableRules(false);
static::assertFalse($config->getUseOnlyFixableRules());
$config->allowNonFixableRules();
static::assertTrue($config->areNonFixableRulesAllowed());

$config->allowNonFixableRules(false);
static::assertFalse($config->areNonFixableRulesAllowed());
}
}

0 comments on commit 2ce06dd

Please sign in to comment.