symfony · May 19, 2021 · May 19, 2021 · May 20, 2021 · May 22, 2021 · May 26, 2021
diff --git a/AbstractUriElement.php b/AbstractUriElement.php
@@ -55,49 +55,39 @@ public function __construct(\DOMElement $node, string $currentUri = null, ?strin
 
     /**
      * Gets the node associated with this link.
-     *
-     * @return \DOMElement
      */
-    public function getNode()
+    public function getNode(): \DOMElement
     {
         return $this->node;
     }
 
     /**
      * Gets the method associated with this link.
-     *
-     * @return string
      */
-    public function getMethod()
+    public function getMethod(): string
     {
         return $this->method ?? 'GET';
     }
 
     /**
      * Gets the URI associated with this link.
-     *
-     * @return string
      */
-    public function getUri()
+    public function getUri(): string
     {
         return UriResolver::resolve($this->getRawUri(), $this->currentUri);
     }
 
     /**
      * Returns raw URI data.
-     *
-     * @return string
      */
-    abstract protected function getRawUri();
+    abstract protected function getRawUri(): string;
 
     /**
      * Returns the canonicalized URI path (see RFC 3986, section 5.2.4).
      *
      * @param string $path URI path
-     *
-     * @return string
      */
-    protected function canonicalizePath(string $path)
+    protected function canonicalizePath(string $path): string
     {
         if ('' === $path || '/' === $path) {
             return $path;

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.0
+---
+
+ * Remove `Crawler::parents()` method, use `ancestors()` instead
+
 5.4
 ---
 

diff --git a/Crawler.php b/Crawler.php
diff --git a/Field/ChoiceFormField.php b/Field/ChoiceFormField.php
@@ -20,29 +20,17 @@
  */
 class ChoiceFormField extends FormField
 {
-    /**
-     * @var string
-     */
-    private $type;
-    /**
-     * @var bool
-     */
-    private $multiple;
-    /**
-     * @var array
-     */
-    private $options;
-    /**
-     * @var bool
-     */
-    private $validationDisabled = false;
+    private string $type;
+    private bool $multiple;
+    private array $options;
+    private bool $validationDisabled = false;
 
     /**
      * Returns true if the field should be included in the submitted values.
      *
      * @return bool true if the field should be included in the submitted values, false otherwise
      */
-    public function hasValue()
+    public function hasValue(): bool
     {
         // don't send a value for unchecked checkboxes
         if (\in_array($this->type, ['checkbox', 'radio']) && null === $this->value) {
@@ -54,10 +42,8 @@ public function hasValue()
 
     /**
      * Check if the current selected option is disabled.
-     *
-     * @return bool
      */
-    public function isDisabled()
+    public function isDisabled(): bool
     {
         if (parent::isDisabled() && 'select' === $this->type) {
             return true;
@@ -74,10 +60,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 +97,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
@@ -175,20 +157,16 @@ public function addChoice(\DOMElement $node)
 
     /**
      * Returns the type of the choice field (radio, select, or checkbox).
-     *
-     * @return string
      */
-    public function getType()
+    public function getType(): string
     {
         return $this->type;
     }
 
     /**
      * Returns true if the field accepts multiple values.
-     *
-     * @return bool
      */
-    public function isMultiple()
+    public function isMultiple(): bool
     {
         return $this->multiple;
     }
@@ -268,11 +246,9 @@ private function buildOptionValue(\DOMElement $node): array
     /**
      * Checks whether given value is in the existing options.
      *
-     * @internal since Symfony 5.3
-     *
-     * @return bool
+     * @internal
      */
-    public function containsOption(string $optionValue, array $options)
+    public function containsOption(string $optionValue, array $options): bool
     {
         if ($this->validationDisabled) {
             return true;
@@ -290,11 +266,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 +282,11 @@ public function availableOptionValues()
     /**
      * Disables the internal validation of the field.
      *
-     * @internal since Symfony 5.3
+     * @internal
      *
      * @return $this
      */
-    public function disableValidation()
+    public function disableValidation(): static
     {
         $this->validationDisabled = true;
 

diff --git a/Field/FormField.php b/Field/FormField.php
@@ -57,10 +57,8 @@ public function __construct(\DOMElement $node)
 
     /**
      * Returns the label tag associated to the field or null if none.
-     *
-     * @return \DOMElement|null
      */
-    public function getLabel()
+    public function getLabel(): ?\DOMElement
     {
         $xpath = new \DOMXPath($this->node->ownerDocument);
 
@@ -78,20 +76,16 @@ public function getLabel()
 
     /**
      * Returns the name of the field.
-     *
-     * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
 
     /**
      * Gets the value of the field.
-     *
-     * @return string|array|null
      */
-    public function getValue()
+    public function getValue(): string|array|null
     {
         return $this->value;
     }
@@ -106,20 +100,16 @@ public function setValue(?string $value)
 
     /**
      * Returns true if the field should be included in the submitted values.
-     *
-     * @return bool
      */
-    public function hasValue()
+    public function hasValue(): bool
     {
         return true;
     }
 
     /**
      * Check if the current field is disabled.
-     *
-     * @return bool
      */
-    public function isDisabled()
+    public function isDisabled(): bool
     {
         return $this->node->hasAttribute('disabled');
     }

diff --git a/Form.php b/Form.php
@@ -21,20 +21,9 @@
  */
 class Form extends Link implements \ArrayAccess
 {
-    /**
-     * @var \DOMElement
-     */
-    private $button;
-
-    /**
-     * @var FormFieldRegistry
-     */
-    private $fields;
-
-    /**
-     * @var string
-     */
-    private $baseHref;
+    private \DOMElement $button;
+    private FormFieldRegistry $fields;
+    private ?string $baseHref;
 
     /**
      * @param \DOMElement $node       A \DOMElement instance
@@ -54,10 +43,8 @@ public function __construct(\DOMElement $node, string $currentUri = null, string
 
     /**
      * Gets the form node associated with this form.
-     *
-     * @return \DOMElement
      */
-    public function getFormNode()
+    public function getFormNode(): \DOMElement
     {
         return $this->node;
     }
@@ -69,7 +56,7 @@ public function getFormNode()
      *
      * @return $this
      */
-    public function setValues(array $values)
+    public function setValues(array $values): static
     {
         foreach ($values as $name => $value) {
             $this->fields->set($name, $value);
@@ -82,10 +69,8 @@ public function setValues(array $values)
      * Gets the field values.
      *
      * The returned array does not include file fields (@see getFiles).
-     *
-     * @return array
      */
-    public function getValues()
+    public function getValues(): array
     {
         $values = [];
         foreach ($this->fields->all() as $name => $field) {
@@ -103,10 +88,8 @@ public function getValues()
 
     /**
      * Gets the file field values.
-     *
-     * @return array
      */
-    public function getFiles()
+    public function getFiles(): array
     {
         if (!\in_array($this->getMethod(), ['POST', 'PUT', 'DELETE', 'PATCH'])) {
             return [];
@@ -132,10 +115,8 @@ public function getFiles()
      *
      * This method converts fields with the array notation
      * (like foo[bar] to arrays) like PHP does.
-     *
-     * @return array
      */
-    public function getPhpValues()
+    public function getPhpValues(): array
     {
         $values = [];
         foreach ($this->getValues() as $name => $value) {
@@ -159,10 +140,8 @@ public function getPhpValues()
      * (@see getPhpValues), rather than uploaded files found in $_FILES.
      * For a compound file field foo[bar] it will create foo[bar][name],
      * instead of foo[name][bar] which would be found in $_FILES.
-     *
-     * @return array
      */
-    public function getPhpFiles()
+    public function getPhpFiles(): array
     {
         $values = [];
         foreach ($this->getFiles() as $name => $value) {
@@ -195,10 +174,8 @@ function (&$value, $key) {
      * The returned URI is not the same as the form "action" attribute.
      * This method merges the value if the method is GET to mimics
      * browser behavior.
-     *
-     * @return string
      */
-    public function getUri()
+    public function getUri(): string
     {
         $uri = parent::getUri();
 
@@ -219,7 +196,7 @@ public function getUri()
         return $uri;
     }
 
-    protected function getRawUri()
+    protected function getRawUri(): string
     {
         // If the form was created from a button rather than the form node, check for HTML5 action overrides
         if ($this->button !== $this->node && $this->button->getAttribute('formaction')) {
@@ -233,10 +210,8 @@ protected function getRawUri()
      * Gets the form method.
      *
      * If no method is defined in the form, GET is returned.
-     *
-     * @return string
      */
-    public function getMethod()
+    public function getMethod(): string
     {
         if (null !== $this->method) {
             return $this->method;
@@ -262,10 +237,8 @@ public function getName(): string
 
     /**
      * Returns true if the named field exists.
-     *
-     * @return bool
      */
-    public function has(string $name)
+    public function has(string $name): bool
     {
         return $this->fields->has($name);
     }
@@ -285,7 +258,7 @@ public function remove(string $name)
      *
      * @throws \InvalidArgumentException When field is not present in this form
      */
-    public function get(string $name)
+    public function get(string $name): FormField|array
     {
         return $this->fields->get($name);
     }
@@ -303,7 +276,7 @@ public function set(FormField $field)
      *
      * @return FormField[]
      */
-    public function all()
+    public function all(): array
     {
         return $this->fields->all();
     }
@@ -312,11 +285,8 @@ public function all()
      * Returns true if the named field exists.
      *
      * @param string $name The field name
-     *
-     * @return bool
      */
-    #[\ReturnTypeWillChange]
-    public function offsetExists($name)
+    public function offsetExists(mixed $name): bool
     {
         return $this->has($name);
     }
@@ -330,8 +300,7 @@ public function offsetExists($name)
      *
      * @throws \InvalidArgumentException if the field does not exist
      */
-    #[\ReturnTypeWillChange]
-    public function offsetGet($name)
+    public function offsetGet(mixed $name): FormField|array
     {
         return $this->fields->get($name);
     }
@@ -342,12 +311,9 @@ public function offsetGet($name)
      * @param string       $name  The field name
      * @param string|array $value The value of the field
      *
-     * @return void
-     *
      * @throws \InvalidArgumentException if the field does not exist
      */
-    #[\ReturnTypeWillChange]
-    public function offsetSet($name, $value)
+    public function offsetSet(mixed $name, mixed $value): void
     {
         $this->fields->set($name, $value);
     }
@@ -356,11 +322,8 @@ public function offsetSet($name, $value)
      * Removes a field from the form.
      *
      * @param string $name The field name
-     *
-     * @return void
      */
-    #[\ReturnTypeWillChange]
-    public function offsetUnset($name)
+    public function offsetUnset(mixed $name): void
     {
         $this->fields->remove($name);
     }
@@ -370,7 +333,7 @@ public function offsetUnset($name)
      *
      * @return $this
      */
-    public function disableValidation()
+    public function disableValidation(): static
     {
         foreach ($this->fields->all() as $field) {
             if ($field instanceof Field\ChoiceFormField) {

diff --git a/FormFieldRegistry.php b/FormFieldRegistry.php
@@ -20,9 +20,8 @@
  */
 class FormFieldRegistry
 {
-    private $fields = [];
-
-    private $base = '';
+    private array $fields = [];
+    private string $base = '';
 
     /**
      * Adds a field to the registry.
@@ -70,7 +69,7 @@ public function remove(string $name)
      *
      * @throws \InvalidArgumentException if the field does not exist
      */
-    public function &get(string $name)
+    public function &get(string $name): FormField|array
     {
         $segments = $this->getSegments($name);
         $target = &$this->fields;
@@ -87,8 +86,6 @@ public function &get(string $name)
 
     /**
      * Tests whether the form has the given field based on the fully qualified name.
-     *
-     * @return bool
      */
     public function has(string $name): bool
     {
@@ -104,11 +101,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) {

diff --git a/Image.php b/Image.php
@@ -21,7 +21,7 @@ public function __construct(\DOMElement $node, string $currentUri = null)
         parent::__construct($node, $currentUri, 'GET');
     }
 
-    protected function getRawUri()
+    protected function getRawUri(): string
     {
         return $this->node->getAttribute('src');
     }

diff --git a/Link.php b/Link.php
@@ -18,7 +18,7 @@
  */
 class Link extends AbstractUriElement
 {
-    protected function getRawUri()
+    protected function getRawUri(): string
     {
         return $this->node->getAttribute('href');
     }

diff --git a/Test/Constraint/CrawlerSelectorAttributeValueSame.php b/Test/Constraint/CrawlerSelectorAttributeValueSame.php
@@ -16,9 +16,9 @@
 
 final class CrawlerSelectorAttributeValueSame extends Constraint
 {
-    private $selector;
-    private $attribute;
-    private $expectedText;
+    private string $selector;
+    private string $attribute;
+    private string $expectedText;
 
     public function __construct(string $selector, string $attribute, string $expectedText)
     {

diff --git a/Test/Constraint/CrawlerSelectorExists.php b/Test/Constraint/CrawlerSelectorExists.php
@@ -16,7 +16,7 @@
 
 final class CrawlerSelectorExists extends Constraint
 {
-    private $selector;
+    private string $selector;
 
     public function __construct(string $selector)
     {

diff --git a/Test/Constraint/CrawlerSelectorTextContains.php b/Test/Constraint/CrawlerSelectorTextContains.php
@@ -16,10 +16,10 @@
 
 final class CrawlerSelectorTextContains extends Constraint
 {
-    private $selector;
-    private $expectedText;
-    private $hasNode = false;
-    private $nodeText;
+    private string $selector;
+    private string $expectedText;
+    private bool $hasNode = false;
+    private string $nodeText;
 
     public function __construct(string $selector, string $expectedText)
     {

diff --git a/Test/Constraint/CrawlerSelectorTextSame.php b/Test/Constraint/CrawlerSelectorTextSame.php
@@ -16,8 +16,8 @@
 
 final class CrawlerSelectorTextSame extends Constraint
 {
-    private $selector;
-    private $expectedText;
+    private string $selector;
+    private string $expectedText;
 
     public function __construct(string $selector, string $expectedText)
     {

diff --git a/Tests/AbstractCrawlerTest.php b/Tests/AbstractCrawlerTest.php
@@ -12,16 +12,13 @@
 namespace Symfony\Component\DomCrawler\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\DomCrawler\Form;
 use Symfony\Component\DomCrawler\Image;
 use Symfony\Component\DomCrawler\Link;
 
 abstract class AbstractCrawlerTest extends TestCase
 {
-    use ExpectDeprecationTrait;
-
     abstract public function getDoctype(): string;
 
     protected function createCrawler($node = null, string $uri = null, string $baseHref = null)
@@ -82,13 +79,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);
@@ -1096,31 +1086,6 @@ public function testFilteredChildren()
         $this->assertEquals(1, $foo->children('.ipsum')->count());
     }
 
-    /**
-     * @group legacy
-     */
-    public function testParents()
-    {
-        $this->expectDeprecation('Since symfony/dom-crawler 5.3: The Symfony\Component\DomCrawler\Crawler::parents() method is deprecated, use ancestors() instead.');
-
-        $crawler = $this->createTestCrawler()->filterXPath('//li[1]');
-        $this->assertNotSame($crawler, $crawler->parents(), '->parents() returns a new instance of a crawler');
-        $this->assertInstanceOf(Crawler::class, $crawler->parents(), '->parents() returns a new instance of a crawler');
-
-        $nodes = $crawler->parents();
-        $this->assertEquals(3, $nodes->count());
-
-        $nodes = $this->createTestCrawler()->filterXPath('//html')->parents();
-        $this->assertEquals(0, $nodes->count());
-
-        try {
-            $this->createTestCrawler()->filterXPath('//ol')->parents();
-            $this->fail('->parents() throws an \InvalidArgumentException if the node list is empty');
-        } catch (\InvalidArgumentException $e) {
-            $this->assertTrue(true, '->parents() throws an \InvalidArgumentException if the node list is empty');
-        }
-    }
-
     public function testAncestors()
     {
         $crawler = $this->createTestCrawler()->filterXPath('//li[1]');

diff --git a/composer.json b/composer.json
@@ -16,14 +16,12 @@
         }
     ],
     "require": {
-        "php": ">=7.2.5",
-        "symfony/deprecation-contracts": "^2.1",
+        "php": ">=8.0.2",
         "symfony/polyfill-ctype": "~1.8",
-        "symfony/polyfill-mbstring": "~1.0",
-        "symfony/polyfill-php80": "^1.16"
+        "symfony/polyfill-mbstring": "~1.0"
     },
     "require-dev": {
-        "symfony/css-selector": "^4.4|^5.0|^6.0",
+        "symfony/css-selector": "^5.4|^6.0",
         "masterminds/html5": "^2.6"
     },
     "conflict": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.3/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php"
@@ -18,14 +18,14 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+        </include>
+        <exclude>
+            <directory>./Resources</directory>
+            <directory>./Tests</directory>
+            <directory>./vendor</directory>
+        </exclude>
+    </coverage>
 </phpunit>