Skip to content

Commit c6583a3

Browse files
🐛 Fix Unused
1 parent df6fa65 commit c6583a3

File tree

5 files changed

+18
-3
lines changed

5 files changed

+18
-3
lines changed

SymfonyCustom/Sniffs/Formatting/ConditionalReturnOrThrowSniff.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ public function process(File $phpcsFile, $stackPtr): void
2929
$tokens = $phpcsFile->getTokens();
3030
$opener = $phpcsFile->findPrevious([T_IF, T_CASE], $stackPtr);
3131

32-
if ($opener
32+
if (false !== $opener
3333
&& isset($tokens[$opener]['scope_closer'])
34-
&& $stackPtr <= $tokens[$opener]['scope_closer']) {
34+
&& $stackPtr <= $tokens[$opener]['scope_closer']
35+
) {
3536
$isClosure = $phpcsFile->findPrevious(T_CLOSURE, $stackPtr, $opener);
3637
if (false !== $isClosure) {
3738
return;

SymfonyCustom/Sniffs/Namespaces/UnusedUseSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ private function isClassUsed(File $phpcsFile, int $usePtr, int $classPtr): bool
311311
|| ('class' === $type
312312
&& ((T_DOC_COMMENT_STRING === $tokens[$classUsed]['code']
313313
&& preg_match(
314-
'/(\s|\||\(|\<|\,|^)'.preg_quote($searchName, '/').'(\s|\||\\\\|\<|\,|\>|$|\[\])/i',
314+
'/(\s|\||\(|\<|\,|\:|^)'.preg_quote($searchName, '/').'(\s|\||\\\\|\<|\,|\>|$|\[\])/i',
315315
$tokens[$classUsed]['content']
316316
))
317317
|| (T_DOC_COMMENT_TAG === $tokens[$classUsed]['code']

SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.inc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,17 @@ namespace BugCollection;
136136

137137
use Doctrine\Collection;
138138
use Doctrine\Value;
139+
use Doctrine\Value2;
139140
use Doctrine\Key;
141+
use Doctrine\Key2;
142+
use Used\Schemetype;
143+
use Used\Host;
144+
use NotUsed\Path;
140145

141146
/**
142147
* @param Collection<Key, Value> $a
148+
* @param Collection<Key2,Value2> $a
149+
* @param array{scheme:Schemetype,host: Host,path:string} $parsed_url
143150
*
144151
* @return null
145152
*/

SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.inc.fixed

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,16 @@ namespace BugCollection;
123123

124124
use Doctrine\Collection;
125125
use Doctrine\Value;
126+
use Doctrine\Value2;
126127
use Doctrine\Key;
128+
use Doctrine\Key2;
129+
use Used\Schemetype;
130+
use Used\Host;
127131

128132
/**
129133
* @param Collection<Key, Value> $a
134+
* @param Collection<Key2,Value2> $a
135+
* @param array{scheme:Schemetype,host: Host,path:string} $parsed_url
130136
*
131137
* @return null
132138
*/

SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ protected function getErrorList(): array
3737
127 => 1,
3838
128 => 1,
3939
129 => 1,
40+
144 => 1,
4041
];
4142
}
4243

0 commit comments

Comments
 (0)