Upgrade framework

vendor/symfony/finder/Comparator/Comparator.php

@@ -12,73 +12,43 @@
 namespace Symfony\Component\Finder\Comparator;
 
 /**
- * Comparator.
- *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Comparator
 {
-    private $target;
-    private $operator = '==';
+    private string $target;
+    private string $operator;
+
+    public function __construct(string $target, string $operator = '==')
+    {
+        if (!\in_array($operator, ['>', '<', '>=', '<=', '==', '!='])) {
+            throw new \InvalidArgumentException(sprintf('Invalid operator "%s".', $operator));
+        }
+
+        $this->target = $target;
+        $this->operator = $operator;
+    }
 
     /**
      * Gets the target value.
-     *
-     * @return string The target value
      */
-    public function getTarget()
+    public function getTarget(): string
     {
         return $this->target;
     }
 
-    /**
-     * Sets the target value.
-     *
-     * @param string $target The target value
-     */
-    public function setTarget($target)
-    {
-        $this->target = $target;
-    }
-
     /**
      * Gets the comparison operator.
-     *
-     * @return string The operator
      */
-    public function getOperator()
+    public function getOperator(): string
     {
         return $this->operator;
     }
 
-    /**
-     * Sets the comparison operator.
-     *
-     * @param string $operator A valid operator
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setOperator($operator)
-    {
-        if (!$operator) {
-            $operator = '==';
-        }
-
-        if (!in_array($operator, array('>', '<', '>=', '<=', '==', '!='))) {
-            throw new \InvalidArgumentException(sprintf('Invalid operator "%s".', $operator));
-        }
-
-        $this->operator = $operator;
-    }
-
     /**
      * Tests against the target.
-     *
-     * @param mixed $test A test value
-     *
-     * @return bool
      */
-    public function test($test)
+    public function test(mixed $test): bool
     {
         switch ($this->operator) {
             case '>':

vendor/symfony/finder/Comparator/DateComparator.php

@@ -19,13 +19,11 @@ namespace Symfony\Component\Finder\Comparator;
 class DateComparator extends Comparator
 {
     /**
-     * Constructor.
-     *
      * @param string $test A comparison string
      *
      * @throws \InvalidArgumentException If the test is not understood
      */
-    public function __construct($test)
+    public function __construct(string $test)
     {
         if (!preg_match('#^\s*(==|!=|[<>]=?|after|since|before|until)?\s*(.+?)\s*$#i', $test, $matches)) {
             throw new \InvalidArgumentException(sprintf('Don\'t understand "%s" as a date test.', $test));
@@ -38,7 +36,7 @@ class DateComparator extends Comparator
             throw new \InvalidArgumentException(sprintf('"%s" is not a valid date.', $matches[2]));
         }
 
-        $operator = isset($matches[1]) ? $matches[1] : '==';
+        $operator = $matches[1] ?? '==';
         if ('since' === $operator || 'after' === $operator) {
             $operator = '>';
         }
@@ -47,7 +45,6 @@ class DateComparator extends Comparator
             $operator = '<';
         }
 
-        $this->setOperator($operator);
-        $this->setTarget($target);
+        parent::__construct($target, $operator);
     }
 }

vendor/symfony/finder/Comparator/NumberComparator.php

@@ -35,16 +35,14 @@ namespace Symfony\Component\Finder\Comparator;
 class NumberComparator extends Comparator
 {
     /**
-     * Constructor.
-     *
      * @param string|int $test A comparison string or an integer
      *
      * @throws \InvalidArgumentException If the test is not understood
      */
-    public function __construct($test)
+    public function __construct(?string $test)
     {
-        if (!preg_match('#^\s*(==|!=|[<>]=?)?\s*([0-9\.]+)\s*([kmg]i?)?\s*$#i', $test, $matches)) {
-            throw new \InvalidArgumentException(sprintf('Don\'t understand "%s" as a number test.', $test));
+        if (null === $test || !preg_match('#^\s*(==|!=|[<>]=?)?\s*([0-9\.]+)\s*([kmg]i?)?\s*$#i', $test, $matches)) {
+            throw new \InvalidArgumentException(sprintf('Don\'t understand "%s" as a number test.', $test ?? 'null'));
         }
 
         $target = $matches[2];
@@ -75,7 +73,6 @@ class NumberComparator extends Comparator
             }
         }
 
-        $this->setTarget($target);
-        $this->setOperator(isset($matches[1]) ? $matches[1] : '==');
+        parent::__construct($target, $matches[1] ?: '==');
     }
 }