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 f35a8867e4ec8e25025be5a4c6630e9908f22289..8951aac93b4a5b0f8e5e745d3a63c42b0d918b54 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/CodeStatisticsTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/CodeStatisticsTest.php
@@ -39,6 +39,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 264678db60ef649fe1570d6facbff6bc7081bf86..e85c7c65eab2830d6fd035918438befc5f0d97e9 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ArrayDimensionMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ArrayDimensionMatcherTest.php
@@ -51,6 +51,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 4e4aad346126126079f3af2bdc77ab4d0cc479ac..7cf7d0c4b7cb1346215ee4dae26b8709b17f9619 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ArrayGlobalMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ArrayGlobalMatcherTest.php
@@ -49,6 +49,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 b6d144818e53234183463a96eb8a319fe067f091..e82e2895f9867f0e49453f055fcfd6bf6dd4b8e0 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ClassConstantMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ClassConstantMatcherTest.php
@@ -58,6 +58,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 8e46a0831c5d8a0d6835afdf96c2a1e1114d848e..8a7c67b964de4006ac643a87a5ee5c42e1c3b75e 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ClassNameMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ClassNameMatcherTest.php
@@ -72,6 +72,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 337f18d334db4057cbd12dcf51e709327988885c..55a75fc3c372f3db1214b4e4ea3eabcc4134fd42 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ConstantMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ConstantMatcherTest.php
@@ -51,6 +51,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 7e7259d74525f2e96c14f72c1e6b755bea462d5e..011a023d1097504c7ddab75cbaaecfb484d314cc 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/FunctionCallMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/FunctionCallMatcherTest.php
@@ -50,6 +50,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 78d0e0c428f99406f2b2be61bb4b3d9067ec94ea..8ee7213749fc2f21f7d4a54fc5bd2962290f584b 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentDroppedMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentDroppedMatcherTest.php
@@ -50,6 +50,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 083b114e480a86b366f3f31d248f3b5a6e2e08f2..9bcc276e9f12c1f3649309e82ff388d48ddf166b 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentDroppedStaticMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentDroppedStaticMatcherTest.php
@@ -53,6 +53,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 f57591b5fa2b1f15323416c3bc8eda5cefca66b6..e3e97636fe1ffa0701037a5f0b77af9b4aa034cc 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentUnusedMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodArgumentUnusedMatcherTest.php
@@ -52,6 +52,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 172af55b7a8f73f32830181465d1281b3b49aaa4..b82c165cfa917130d8542a93aa513ccd6470dd6b 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodCallMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodCallMatcherTest.php
@@ -54,6 +54,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 616fbb561caa81e2ce1dd41481c19c1d15036202..512758ca73ec8ab015c6ed1431cfa86a04f944a9 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodCallStaticMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/MethodCallStaticMatcherTest.php
@@ -55,6 +55,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 bd4235a7d36e39b57f79e88615e6c37c19888327..c19227f8cba2003d5147379d5f2a30b6ba43cd83 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/PropertyProtectedMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/PropertyProtectedMatcherTest.php
@@ -50,6 +50,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 0f6142226237dce6726c8bfb7f05edab14b97519..77818494cd5c7a33e9aaf8183b1b5c8178ac6c66 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/PropertyPublicMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/PropertyPublicMatcherTest.php
@@ -50,6 +50,7 @@ final class PropertyPublicMatcherTest extends UnitTestCase
$expectedHitLineNumbers = [
28,
29,
+ 49,
];
$actualHitLineNumbers = [];
foreach ($subject->getMatches() as $hit) {