Add union types

Author: nicolas-grekas

Crawler.php

@@ -68,7 +68,7 @@ class Crawler implements \Countable, \IteratorAggregate
     /**
      * @param \DOMNodeList|\DOMNode|\DOMNode[]|string|null $node A Node to use as the base for the crawling
      */
-    public function __construct($node = null, string $uri = null, string $baseHref = null)
+    public function __construct(\DOMNodeList|\DOMNode|array|string|null $node = null, string $uri = null, string $baseHref = null)
     {
         $this->uri = $uri;
         $this->baseHref = $baseHref ?: $uri;
@@ -118,7 +118,7 @@ public function clear()
      *
      * @throws \InvalidArgumentException when node is not the expected type
      */
-    public function add($node)
+    public function add(\DOMNodeList|\DOMNode|array|string|null $node)
     {
         if ($node instanceof \DOMNodeList) {
             $this->addNodeList($node);
@@ -1097,11 +1097,9 @@ public function getIterator()
     }
 
     /**
-     * @param \DOMElement $node
-     *
      * @return array
      */
-    protected function sibling($node, string $siblingDir = 'nextSibling')
+    protected function sibling(\DOMNode $node, string $siblingDir = 'nextSibling')
     {
         $nodes = [];
 
@@ -1212,7 +1210,7 @@ private function findNamespacePrefixes(string $xpath): array
      *
      * @return static
      */
-    private function createSubCrawler($nodes): object
+    private function createSubCrawler(\DOMNodeList|\DOMNode|array|string|null $nodes): object
     {
         $crawler = new static($nodes, $this->uri, $this->baseHref);
         $crawler->isHtml = $this->isHtml;

Field/ChoiceFormField.php

@@ -74,10 +74,8 @@ public function isDisabled()
 
     /**
      * Sets the value of the field.
-     *
-     * @param string|array $value The value of the field
      */
-    public function select($value)
+    public function select(string|array|bool $value)
     {
         $this->setValue($value);
     }
@@ -113,11 +111,9 @@ public function untick()
     /**
      * Sets the value of the field.
      *
-     * @param string|array|bool|null $value The value of the field
-     *
      * @throws \InvalidArgumentException When value type provided is not correct
      */
-    public function setValue($value)
+    public function setValue(string|array|bool|null $value)
     {
         if ('checkbox' === $this->type && false === $value) {
             // uncheck
@@ -290,11 +286,9 @@ public function containsOption(string $optionValue, array $options)
     /**
      * Returns list of available field options.
      *
-     * @internal since Symfony 5.3
-     *
-     * @return array
+     * @internal
      */
-    public function availableOptionValues()
+    public function availableOptionValues(): array
     {
         $values = [];
 
@@ -308,11 +302,9 @@ public function availableOptionValues()
     /**
      * Disables the internal validation of the field.
      *
-     * @internal since Symfony 5.3
-     *
-     * @return self
+     * @internal
      */
-    public function disableValidation()
+    public function disableValidation(): static
     {
         $this->validationDisabled = true;
 

Form.php

@@ -315,7 +315,7 @@ public function all()
      *
      * @return bool true if the field exists, false otherwise
      */
-    public function offsetExists($name)
+    public function offsetExists(mixed $name)
     {
         return $this->has($name);
     }
@@ -329,7 +329,7 @@ public function offsetExists($name)
      *
      * @throws \InvalidArgumentException if the field does not exist
      */
-    public function offsetGet($name)
+    public function offsetGet(mixed $name)
     {
         return $this->fields->get($name);
     }
@@ -342,7 +342,7 @@ public function offsetGet($name)
      *
      * @throws \InvalidArgumentException if the field does not exist
      */
-    public function offsetSet($name, $value)
+    public function offsetSet(mixed $name, mixed $value)
     {
         $this->fields->set($name, $value);
     }
@@ -352,7 +352,7 @@ public function offsetSet($name, $value)
      *
      * @param string $name The field name
      */
-    public function offsetUnset($name)
+    public function offsetUnset(mixed $name)
     {
         $this->fields->remove($name);
     }

FormFieldRegistry.php

@@ -104,11 +104,9 @@ public function has(string $name): bool
     /**
      * Set the value of a field based on the fully qualified name and its children.
      *
-     * @param mixed $value The value
-     *
      * @throws \InvalidArgumentException if the field does not exist
      */
-    public function set(string $name, $value)
+    public function set(string $name, mixed $value)
     {
         $target = &$this->get($name);
         if ((!\is_array($value) && $target instanceof Field\FormField) || $target instanceof Field\ChoiceFormField) {

Tests/AbstractCrawlerTest.php

@@ -82,13 +82,6 @@ public function testAdd()
         $this->assertEquals('Foo', $crawler->filterXPath('//body')->text(), '->add() adds nodes from a string');
     }
 
-    public function testAddInvalidType()
-    {
-        $this->expectException(\InvalidArgumentException::class);
-        $crawler = $this->createCrawler();
-        $crawler->add(1);
-    }
-
     public function testAddMultipleDocumentNode()
     {
         $this->expectException(\InvalidArgumentException::class);