fix: TagFilter should handle tags with or without leading @

Update the filtering to match tags regardless of the gherkin parsing
mode.

Author: acoulton

src/Filter/TagFilter.php

@@ -117,12 +117,18 @@ protected function isTagsMatchCondition(array $tags)
             return true;
         }
 
+        // If the file was parsed in legacy mode, the `@` prefix will have been removed from the individual tags on the
+        // parsed node. The tags in the filter expression still have their @ so we add the prefix back here if required.
+        // This can be removed once legacy parsing mode is removed.
+        $tags = array_map(
+            static fn (string $tag) => str_starts_with($tag, '@') ? $tag : '@' . $tag,
+            $tags
+        );
+
         foreach (explode('&&', $this->filterString) as $andTags) {
             $satisfiesComma = false;
 
             foreach (explode(',', $andTags) as $tag) {
-                $tag = str_replace('@', '', trim($tag));
-
                 if ($tag[0] === '~') {
                     $tag = mb_substr($tag, 1, mb_strlen($tag, 'utf8') - 1, 'utf8');
                     $satisfiesComma = !in_array($tag, $tags, true) || $satisfiesComma;

src/GherkinCompatibilityMode.php

@@ -103,6 +103,7 @@ public function allowWhitespaceInLanguageTag(): bool
      */
     public function shouldRemoveTagPrefixChar(): bool
     {
+        // Note: When this is removed we can also remove the code in TagFilter that handles tags with no leading @
         return match ($this) {
             self::LEGACY => true,
             default => false,

tests/Filter/TagFilterTest.php

@@ -16,6 +16,7 @@
 use Behat\Gherkin\Node\OutlineNode;
 use Behat\Gherkin\Node\ScenarioNode;
 use ErrorException;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class TagFilterTest extends TestCase
@@ -300,6 +301,40 @@ public function testTagFilterThatIsAllWhitespaceIsIgnored(): void
         $this->assertTrue($result);
     }
 
+    /**
+     * @phpstan-return list<array{string, list<string>, bool}>
+     */
+    public static function providerMatchWithoutRemovingPrefix(): array
+    {
+        // These cases rely on the bulk of the coverage being provided by the other tests, and the knowledge that the
+        // implementation ultimately uses the same logic to compare tags from all types of nodes. They are only intended
+        // to be temporary until we drop legacy parsing mode, at which point we can add the `@` to all the tags in the
+        // other tests in this file.
+        return [
+            ['@wip', [], false],
+            ['@wip', ['@slow'], false],
+            ['@wip', ['@wip'], true],
+            ['@wip', ['@slow', '@wip'], true],
+            ['@tag1&&~@tag2&&@tag3', [], false],
+            ['@tag1&&~@tag2&&@tag3', ['@tag1'], false],
+            ['@tag1&&~@tag2&&@tag3', ['@tag1', '@tag3'], true],
+            ['@tag1&&~@tag2&&@tag3', ['@tag1', '@tag2'], false],
+            ['@tag1&&~@tag2&&@tag3', ['@tag1', '@tag4'], false],
+            ['@tag1&&~@tag2&&@tag3', ['@tag1', '@tag2', '@tag3'], false],
+        ];
+    }
+
+    /**
+     * @phpstan-param list<string> $tags
+     */
+    #[DataProvider('providerMatchWithoutRemovingPrefix')]
+    public function testItMatchesTagsParsedWithoutRemovingPrefix(string $filter, array $tags, bool $expect): void
+    {
+        $feature = new FeatureNode(null, null, $tags, null, [], '', '', null, 1);
+        $tagFilter = new TagFilter($filter);
+        $this->assertSame($expect, $tagFilter->isFeatureMatch($feature));
+    }
+
     private function expectDeprecationError(): void
     {
         set_error_handler(