Add more tests for rejecting invalid selectors.

Also reject selectors that comprise only whitespace.

Author: JakeQZ

src/RuleSet/DeclarationBlock.php

@@ -354,7 +354,7 @@ private static function parseSelector(ParserState $parserState, array &$comments
             throw new UnexpectedTokenException(')', $nextCharacter);
         }
 
-        $selector = \implode('', $selectorParts);
+        $selector = \trim(\implode('', $selectorParts));
         if ($selector === '') {
             throw new UnexpectedTokenException('selector', $nextCharacter, 'literal', $parserState->currentLine());
         }

tests/Unit/RuleSet/DeclarationBlockTest.php

@@ -226,23 +226,44 @@ public function parseExtractsTwoCommentsFromSelector(): void
     }
 
     /**
-     * @return array<non-empty-string, array{0: non-empty-string}>
+     * @return array<non-empty-string, array{0: string, 1: non-empty-string}>
      */
-    public static function provideInvalidSelector(): array
+    public static function provideInvalidSelectorAndExpectedExceptionMessage(): array
     {
         return [
-            'lone `(`' => ['('],
-            'lone `)`' => [')'],
-            'unclosed `(`' => [':not(#your-mug'],
-            'extra `)`' => [':not(#your-mug))'],
+            'no selector' => ['', 'Token “selector” (literal) not found. Got “{”. [line no: 1]'],
+            'lone `(`' => ['(', 'Token “)” (literal) not found. Got “{”.'],
+            'lone `)`' => [')', 'Token “anything but” (literal) not found. Got “)”.'],
+            'lone `,`' => [',', 'Token “selector” (literal) not found. Got “,”. [line no: 1]'],
+            'unclosed `(`' => [':not(#your-mug', 'Token “)” (literal) not found. Got “{”.'],
+            'extra `)`' => [':not(#your-mug))', 'Token “anything but” (literal) not found. Got “)”.'],
+            '`,` missing left operand' => [', a', 'Token “selector” (literal) not found. Got “,”. [line no: 1]'],
+            '`,` missing right operand' => ['a,', 'Token “selector” (literal) not found. Got “{”. [line no: 1]'],
         ];
     }
 
+    /**
+     * @return array<non-empty-string, array{0: string}>
+     */
+    public static function provideInvalidSelector(): array
+    {
+        // Re-use the set of invalid selectors, but remove the expected exception message for tests that don't need it.
+        return \array_map(
+            /**
+             * @param array{0: string, 1: non-empty-string}
+             *
+             * @return array<{0: string}>
+             */
+            static function (array $testData): array {
+                return [$testData[0]];
+            },
+            self::provideInvalidSelectorAndExpectedExceptionMessage()
+        );
+    }
+
     /**
      * @test
      *
-     * @param non-empty-string $selector
-     *
      * @dataProvider provideInvalidSelector
      */
     public function parseSkipsBlockWithInvalidSelector(string $selector): void
@@ -257,6 +278,25 @@ public function parseSkipsBlockWithInvalidSelector(string $selector): void
         self::assertTrue($parserState->comes($nextCss));
     }
 
+    /**
+     * @test
+     *
+     * @param non-empty-string $expectedExceptionMessage
+     *
+     * @dataProvider provideInvalidSelectorAndExpectedExceptionMessage
+     */
+    public function parseInStrictModeThrowsExceptionWithInvalidSelector(
+        string $selector,
+        string $expectedExceptionMessage
+    ): void {
+        $this->expectException(UnexpectedTokenException::class);
+        $this->expectExceptionMessage($expectedExceptionMessage);
+
+        $parserState = new ParserState($selector . ' {}', Settings::create()->beStrict());
+
+        $subject = DeclarationBlock::parse($parserState);
+    }
+
     /**
      * @return array<non-empty-string, array{0: non-empty-string}>
      */
@@ -514,7 +554,7 @@ public static function provideInvalidStandaloneSelector(): array
     public function setSelectorsThrowsExceptionWithInvalidSelector(string $selector): void
     {
         $this->expectException(UnexpectedTokenException::class);
-        $this->expectExceptionMessageMatches('/^Selector\\(s\\) string is not valid. /');
+        $this->expectExceptionMessageMatches('/^Selector\\(s\\) string is not valid./');
 
         $subject = new DeclarationBlock();