diff --git a/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/AbstractCoreMatcher.php b/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/AbstractCoreMatcher.php
index e1c013be637bc9f44a5d57346f421add98ae1cd0..9fac7470bc3b3d5bf6048fbbc406a2f4323e8c25 100644
--- a/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/AbstractCoreMatcher.php
+++ b/typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/AbstractCoreMatcher.php
@@ -185,6 +185,11 @@ abstract class AbstractCoreMatcher extends NodeVisitorAbstract implements CodeSc
         if ($startLineOfNode === $this->currentCodeLine) {
             return $this->isCurrentLineIgnored;
         }
+        if ($this->isCurrentLineIgnored) {
+            // "ignoreMode" is still active, but we're past the line
+            // where it was enabled. Reset this beauty.
+            $this->isCurrentLineIgnored = false;
+        }
 
         $currentLineIsIgnored = false;
         if ($startLineOfNode !== $this->currentCodeLine) {
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/CodeStatisticsTest.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/CodeStatisticsTest.php
index 268f1e386c8504bfc6d48cb873c4a1f89d68707c..43a4ed0a1fd0a2531623c07aab288280d7ebafb8 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/CodeStatisticsTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/CodeStatisticsTest.php
@@ -40,6 +40,6 @@ final class CodeStatisticsTest extends UnitTestCase
 
         self::assertTrue($subject->isFileIgnored());
         self::assertEquals(2, $subject->getNumberOfIgnoredLines());
-        self::assertEquals(6, $subject->getNumberOfEffectiveCodeLines());
+        self::assertEquals(7, $subject->getNumberOfEffectiveCodeLines());
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Fixtures/CodeStatisticsFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Fixtures/CodeStatisticsFixture.php
index 21acd66707bb816a3959651648974af360f3d75c..1ae5eb4bae322007e8d6609e4082ba382be2ed71 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Fixtures/CodeStatisticsFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Fixtures/CodeStatisticsFixture.php
@@ -32,5 +32,6 @@ class CodeStatisticsFixture
 
         // @extensionScannerIgnoreLine
         $some = 'other ignored line';
+        $somethingNotIgnored = 'not ignored';
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ArrayDimensionMatcherTest.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ArrayDimensionMatcherTest.php
index b29eb41f28937f3c5a344a241be70548db880701..7d33d41c8b9be51bbcaddacbe8faa359a8cf14e0 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ArrayDimensionMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ArrayDimensionMatcherTest.php
@@ -52,6 +52,7 @@ final class ArrayDimensionMatcherTest extends UnitTestCase
         $expectedHitLineNumbers = [
             28,
             29,
+            40,
         ];
         $actualHitLineNumbers = [];
         foreach ($subject->getMatches() as $hit) {
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ArrayGlobalMatcherTest.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ArrayGlobalMatcherTest.php
index 78f8672114b92b0638b7ffd03ed661a7858d9fef..dcea98309b2b292facc93fd1006170cfb673dd6d 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ArrayGlobalMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ArrayGlobalMatcherTest.php
@@ -50,6 +50,7 @@ final class ArrayGlobalMatcherTest extends UnitTestCase
         $traverser->traverse($statements);
         $expectedHitLineNumbers = [
             28,
+            40,
         ];
         $actualHitLineNumbers = [];
         foreach ($subject->getMatches() as $hit) {
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ClassConstantMatcherTest.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ClassConstantMatcherTest.php
index 2d21f4b1c810a92ed77ea698d6360c62fbb0d2e9..5714ba7c3b42d14835d62594c9115e4c9097e443 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ClassConstantMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ClassConstantMatcherTest.php
@@ -59,6 +59,7 @@ final class ClassConstantMatcherTest extends UnitTestCase
             30,
             31,
             32,
+            41,
         ];
         $actualHitLineNumbers = [];
         foreach ($subject->getMatches() as $hit) {
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ClassNameMatcherTest.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ClassNameMatcherTest.php
index fa8edfd831ce7fdd9d39b4e83e60e4fb1f1c71dd..4ee61b4b498024cf7c03d7bf5a0d41898b0f3ed4 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ClassNameMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ClassNameMatcherTest.php
@@ -73,6 +73,7 @@ final class ClassNameMatcherTest extends UnitTestCase
             44,
             47,
             48,
+            60,
         ];
         $actualHitLineNumbers = [];
         foreach ($subject->getMatches() as $match) {
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ConstantMatcherTest.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ConstantMatcherTest.php
index f387924f9adcde2660330c7c5b1a8f30b41bf549..70d95d20a40f892ceeb5999850d7daf1ecaaa058 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ConstantMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ConstantMatcherTest.php
@@ -52,6 +52,7 @@ final class ConstantMatcherTest extends UnitTestCase
         $traverser->traverse($statements);
         $expectedHitLineNumbers = [
             28,
+            36,
         ];
         $actualHitLineNumbers = [];
         foreach ($subject->getMatches() as $hit) {
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ArrayDimensionMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ArrayDimensionMatcherFixture.php
index 702e2573ab35f6e59e91d54555c02b610f23905a..757863e26507c82aaca1c95313a0b12c13c75d3f 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ArrayDimensionMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ArrayDimensionMatcherFixture.php
@@ -35,5 +35,11 @@ class ArrayDimensionMatcherFixture
         $foo::maxSessionDataSize;
         // @extensionScannerIgnoreLine
         $foo['maxSessionDataSize'];
+
+        // Match (again). No longer ignored.
+        $foo['bar']['maxSessionDataSize'];
+        // Ignore match (again). Done only once here for all fixtures.
+        // @extensionScannerIgnoreLine
+        $foo['bar']['maxSessionDataSize'];
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ArrayGlobalMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ArrayGlobalMatcherFixture.php
index b2ada13b42298e97cad9fc19027639fcbf73ae14..f34615da984dbf2a163ffa59690b2bdce47a9547 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ArrayGlobalMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ArrayGlobalMatcherFixture.php
@@ -35,5 +35,11 @@ class ArrayGlobalMatcherFixture
         $foo['TYPO3_DB'];
         // @extensionScannerIgnoreLine
         $GLOBALS['TYPO3_DB'];
+
+        // Match (again). No longer ignored.
+        $GLOBALS['TYPO3_DB'];
+        // Ignore match (again).
+        // @extensionScannerIgnoreLine
+        $GLOBALS['TYPO3_DB'];
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ClassConstantMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ClassConstantMatcherFixture.php
index fd03b968c5ce98d1f9ce60293477778e1080aca8..743a44075cec1605024dc8b10af73fe8ab33abad 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ClassConstantMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ClassConstantMatcherFixture.php
@@ -36,5 +36,8 @@ class ClassConstantMatcherFixture
         $foo = \My\Different\SystemEnvironmentBuilder::REQUESTTYPE_FE;
         // @extensionScannerIgnoreLine
         $foo = SystemEnvironmentBuilder::REQUESTTYPE_FE;
+
+        // Match (again). No longer ignored.
+        $foo = \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::REQUESTTYPE_FE;
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ClassNameMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ClassNameMatcherFixture.php
index 8651358f3be4aa343376b07e3b9d199279a3f53c..aaab4c7cda178980715d71e687f45ffe39e41dea 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ClassNameMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ClassNameMatcherFixture.php
@@ -55,5 +55,8 @@ class ClassNameMatcherFixture extends App2 implements App3, Con\Application
         \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('\\TYPO3\CMS\Backend\Console\Application')->foo();
         // @extensionScannerIgnoreLine
         $bar = \RemoveXSS::class;
+
+        // Match (again). No longer ignored.
+        $foo = new \RemoveXSS();
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ConstantMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ConstantMatcherFixture.php
index 56b860241573eba18e89b08d7d9a00ecece8ec6c..fdece9eabfc3858d1860ca9933f7e4d7a09a4001 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ConstantMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/ConstantMatcherFixture.php
@@ -31,5 +31,8 @@ class ConstantMatcherFixture
         $foo = \My\Project\AClass::TYPO3_DLOG;
         // @extensionScannerIgnoreLine
         $foo = TYPO3_DLOG;
+
+        // Match (again). No longer ignored.
+        $foo = TYPO3_DLOG;
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/FunctionCallMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/FunctionCallMatcherFixture.php
index d8a25bfd20046691d50caa3341442ddc91a8d0e1..dbe25a666bc2a1fc031accc867fa543aac016a75 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/FunctionCallMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/FunctionCallMatcherFixture.php
@@ -38,5 +38,8 @@ class FunctionCallMatcherFixture
         debugBegin();
         // @extensionScannerIgnoreLine
         $bar->bar(\debugBegin());
+
+        // Match (again). No longer ignored.
+        \debugBegin();
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/InterfaceMethodChangedMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/InterfaceMethodChangedMatcherFixture.php
index 4e4d15efb993c11684855f315c995dd91ae5613f..59de1d36caf41befb0f9245b2204bd313b186d35 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/InterfaceMethodChangedMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/InterfaceMethodChangedMatcherFixture.php
@@ -45,8 +45,8 @@ class InterfaceMethodChangedMatcherFixture
      */
     public function like2($arg1, $arg2, $arg3): void
     {
-        // @extensionScannerIgnoreLine
         // Match: Call to ->like() with three arguments has been removed
+        // @extensionScannerIgnoreLine
         $foo->like2('arg1', 'arg2', 'arg3');
     }
 
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentDroppedMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentDroppedMatcherFixture.php
index c04ef9fbb4a532047ccc411e35d99e7d2ff2a62d..0a40723cc4b7a1825df00d47c930e3ff3e0423fd 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentDroppedMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentDroppedMatcherFixture.php
@@ -43,5 +43,7 @@ class MethodArgumentDroppedMatcherFixture
         $foo->euc_char_mapping('arg1', 'arg2');
         // @extensionScannerIgnoreLine
         $foo->euc_char_mapping('arg1', 'arg2', 'arg3');
+        // Match (again). No longer ignored.
+        $foo->euc_char_mapping('arg1', 'arg2', 'arg3');
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentDroppedStaticMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentDroppedStaticMatcherFixture.php
index 081e0075371ef681cdb239966461ce4f920a13f7..d0d1e79ac3801e1b6df5a654ba13e45868d8b988 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentDroppedStaticMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentDroppedStaticMatcherFixture.php
@@ -42,5 +42,7 @@ class MethodArgumentDroppedStaticMatcherFixture
         $foo::getFileAbsFileName(...$args1, ...$args2);
         // @extensionScannerIgnoreLine
         $foo::getFileAbsFileName('foo', 'bar');
+        // Match (again). No longer ignored.
+        \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName('foo', 'bar');
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentRequiredMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentRequiredMatcherFixture.php
index 477486122b76a60bfb6f6970328d1167c76c3f9c..a66876d3fe25c1205802dc7a7dce17ce7ecab1b2 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentRequiredMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentRequiredMatcherFixture.php
@@ -43,5 +43,7 @@ class MethodArgumentRequiredMatcherFixture
         $foo::searchWhere('arg1', 'arg2', 'arg3', 'arg4', 'arg5');
         // @extensionScannerIgnoreLine
         $this->searchWhere('arg1', 'arg2');
+        // Match (again). No longer ignored.
+        \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName('foo', 'bar');
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentRequiredStaticMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentRequiredStaticMatcherFixture.php
index d8dfbf672469c5a452d97534b2b298a72f51d8b7..33ec47a58ca39980985e999e1d2a4f700d6ad72c 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentRequiredStaticMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentRequiredStaticMatcherFixture.php
@@ -42,5 +42,6 @@ class MethodArgumentRequiredStaticMatcherFixture
         $foo::addNavigationComponent(...'foo');
         // @extensionScannerIgnoreLine
         ExtensionManagementUtility::addNavigationComponent('foo', 'bar');
+        // Match (again). No longer ignored.
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentUnusedMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentUnusedMatcherFixture.php
index 21033edda56f6e4c4f0748cfad1f59395a8cbc82..8a343295bafbf7a16f19620d3a3ccfb7beddc189 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentUnusedMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodArgumentUnusedMatcherFixture.php
@@ -43,5 +43,7 @@ class MethodArgumentUnusedMatcherFixture
         $foo->RTE_transform(...$args1, ...$args2, ...$args3);
         // @extensionScannerIgnoreLine
         $foo->RTE_transform('arg1', 'arg2');
+        // Match (again). No longer ignored.
+        $foo->RTE_transform('arg1', 'arg2');
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodCallMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodCallMatcherFixture.php
index 4dae1e09b8e4deaa6c3efab30ea2115cea09fc91..c6e196f5fddd436fc9faa894cae3593e1b26e2ec 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodCallMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodCallMatcherFixture.php
@@ -58,5 +58,7 @@ class MethodCallMatcherFixture
         $foo->confirmMsg('arg1', 'arg2', 'arg3', 'arg4', 'arg5');
         // @extensionScannerIgnoreLine
         $bar->bar($foo->confirmMsg('arg1', 'arg2', 'arg3', 'arg4', 'arg5'));
+        // Match (again). No longer ignored.
+        $foo->confirmMsg('arg1', 'arg2', 'arg3', 'arg4');
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodCallStaticMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodCallStaticMatcherFixture.php
index c27da73219c1764e47f7d292eaf6775c7ff1f5d8..a112240bea5e888fb134852ac0f624a026cf9597 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodCallStaticMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/MethodCallStaticMatcherFixture.php
@@ -37,5 +37,7 @@ class MethodCallStaticMatcherFixture
         $foo->getAjaxUrl('bar');
         // @extensionScannerIgnoreLine
         $foo::getAjaxUrl('bar');
+        // Match (again). No longer ignored.
+        BackendUtility::getAjaxUrl();
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/PropertyExistsStaticMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/PropertyExistsStaticMatcherFixture.php
index 51c42ca79820e7d8c2ea85657980218e951a47ae..c8c32de30705db46fcdd5c9449c0454795b15f86 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/PropertyExistsStaticMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/PropertyExistsStaticMatcherFixture.php
@@ -47,6 +47,8 @@ class PropertyExistsStaticMatcherFixture4
     // Not a match: suppressed
     // @extensionScannerIgnoreLine
     public static $iAmAMatch;
+    // Match (again). No longer ignored.
+    public static $iAmAnUnignoredMatch;
 }
 
 class PropertyExistsStaticMatcherFixture5
@@ -58,6 +60,8 @@ class PropertyExistsStaticMatcherFixture5
      * @var string|null
      */
     public static $iAmAMatch;
+    // Match (again). No longer ignored.
+    public static $iAmAnUnignoredMatch;
 }
 
 class PropertyExistsStaticMatcherFixture6
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/PropertyProtectedMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/PropertyProtectedMatcherFixture.php
index e363472a6e0f7cd2bab6b7fca9d59d4cd3c5fd1b..7721ab27b176c9bce17cbd30131cafc214e97a70 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/PropertyProtectedMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/PropertyProtectedMatcherFixture.php
@@ -45,5 +45,7 @@ class PropertyProtectedMatcherFixture
         static::$foo();
         // @extensionScannerIgnoreLine
         $foo->recUpdateAccessCache;
+        // Match (again). No longer ignored.
+        $foo->recUpdateAccessCache;
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/PropertyPublicMatcherFixture.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/PropertyPublicMatcherFixture.php
index e2ad010c1447ce4325b0b46304e51dc2ab5fe732..6529a423fb473630eb0e532c18188a5ab4515676 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/PropertyPublicMatcherFixture.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/Fixtures/PropertyPublicMatcherFixture.php
@@ -45,5 +45,7 @@ class PropertyPublicMatcherFixture
         static::$foo();
         // @extensionScannerIgnoreLine
         $foo->localizationMode;
+        // Match (again). No longer ignored.
+        $foo->localizationMode;
     }
 }
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/FunctionCallMatcherTest.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/FunctionCallMatcherTest.php
index 33221f2a955680caa78cf7e3f55539aa2bf7b206..1333118517a24ec63de53dd703831cd347f0458c 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/FunctionCallMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/FunctionCallMatcherTest.php
@@ -51,6 +51,7 @@ final class FunctionCallMatcherTest extends UnitTestCase
         $traverser->traverse($statements);
         $expectedHitLineNumbers = [
             28,
+            43,
         ];
         $actualHitLineNumbers = [];
         foreach ($subject->getMatches() as $hit) {
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentDroppedMatcherTest.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentDroppedMatcherTest.php
index 83d967367f2a773ec30b137ad82b3dff5f4f6109..8d19a12b8afc6c18ac25509c359a400fb8674715 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentDroppedMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentDroppedMatcherTest.php
@@ -51,6 +51,7 @@ final class MethodArgumentDroppedMatcherTest extends UnitTestCase
         $traverser->traverse($statements);
         $expectedHitLineNumbers = [
             28,
+            47,
         ];
         $actualHitLineNumbers = [];
         foreach ($subject->getMatches() as $hit) {
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentDroppedStaticMatcherTest.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentDroppedStaticMatcherTest.php
index 834ea3e79802ace2b4ff7529441df5d9c5490620..74f371c9a20a992e0112ea2ab1152066bbb6fa69 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentDroppedStaticMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentDroppedStaticMatcherTest.php
@@ -54,6 +54,7 @@ final class MethodArgumentDroppedStaticMatcherTest extends UnitTestCase
             30,
             32,
             34,
+            46,
         ];
         $actualHitLineNumbers = [];
         foreach ($subject->getMatches() as $hit) {
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentUnusedMatcherTest.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentUnusedMatcherTest.php
index e99874af178d6cf8d2df54cf6b149745597d484e..d17084ada30228c3767938953486327dd4c3f6fc 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentUnusedMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentUnusedMatcherTest.php
@@ -53,6 +53,7 @@ final class MethodArgumentUnusedMatcherTest extends UnitTestCase
         $expectedHitLineNumbers = [
             28,
             29,
+            47,
         ];
         $actualHitLineNumbers = [];
         foreach ($subject->getMatches() as $hit) {
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodCallMatcherTest.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodCallMatcherTest.php
index d386649368c5531b91d2e15f98db5e760ec51f92..ec840ffb7c065dabf158f0d061ffe3da008e7e50 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodCallMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodCallMatcherTest.php
@@ -55,6 +55,7 @@ final class MethodCallMatcherTest extends UnitTestCase
             30,
             33,
             35,
+            62,
         ];
         $actualHitLineNumbers = [];
         foreach ($subject->getMatches() as $hit) {
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodCallStaticMatcherTest.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodCallStaticMatcherTest.php
index 05757827cf7d6961c698270513bd26dba7af1a09..1478bf2c81a45ed096d5e54e17ef024b5a84054b 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodCallStaticMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodCallStaticMatcherTest.php
@@ -56,6 +56,7 @@ final class MethodCallStaticMatcherTest extends UnitTestCase
         $expectedHitLineNumbers = [
             30,
             32,
+            41,
         ];
         $actualHitLineNumbers = [];
         foreach ($subject->getMatches() as $hit) {
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/PropertyProtectedMatcherTest.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/PropertyProtectedMatcherTest.php
index e785d395f2aa343b7a1bf0afcea7caa18c2680c1..e6cfe6f4c53003e35e7afd73ddda220c1c1efd7e 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/PropertyProtectedMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/PropertyProtectedMatcherTest.php
@@ -51,6 +51,7 @@ final class PropertyProtectedMatcherTest extends UnitTestCase
         $traverser->traverse($statements);
         $expectedHitLineNumbers = [
             28,
+            49,
         ];
         $actualHitLineNumbers = [];
         foreach ($subject->getMatches() as $hit) {
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/PropertyPublicMatcherTest.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/PropertyPublicMatcherTest.php
index 4586194c3a4712820a5a68cbe00e636d035149e9..e257a674927ce3d0ef19710dcb585b2a9b21e85f 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/PropertyPublicMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/PropertyPublicMatcherTest.php
@@ -51,6 +51,7 @@ final class PropertyPublicMatcherTest extends UnitTestCase
         $expectedHitLineNumbers = [
             28,
             29,
+            49,
         ];
         $actualHitLineNumbers = [];
         foreach ($subject->getMatches() as $hit) {