minor: More cleanups and type declarations for v2

Author: chalasr

composer.json

@@ -21,13 +21,13 @@
     "ext-dom": "*",
     "ext-libxml": "*",
     "php-webdriver/webdriver": "^1.8.2",
-    "symfony/browser-kit": "^4.4 || ^5.0 || ^6.0",
-    "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0",
+    "symfony/browser-kit": "^5.3 || ^6.0",
+    "symfony/dependency-injection": "^5.3 || ^6.0",
     "symfony/deprecation-contracts": "^2.4 || ^3",
-    "symfony/dom-crawler": "^4.4 || ^5.0 || ^6.0",
-    "symfony/http-client": "^4.4.11 || ^5.2 || ^6.0",
-    "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0",
-    "symfony/process": "^4.4 || ^5.0 || ^6.0"
+    "symfony/dom-crawler": "^5.3 || ^6.0",
+    "symfony/http-client": "^5.3 || ^6.0",
+    "symfony/http-kernel": "^5.3 || ^6.0",
+    "symfony/process": "^5.3 || ^6.0"
   },
   "autoload": {
     "psr-4": { "Symfony\\Component\\Panther\\": "src/" }
@@ -44,9 +44,9 @@
     "sort-packages": true
   },
   "require-dev": {
-    "symfony/css-selector": "^4.4 || ^5.0 || ^6.0",
-    "symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0",
-    "symfony/mime": "^4.4 || ^5.0 || ^6.0",
-    "symfony/phpunit-bridge": "^5.2 || ^6.0"
+    "symfony/css-selector": "^5.3 || ^6.0",
+    "symfony/framework-bundle": "^5.3 || ^6.0",
+    "symfony/mime": "^5.3 || ^6.0",
+    "symfony/phpunit-bridge": "^5.3 || ^6.0"
   }
 }

phpstan.neon

@@ -16,4 +16,3 @@ parameters:
 		# Require a redesign of the underlying Symfony components
 		- '#Call to an undefined method DOMNode::getTagName\(\)\.#'
 		- '#Return type \(void\) of method Symfony\\Component\\Panther\\DomCrawler\\Crawler::clear\(\) should be compatible with return type \(Facebook\\WebDriver\\WebDriverElement\) of method Facebook\\WebDriver\\WebDriverElement::clear\(\)#'
-		- '#Method Symfony\\Component\\Panther\\DomCrawler\\Crawler::getIterator\(\) should return ArrayIterator<int, DOMNode> but returns ArrayIterator<\(int\|string\), Facebook\\WebDriver\\WebDriverElement>\.#'

src/Client.php

@@ -56,13 +56,10 @@ final class Client extends AbstractBrowser implements WebDriver, JavaScriptExecu
 {
     use ExceptionThrower;
 
-    /**
-     * @var WebDriver|null
-     */
-    private $webDriver;
-    private $browserManager;
-    private $baseUri;
-    private $isFirefox = false;
+    private ?WebDriver $webDriver = null;
+    private BrowserManagerInterface $browserManager;
+    private ?string $baseUri = null;
+    private bool $isFirefox = false;
 
     /**
      * @param string[]|null $arguments

src/Cookie/CookieJar.php

@@ -28,7 +28,7 @@ final class CookieJar extends BaseCookieJar
 {
     use ExceptionThrower;
 
-    private $webDriver;
+    private WebDriver $webDriver;
 
     public function __construct(WebDriver $webDriver)
     {
@@ -146,7 +146,7 @@ private function getWebDriverCookie(string $name, string $path = '/', ?string $d
         }
 
         $cookiePath = $cookie->getPath() ?? '/';
-        if (0 !== strpos($path, $cookiePath)) {
+        if (!str_starts_with($path, $cookiePath)) {
             return null;
         }
 

src/DomCrawler/Crawler.php

@@ -28,8 +28,8 @@ final class Crawler extends BaseCrawler implements WebDriverElement
 {
     use ExceptionThrower;
 
-    private $elements;
-    private $webDriver;
+    private array $elements;
+    private ?WebDriver $webDriver;
 
     /**
      * @param WebDriverElement[] $elements
@@ -142,13 +142,6 @@ public function previousAll(): static
         return $this->createSubCrawlerFromXpath('preceding-sibling::*');
     }
 
-    public function parents(): self
-    {
-        trigger_deprecation('symfony/panther', '1.1', 'The %s() method is deprecated, use ancestors() instead.', __METHOD__);
-
-        return $this->ancestors();
-    }
-
     public function ancestors(): static
     {
         return $this->createSubCrawlerFromXpath('ancestor::*', true);

src/DomCrawler/Field/ChoiceFormField.php

@@ -25,15 +25,8 @@ final class ChoiceFormField extends BaseChoiceFormField
 {
     use FormFieldTrait;
 
-    /**
-     * @var string
-     */
-    private $type;
-
-    /**
-     * @var WebDriverSelectInterface
-     */
-    private $selector;
+    private string $type;
+    private WebDriverSelectInterface $selector;
 
     public function hasValue(): bool
     {

src/DomCrawler/Field/FileFormField.php

@@ -60,7 +60,7 @@ public function setValue($value): void
      *
      * @param string $path The path to the file
      */
-    public function setFilePath($path): void
+    public function setFilePath(string $path): void
     {
         $this->element->sendKeys($this->sanitizeValue($path));
     }

src/DomCrawler/Field/FormFieldTrait.php

@@ -26,7 +26,7 @@ trait FormFieldTrait
 {
     use ExceptionThrower;
 
-    private $element;
+    private WebDriverElement $element;
 
     public function __construct(WebDriverElement $element)
     {
@@ -54,15 +54,12 @@ public function isDisabled(): bool
         return null !== $this->element->getAttribute('disabled');
     }
 
-    private function setTextValue($value): void
+    private function setTextValue(?string $value): void
     {
         // Ensure to clean field before sending keys.
         // Unable to use $this->element->clear(); because it triggers a change event on it's own which is unexpected behavior.
 
         $v = $this->getValue();
-        if (\is_array($v)) {
-            throw new \InvalidArgumentException('The value must not be an array');
-        }
 
         $existingValueLength = \strlen($v);
         $deleteKeys = str_repeat(WebDriverKeys::BACKSPACE.WebDriverKeys::DELETE, $existingValueLength);

src/DomCrawler/Field/TextareaFormField.php

@@ -22,7 +22,7 @@ final class TextareaFormField extends BaseTextareaFormField
 {
     use FormFieldTrait;
 
-    public function setValue($value): void
+    public function setValue(?string $value): void
     {
         $this->setTextValue($value);
     }

src/DomCrawler/Form.php

@@ -37,16 +37,9 @@ final class Form extends BaseForm
 {
     use ExceptionThrower;
 
-    /**
-     * @var WebDriverElement
-     */
-    private $button;
-
-    /**
-     * @var WebDriverElement
-     */
-    private $element;
-    private $webDriver;
+    private WebDriverElement $button;
+    private WebDriverElement $element;
+    private WebDriver $webDriver;
 
     public function __construct(WebDriverElement $element, WebDriver $webDriver)
     {