Fix PHP RFC: Deprecate implicitly nullable parameter types

minkphp · Apr 30, 2024 · c36a30d · c36a30d
1 parent d8527fd
commit c36a30d
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/src/Element/ElementFinder.php b/src/Element/ElementFinder.php
@@ -33,7 +33,7 @@ class ElementFinder
      */
     private $xpathManipulator;
 
-    public function __construct(DriverInterface $driver, SelectorsHandler $selectorsHandler, Manipulator $xpathManipulator = null)
+    public function __construct(DriverInterface $driver, SelectorsHandler $selectorsHandler, ?Manipulator $xpathManipulator = null)
     {
         $this->driver = $driver;
         $this->selectorsHandler = $selectorsHandler;

diff --git a/src/Exception/DriverException.php b/src/Exception/DriverException.php
@@ -24,7 +24,7 @@ class DriverException extends Exception
      * @param int             $code
      * @param \Throwable|null $previous
      */
-    public function __construct(string $message, int $code = 0, \Throwable $previous = null)
+    public function __construct(string $message, int $code = 0, ?\Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }

diff --git a/src/Exception/ElementHtmlException.php b/src/Exception/ElementHtmlException.php
@@ -36,7 +36,7 @@ class ElementHtmlException extends ExpectationException
      * @param Element                 $element   element
      * @param \Throwable|null         $exception expectation exception
      */
-    public function __construct(string $message, $driver, Element $element, \Throwable $exception = null)
+    public function __construct(string $message, $driver, Element $element, ?\Throwable $exception = null)
     {
         $this->element = $element;
 

diff --git a/src/Exception/ExpectationException.php b/src/Exception/ExpectationException.php
@@ -38,7 +38,7 @@ class ExpectationException extends Exception
      * @param DriverInterface|Session $driver    driver instance (or session for BC)
      * @param \Throwable|null         $exception expectation exception
      */
-    public function __construct(string $message, $driver, \Throwable $exception = null)
+    public function __construct(string $message, $driver, ?\Throwable $exception = null)
     {
         if ($driver instanceof Session) {
             @trigger_error('Passing a Session object to the ExpectationException constructor is deprecated as of Mink 1.7. Pass the driver instead.', E_USER_DEPRECATED);

diff --git a/src/Exception/UnsupportedDriverActionException.php b/src/Exception/UnsupportedDriverActionException.php
@@ -26,7 +26,7 @@ class UnsupportedDriverActionException extends DriverException
      * @param DriverInterface $driver   driver instance
      * @param \Throwable|null $previous previous exception
      */
-    public function __construct(string $template, DriverInterface $driver, \Throwable $previous = null)
+    public function __construct(string $template, DriverInterface $driver, ?\Throwable $previous = null)
     {
         $message = sprintf($template, get_class($driver));
 

diff --git a/src/Session.php b/src/Session.php
@@ -39,7 +39,7 @@ class Session
      */
     private $selectorsHandler;
 
-    public function __construct(DriverInterface $driver, SelectorsHandler $selectorsHandler = null)
+    public function __construct(DriverInterface $driver, ?SelectorsHandler $selectorsHandler = null)
     {
         $this->driver = $driver;
         $this->selectorsHandler = $selectorsHandler ?? new SelectorsHandler();

diff --git a/src/WebAssert.php b/src/WebAssert.php
@@ -426,7 +426,7 @@ public function responseNotMatches(string $regex)
      *
      * @throws ExpectationException
      */
-    public function elementsCount(string $selectorType, $selector, int $count, ElementInterface $container = null)
+    public function elementsCount(string $selectorType, $selector, int $count, ?ElementInterface $container = null)
     {
         $container = $container ?: $this->session->getPage();
         $nodes = $container->findAll($selectorType, $selector);
@@ -452,7 +452,7 @@ public function elementsCount(string $selectorType, $selector, int $count, Eleme
      *
      * @throws ElementNotFoundException
      */
-    public function elementExists(string $selectorType, $selector, ElementInterface $container = null)
+    public function elementExists(string $selectorType, $selector, ?ElementInterface $container = null)
     {
         $container = $container ?: $this->session->getPage();
         $node = $container->find($selectorType, $selector);
@@ -479,7 +479,7 @@ public function elementExists(string $selectorType, $selector, ElementInterface
      *
      * @throws ExpectationException
      */
-    public function elementNotExists(string $selectorType, $selector, ElementInterface $container = null)
+    public function elementNotExists(string $selectorType, $selector, ?ElementInterface $container = null)
     {
         $container = $container ?: $this->session->getPage();
         $node = $container->find($selectorType, $selector);
@@ -722,7 +722,7 @@ public function elementAttributeNotContains(string $selectorType, $selector, str
      *
      * @throws ElementNotFoundException
      */
-    public function fieldExists(string $field, TraversableElement $container = null)
+    public function fieldExists(string $field, ?TraversableElement $container = null)
     {
         $container = $container ?: $this->session->getPage();
         $node = $container->findField($field);
@@ -744,7 +744,7 @@ public function fieldExists(string $field, TraversableElement $container = null)
      *
      * @throws ExpectationException
      */
-    public function fieldNotExists(string $field, TraversableElement $container = null)
+    public function fieldNotExists(string $field, ?TraversableElement $container = null)
     {
         $container = $container ?: $this->session->getPage();
         $node = $container->findField($field);
@@ -763,7 +763,7 @@ public function fieldNotExists(string $field, TraversableElement $container = nu
      *
      * @throws ExpectationException
      */
-    public function fieldValueEquals(string $field, string $value, TraversableElement $container = null)
+    public function fieldValueEquals(string $field, string $value, ?TraversableElement $container = null)
     {
         $node = $this->fieldExists($field, $container);
 
@@ -792,7 +792,7 @@ public function fieldValueEquals(string $field, string $value, TraversableElemen
      *
      * @throws ExpectationException
      */
-    public function fieldValueNotEquals(string $field, string $value, TraversableElement $container = null)
+    public function fieldValueNotEquals(string $field, string $value, ?TraversableElement $container = null)
     {
         $node = $this->fieldExists($field, $container);
         $actual = $node->getValue();
@@ -819,7 +819,7 @@ public function fieldValueNotEquals(string $field, string $value, TraversableEle
      *
      * @throws ExpectationException
      */
-    public function checkboxChecked(string $field, TraversableElement $container = null)
+    public function checkboxChecked(string $field, ?TraversableElement $container = null)
     {
         $node = $this->fieldExists($field, $container);
 
@@ -836,7 +836,7 @@ public function checkboxChecked(string $field, TraversableElement $container = n
      *
      * @throws ExpectationException
      */
-    public function checkboxNotChecked(string $field, TraversableElement $container = null)
+    public function checkboxNotChecked(string $field, ?TraversableElement $container = null)
     {
         $node = $this->fieldExists($field, $container);