PHPStan : upgrade version to 2.1 for php8.4 compatible + upgrading source code #21

Author: rayanlevert

composer.json

@@ -14,7 +14,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^11.0",
-        "phpstan/phpstan": "^1.9",
+        "phpstan/phpstan": "^2.1",
         "squizlabs/php_codesniffer": "^3.7"
     },
         "autoload": {

composer.lock

@@ -31,13 +31,14 @@ class Argument
          * @throws \RayanLevert\Cli\Arguments\ParseException If the parsed value is not of casted type
          */
         set {
+            $this->hasBeenHandled = true;
+
             if ($this->noValue) {
-                $this->value = $this->hasBeenHandled = true;
+                $this->value = true;
 
                 return;
             } elseif ($this->castTo === 'string') {
-                $this->value          = $value;
-                $this->hasBeenHandled = true;
+                $this->value = $value;
 
                 return;
             }
@@ -49,6 +50,8 @@ class Argument
                 }
 
                 $this->value = intval($value);
+
+                return;
             } elseif ($this->castTo === 'double') {
                 if (!is_numeric($value)) {
                     throw new ParseException(
@@ -57,9 +60,11 @@ class Argument
                 }
 
                 $this->value = floatval($value);
+
+                return;
             }
 
-            $this->hasBeenHandled = true;
+            $this->value = $value;
         }
     }
 

src/Arguments/Argument.php

@@ -22,9 +22,28 @@ class ProgressBar
     public const string RIGHT  = "\e[%dC";
     public const string LEFT   = "\e[%dD";
 
-    /** Number of required iterations to add a character */
-    public int $numberOfEachIterations {
-        get => intval(ceil($this->max / $this->numberOfSymbols));
+    public int $max {
+        set {
+            if ($value <= 0) {
+                throw new UnexpectedValueException('The max value must be positive');
+            }
+
+            $this->max = $value;
+        }
+        get => $this->max;
+    }
+
+    public int $numberOfSymbols {
+        set {
+            if ($value <= 0) {
+                throw new UnexpectedValueException('The number of symbols must be positive');
+            }
+
+            $this->numberOfSymbols = $value;
+        }
+        get {
+            return $this->max <= $this->numberOfSymbols ? $this->max : $this->numberOfSymbols;
+        }
     }
 
     /** Current iteration */
@@ -84,29 +103,11 @@ public static function getFormattedTime(float $time): string
      *
      * @throws UnexpectedValueException If `$max` or `$numberOfSymbols` are negative values
      */
-    public function __construct(
-        public int $max {
-            set {
-                if ($value <= 0) {
-                    throw new UnexpectedValueException('The max value must be positive');
-                }
-
-                $this->max = $value;
-            }
-        },
-        public int $numberOfSymbols = 50 {
-            set {
-                if ($value <= 0) {
-                    throw new UnexpectedValueException('The number of symbols must be positive');
-                }
-
-                $this->numberOfSymbols = $value;
-            }
-            get {
-                return $this->max <= $this->numberOfSymbols ? $this->max : $this->numberOfSymbols;
-            }
-        }
-    ) {}
+    public function __construct(int $max, int $numberOfSymbols = 50)
+    {
+        $this->max             = $max;
+        $this->numberOfSymbols = $numberOfSymbols;
+    }
 
     /**
      * Starts the progress bar (or restarts it, if not breaks two lines)
@@ -168,7 +169,7 @@ public function advance(int $toAdvance = 1): void
         } elseif ($this->max === $this->numberOfSymbols) {
             print str_repeat('#', $this->iteration) . str_repeat(' ', $this->max - $this->iteration);
         } else {
-            $actualDiezes = intval(floor($this->iteration / $this->numberOfEachIterations));
+            $actualDiezes = intval(floor($this->iteration / intval(ceil($this->max / $this->numberOfSymbols))));
 
             print str_repeat('#', $actualDiezes) . str_repeat(' ', ($this->numberOfSymbols - $actualDiezes));
         }