From 91ccea83cb10f0965fcc80b0163d8fc423d3d1b4 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Tue, 24 Dec 2019 12:23:41 +0100 Subject: [PATCH] :bug: Another fix --- SymfonyCustom/Sniffs/Namespaces/UnusedUseSniff.php | 2 +- SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.inc | 4 +++- SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.inc.fixed | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/SymfonyCustom/Sniffs/Namespaces/UnusedUseSniff.php b/SymfonyCustom/Sniffs/Namespaces/UnusedUseSniff.php index 1230ccc..ebd682c 100644 --- a/SymfonyCustom/Sniffs/Namespaces/UnusedUseSniff.php +++ b/SymfonyCustom/Sniffs/Namespaces/UnusedUseSniff.php @@ -311,7 +311,7 @@ private function isClassUsed(File $phpcsFile, int $usePtr, int $classPtr): bool || ('class' === $type && ((T_DOC_COMMENT_STRING === $tokens[$classUsed]['code'] && preg_match( - '/(\s|\||\(|^)'.preg_quote($searchName, '/').'(\s|\||\\\\|<|$|\[\])/i', + '/(\s|\||\(|\<|\,|^)'.preg_quote($searchName, '/').'(\s|\||\\\\|\<|\,|\>|$|\[\])/i', $tokens[$classUsed]['content'] )) || (T_DOC_COMMENT_TAG === $tokens[$classUsed]['code'] diff --git a/SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.inc b/SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.inc index 4571bff..2d7b1fa 100644 --- a/SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.inc +++ b/SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.inc @@ -135,9 +135,11 @@ new MyClass3(); namespace BugCollection; use Doctrine\Collection; +use Doctrine\Value; +use Doctrine\Key; /** - * @param Collection $a + * @param Collection $a * * @return null */ diff --git a/SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.inc.fixed b/SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.inc.fixed index 57cabe0..e77acb7 100644 --- a/SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.inc.fixed +++ b/SymfonyCustom/Tests/Namespaces/UnusedUseUnitTest.inc.fixed @@ -122,9 +122,11 @@ new MyClass3(); namespace BugCollection; use Doctrine\Collection; +use Doctrine\Value; +use Doctrine\Key; /** - * @param Collection $a + * @param Collection $a * * @return null */