Change Selector constructor to accept string or list<Component>

Author: JakeQZ

src/Property/Selector.php

@@ -74,16 +74,17 @@ public static function isValid(string $selector): bool
     }
 
     /**
-     * @param non-empty-string $selector
+     * @param non-empty-string|list<Component> $selector
+     *        Providing a string is deprecated in version 9.2 and will not work from v10.0
      *
      * @throws \UnexpectedValueException if the selector is not valid
      */
-    final public function __construct(string $selector = '')
+    final public function __construct($selector)
     {
-        // Allow construction of empty object for content to be set via `setComponents()`.
-        // (`setSelector()` will throw an exception when provided with an empty string.)
-        if ($selector !== '') {
+        if (\is_string($selector)) {
             $this->setSelector($selector);
+        } else {
+            $this->setComponents($selector);
         }
     }
 
@@ -147,7 +148,7 @@ public static function parse(ParserState $parserState, array &$comments = []): s
             );
         }
 
-        return (new static())->setComponents($selectorParts);
+        return new static($selectorParts);
     }
 
     /**

tests/Unit/Property/KeyframeSelectorTest.php

@@ -31,7 +31,7 @@ public function getArrayRepresentationIncludesClassName(): void
      */
     public function getArrayRepresentationIncludesComponent(): void
     {
-        $subject = (new KeyframeSelector())->setComponents([new CompoundSelector('50%')]);
+        $subject = new KeyframeSelector([new CompoundSelector('50%')]);
 
         $result = $subject->getArrayRepresentation();
 

tests/Unit/Property/SelectorTest.php

@@ -395,7 +395,7 @@ public static function provideComponentsAndArrayRepresentation(): array
      */
     public function setComponentsSetsComponentsProvided(array $components, array $expectedRepresenation): void
     {
-        $subject = new Selector();
+        $subject = new Selector([]);
 
         $subject->setComponents($components);
 
@@ -408,7 +408,7 @@ public function setComponentsSetsComponentsProvided(array $components, array $ex
      */
     public function getComponentsReturnsEmptyArrayIfNotSet(): void
     {
-        $subject = new Selector();
+        $subject = new Selector([]);
 
         $result = $subject->getComponents();
 
@@ -424,7 +424,7 @@ public function getComponentsReturnsEmptyArrayIfNotSet(): void
      */
     public function getComponentsReturnsComponentsSet(array $components): void
     {
-        $subject = new Selector();
+        $subject = new Selector([]);
         $subject->setComponents($components);
 
         $result = $subject->getComponents();
@@ -541,7 +541,7 @@ public function doesNotCleanupSpacesWithinAttributeSelector(): void
      */
     public function getArrayRepresentationIncludesClassName(): void
     {
-        $subject = new Selector();
+        $subject = new Selector([]);
 
         $result = $subject->getArrayRepresentation();
 
@@ -553,7 +553,7 @@ public function getArrayRepresentationIncludesClassName(): void
      */
     public function getArrayRepresentationIncludesComponent(): void
     {
-        $subject = (new Selector())->setComponents([new CompoundSelector('p.test')]);
+        $subject = new Selector([new CompoundSelector('p.test')]);
 
         $result = $subject->getArrayRepresentation();