16303177127

Committed 15 Jul 2025 06:22PM UTC coverage: 94.758% (-0.05%) from 94.806%

Build # 16303177127

Build Type

push

github

Committed by

keradus

Commit Message

bumped version

Run Details

28199 of 29759 relevant lines covered (94.76%)

45.91 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

98.11

/src/Fixer/ControlStructure/NoUnneededBracesFixer.php

<?php

declare(strict_types=1);

/*
 * This file is part of PHP CS Fixer.
 *
 * (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.
 */

namespace PhpCsFixer\Fixer\ControlStructure;

use PhpCsFixer\AbstractFixer;
use PhpCsFixer\Fixer\ConfigurableFixerInterface;
use PhpCsFixer\Fixer\ConfigurableFixerTrait;
use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
use PhpCsFixer\FixerConfiguration\FixerConfigurationResolverInterface;
use PhpCsFixer\FixerConfiguration\FixerOptionBuilder;
use PhpCsFixer\FixerDefinition\CodeSample;
use PhpCsFixer\FixerDefinition\FixerDefinition;
use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
use PhpCsFixer\Tokenizer\Token;
use PhpCsFixer\Tokenizer\Tokens;

/**
 * @phpstan-type _AutogeneratedInputConfiguration array{
 *  namespaces?: bool,
 * }
 * @phpstan-type _AutogeneratedComputedConfiguration array{
 *  namespaces: bool,
 * }
 *
 * @implements ConfigurableFixerInterface<_AutogeneratedInputConfiguration, _AutogeneratedComputedConfiguration>
 */
final class NoUnneededBracesFixer extends AbstractFixer implements ConfigurableFixerInterface
{
    /** @use ConfigurableFixerTrait<_AutogeneratedInputConfiguration, _AutogeneratedComputedConfiguration> */
    use ConfigurableFixerTrait;

    public function getDefinition(): FixerDefinitionInterface
    {
        return new FixerDefinition(
            'Removes unneeded braces that are superfluous and aren\'t part of a control structure\'s body.',
            [
                new CodeSample(
                    '<?php {
    echo 1;
}

switch ($b) {
    case 1: {
        break;
    }
}
'
                ),
                new CodeSample(
                    '<?php
namespace Foo {
    function Bar(){}
}
',
                    ['namespaces' => true]
                ),
            ]
        );
    }

    /**
     * {@inheritdoc}
     *
     * Must run before NoUselessElseFixer, NoUselessReturnFixer, ReturnAssignmentFixer, SimplifiedIfReturnFixer.
     */
    public function getPriority(): int
    {
        return 40;
    }

    public function isCandidate(Tokens $tokens): bool
    {
        return $tokens->isTokenKindFound('}');
    }

    protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
    {
        foreach ($this->findBraceOpen($tokens) as $index) {
            if ($this->isOverComplete($tokens, $index)) {
                $this->clearOverCompleteBraces($tokens, $index, $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $index));
            }
        }

        if (true === $this->configuration['namespaces']) {
            $this->clearIfIsOverCompleteNamespaceBlock($tokens);
        }
    }

    protected function createConfigurationDefinition(): FixerConfigurationResolverInterface
    {
        return new FixerConfigurationResolver([
            (new FixerOptionBuilder('namespaces', 'Remove unneeded braces from bracketed namespaces.'))
                ->setAllowedTypes(['bool'])
                ->setDefault(false)
                ->getOption(),
        ]);
    }

    /**
     * @param int $openIndex  index of `{` token
     * @param int $closeIndex index of `}` token
     */
    private function clearOverCompleteBraces(Tokens $tokens, int $openIndex, int $closeIndex): void
    {
        $tokens->clearTokenAndMergeSurroundingWhitespace($closeIndex);
        $tokens->clearTokenAndMergeSurroundingWhitespace($openIndex);
    }

    /**
     * @return iterable<int>
     */
    private function findBraceOpen(Tokens $tokens): iterable
    {
        for ($i = \count($tokens) - 1; $i > 0; --$i) {
            if ($tokens[$i]->equals('{')) {
                yield $i;
            }
        }
    }

    /**
     * @param int $index index of `{` token
     */
    private function isOverComplete(Tokens $tokens, int $index): bool
    {
        return $tokens[$tokens->getPrevMeaningfulToken($index)]->equalsAny(['{', '}', [\T_OPEN_TAG], ':', ';']);
    }

    private function clearIfIsOverCompleteNamespaceBlock(Tokens $tokens): void
    {
        if (1 !== $tokens->countTokenKind(\T_NAMESPACE)) {
            return; // fast check, we never fix if multiple namespaces are defined
        }

        $index = $tokens->getNextTokenOfKind(0, [[\T_NAMESPACE]]);

        $namespaceIsNamed = false;

        $index = $tokens->getNextMeaningfulToken($index);
        while ($tokens[$index]->isGivenKind([\T_STRING, \T_NS_SEPARATOR])) {
            $index = $tokens->getNextMeaningfulToken($index);
            $namespaceIsNamed = true;
        }

        if (!$namespaceIsNamed) {
            return;
        }

        if (!$tokens[$index]->equals('{')) {
            return; // `;`
        }

        $closeIndex = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $index);
        $afterCloseIndex = $tokens->getNextMeaningfulToken($closeIndex);

        if (null !== $afterCloseIndex && (!$tokens[$afterCloseIndex]->isGivenKind(\T_CLOSE_TAG) || null !== $tokens->getNextMeaningfulToken($afterCloseIndex))) {
            return;
        }

        // clear up
        $tokens->clearTokenAndMergeSurroundingWhitespace($closeIndex);
        $tokens[$index] = new Token(';');

        if ($tokens[$index - 1]->isWhitespace(" \t") && !$tokens[$index - 2]->isComment()) {
            $tokens->clearTokenAndMergeSurroundingWhitespace($index - 1);
        }
    }
}

1	<?php
2
3	declare(strict_types=1);
4
5	/*
6	* This file is part of PHP CS Fixer.
7	*
8	* (c) Fabien Potencier <fabien@symfony.com>
9	* Dariusz Rumiński <dariusz.ruminski@gmail.com>
10	*
11	* This source file is subject to the MIT license that is bundled
12	* with this source code in the file LICENSE.
13	*/
14
15	namespace PhpCsFixer\Fixer\ControlStructure;
16
17	use PhpCsFixer\AbstractFixer;
18	use PhpCsFixer\Fixer\ConfigurableFixerInterface;
19	use PhpCsFixer\Fixer\ConfigurableFixerTrait;
20	use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
21	use PhpCsFixer\FixerConfiguration\FixerConfigurationResolverInterface;
22	use PhpCsFixer\FixerConfiguration\FixerOptionBuilder;
23	use PhpCsFixer\FixerDefinition\CodeSample;
24	use PhpCsFixer\FixerDefinition\FixerDefinition;
25	use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
26	use PhpCsFixer\Tokenizer\Token;
27	use PhpCsFixer\Tokenizer\Tokens;
28
29	/**
30	* @phpstan-type _AutogeneratedInputConfiguration array{
31	* namespaces?: bool,
32	* }
33	* @phpstan-type _AutogeneratedComputedConfiguration array{
34	* namespaces: bool,
35	* }
36	*
37	* @implements ConfigurableFixerInterface<_AutogeneratedInputConfiguration, _AutogeneratedComputedConfiguration>
38	*/
39	final class NoUnneededBracesFixer extends AbstractFixer implements ConfigurableFixerInterface
40	{
41	/** @use ConfigurableFixerTrait<_AutogeneratedInputConfiguration, _AutogeneratedComputedConfiguration> */
42	use ConfigurableFixerTrait;
43
44	public function getDefinition(): FixerDefinitionInterface
45	{
46	return new FixerDefinition(	3✔
47	'Removes unneeded braces that are superfluous and aren\'t part of a control structure\'s body.',	3✔
48	[	3✔
49	new CodeSample(	3✔
50	'<?php {	3✔
51	echo 1;
52	}
53
54	switch ($b) {
55	case 1: {
56	break;
57	}
58	}
59	'	3✔
60	),	3✔
61	new CodeSample(	3✔
62	'<?php	3✔
63	namespace Foo {
64	function Bar(){}
65	}
66	',	3✔
67	['namespaces' => true]	3✔
68	),	3✔
69	]	3✔
70	);	3✔
71	}
72
73	/**
74	* {@inheritdoc}
75	*
76	* Must run before NoUselessElseFixer, NoUselessReturnFixer, ReturnAssignmentFixer, SimplifiedIfReturnFixer.
77	*/
78	public function getPriority(): int
79	{
80	return 40;	1✔
81	}
82
83	public function isCandidate(Tokens $tokens): bool
84	{
85	return $tokens->isTokenKindFound('}');	15✔
86	}
87
88	protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
89	{
90	foreach ($this->findBraceOpen($tokens) as $index) {	15✔
91	if ($this->isOverComplete($tokens, $index)) {	15✔
92	$this->clearOverCompleteBraces($tokens, $index, $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $index));	4✔
93	}
94	}
95
96	if (true === $this->configuration['namespaces']) {	15✔
97	$this->clearIfIsOverCompleteNamespaceBlock($tokens);	7✔
98	}
99	}
100
101	protected function createConfigurationDefinition(): FixerConfigurationResolverInterface
102	{
103	return new FixerConfigurationResolver([	24✔
104	(new FixerOptionBuilder('namespaces', 'Remove unneeded braces from bracketed namespaces.'))	24✔
105	->setAllowedTypes(['bool'])	24✔
106	->setDefault(false)	24✔
107	->getOption(),	24✔
108	]);	24✔
109	}
110
111	/**
112	* @param int $openIndex index of `{` token
113	* @param int $closeIndex index of `}` token
114	*/
115	private function clearOverCompleteBraces(Tokens $tokens, int $openIndex, int $closeIndex): void
116	{
117	$tokens->clearTokenAndMergeSurroundingWhitespace($closeIndex);	4✔
118	$tokens->clearTokenAndMergeSurroundingWhitespace($openIndex);	4✔
119	}
120
121	/**
122	* @return iterable<int>
123	*/
124	private function findBraceOpen(Tokens $tokens): iterable
125	{
126	for ($i = \count($tokens) - 1; $i > 0; --$i) {	15✔
127	if ($tokens[$i]->equals('{')) {	15✔
128	yield $i;	15✔
129	}
130	}
131	}
132
133	/**
134	* @param int $index index of `{` token
135	*/
136	private function isOverComplete(Tokens $tokens, int $index): bool
137	{
138	return $tokens[$tokens->getPrevMeaningfulToken($index)]->equalsAny(['{', '}', [\T_OPEN_TAG], ':', ';']);	15✔
139	}
140
141	private function clearIfIsOverCompleteNamespaceBlock(Tokens $tokens): void
142	{
143	if (1 !== $tokens->countTokenKind(\T_NAMESPACE)) {	7✔
144	return; // fast check, we never fix if multiple namespaces are defined	1✔
145	}
146
147	$index = $tokens->getNextTokenOfKind(0, [[\T_NAMESPACE]]);	6✔
148
149	$namespaceIsNamed = false;	6✔
150
151	$index = $tokens->getNextMeaningfulToken($index);	6✔
152	while ($tokens[$index]->isGivenKind([\T_STRING, \T_NS_SEPARATOR])) {	6✔
153	$index = $tokens->getNextMeaningfulToken($index);	5✔
154	$namespaceIsNamed = true;	5✔
155	}
156
157	if (!$namespaceIsNamed) {	6✔
158	return;	1✔
159	}
160
161	if (!$tokens[$index]->equals('{')) {	5✔
162	return; // `;`	4✔
163	}
164
165	$closeIndex = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $index);	5✔
166	$afterCloseIndex = $tokens->getNextMeaningfulToken($closeIndex);	5✔
167
168	if (null !== $afterCloseIndex && (!$tokens[$afterCloseIndex]->isGivenKind(\T_CLOSE_TAG) \|\| null !== $tokens->getNextMeaningfulToken($afterCloseIndex))) {	5✔
169	return;	×
170	}
171
172	// clear up
173	$tokens->clearTokenAndMergeSurroundingWhitespace($closeIndex);	5✔
174	$tokens[$index] = new Token(';');	5✔
175
176	if ($tokens[$index - 1]->isWhitespace(" \t") && !$tokens[$index - 2]->isComment()) {	5✔
177	$tokens->clearTokenAndMergeSurroundingWhitespace($index - 1);	5✔
178	}
179	}
180	}

keradus / PHP-CS-Fixer / 16303177127

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous