Merge pull request #81 from Hi-Folks/feat/update-php84

update PHP 8.4 + rector
Hi-Folks · Nov 21, 2024 · 163ce29 · 163ce29
2 parents 3d4b978 + cb76aa4
commit 163ce29
Show file tree

Hide file tree

Showing 33 changed files with 205 additions and 359 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -54,7 +54,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest, windows-latest]
-                php-versions: [ '8.2', '8.1', '8.0']
+                php-versions: [ '8.4', '8.3', '8.2', '8.1', '8.0']
                 dependency-stability: [ prefer-stable ]
 
         name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}

diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         }
     ],
     "require": {
-        "php": "^8.0|^8.1|^8.2|^8.3"
+        "php": "^8.0|^8.1|^8.2|^8.3|^8.4"
     },
     "require-dev": {
         "phpstan/phpstan": "^1.9",

diff --git a/examples/DistributionChar.php b/examples/DistributionChar.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "./vendor/autoload.php";
+require_once __DIR__ . "/vendor/autoload.php";
 
 use HiFolks\RandoPhp\Randomize;
 $count = 10000;
@@ -9,7 +9,7 @@
 
 for ($i = 0; $i < $count; $i++) {
     $item = Randomize::char()->alphanumeric()->generate();
-    $results[$item] = (key_exists($item, $results)) ? $results[$item] + 1 : 0;
+    $results[$item] = (array_key_exists($item, $results)) ? $results[$item] + 1 : 0;
 }
 ksort($results);
 print_r($results);
diff --git a/examples/RandomBoolean.php b/examples/RandomBoolean.php
@@ -1,5 +1,5 @@
 <?php
-require_once "./vendor/autoload.php";
+require_once __DIR__ . "/vendor/autoload.php";
 
 use HiFolks\RandoPhp\Randomize;
 

diff --git a/examples/RandomChar.php b/examples/RandomChar.php
@@ -1,5 +1,5 @@
 <?php
-require_once "./vendor/autoload.php";
+require_once __DIR__ . "/vendor/autoload.php";
 
 use HiFolks\RandoPhp\Randomize;
 echo "--- GENERATING A LOWER CASE CHAR (a-z)" . PHP_EOL;

diff --git a/examples/RandomChars.php b/examples/RandomChars.php
@@ -1,14 +1,14 @@
 <?php
-require_once "./vendor/autoload.php";
+require_once __DIR__ . "/vendor/autoload.php";
 
 use HiFolks\RandoPhp\Randomize;
 
-function printLn($str)
+function printLn(string $str): void
 {
     echo $str . PHP_EOL;
 }
 
-function insertBreak($char, $duplicates = 15)
+function insertBreak($char, $duplicates = 15): void
 {
     echo str_repeat($char, $duplicates) . PHP_EOL;
 }

diff --git a/examples/RandomDate.php b/examples/RandomDate.php
@@ -1,5 +1,5 @@
 <?php
-require_once "./vendor/autoload.php";
+require_once __DIR__ . "/vendor/autoload.php";
 
 use HiFolks\RandoPhp\Randomize;
 

diff --git a/examples/RandomInteger.php b/examples/RandomInteger.php
@@ -1,5 +1,5 @@
 <?php
-require_once "./vendor/autoload.php";
+require_once __DIR__ . "/vendor/autoload.php";
 
 use HiFolks\RandoPhp\Randomize;
 

diff --git a/examples/RandomSequenceChar.php b/examples/RandomSequenceChar.php
@@ -1,14 +1,14 @@
 <?php
-require_once "./vendor/autoload.php";
+require_once __DIR__ . "/vendor/autoload.php";
 
 use HiFolks\RandoPhp\Randomize;
 
-function printLn($str)
+function printLn(string $str): void
 {
   echo $str . PHP_EOL;
 }
 
-function insertBreak($char, $duplicates = 15)
+function insertBreak($char, $duplicates = 15): void
 {
   echo str_repeat($char, $duplicates) . PHP_EOL;
 }

diff --git a/examples/RandomSequenceInteger.php b/examples/RandomSequenceInteger.php
@@ -1,14 +1,14 @@
 <?php
-require_once "./vendor/autoload.php";
+require_once __DIR__ . "/vendor/autoload.php";
 
 use HiFolks\RandoPhp\Randomize;
 
-function printLn($str)
+function printLn(string $str): void
 {
     echo $str . PHP_EOL;
 }
 
-function insertBreak($char, $duplicates = 15)
+function insertBreak($char, $duplicates = 15): void
 {
     echo str_repeat($char, $duplicates) . PHP_EOL;
 }

diff --git a/examples/basic.php b/examples/basic.php
@@ -1,5 +1,5 @@
 <?php
-require_once "./vendor/autoload.php";
+require_once __DIR__ . "/vendor/autoload.php";
 
 use HiFolks\RandoPhp\Draw;
 use HiFolks\RandoPhp\Randomize;

diff --git a/rector.php b/rector.php
@@ -15,10 +15,10 @@
         php80: true,
     )
     ->withPreparedSets(
-        //deadCode: true,
-        //codeQuality: true,
-        //earlyReturn: true,
-        //typeDeclarations: true,
-        //privatization: true,
-        // naming: true
+        deadCode: true,
+        codeQuality: true,
+        earlyReturn: true,
+        typeDeclarations: true,
+        privatization: true,
+        naming: true
     );
diff --git a/src/Draw.php b/src/Draw.php
@@ -8,9 +8,8 @@ class Draw
 {
     /**
      * @param  array<int|string> $array
-     * @return Sample
      */
-    public static function sample($array = [])
+    public static function sample($array = []): \HiFolks\RandoPhp\Models\Sample
     {
         return new Sample($array);
     }

diff --git a/src/Models/Boolean.php b/src/Models/Boolean.php
@@ -5,7 +5,6 @@
 class Boolean
 {
     /**
-     * @return bool
      * @throws \Exception
      */
     public function generate(): bool

diff --git a/src/Models/Byte.php b/src/Models/Byte.php
@@ -4,14 +4,10 @@
 
 class Byte
 {
-    /**
-     * @var int
-     */
-    private $length = 8;
+    private int $length = 8;
 
 
     /**
-     * @param  int $length
      * @return $this
      */
     public function length(int $length): self
@@ -21,7 +17,6 @@ public function length(int $length): self
     }
 
     /**
-     * @return string
      * @throws \Exception
      */
     public function generate(): string