Merge branch hotfix/v2.6.22

Author: roadiz-ci

.github/workflows/run-test.yml

@@ -19,7 +19,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.1', '8.2', '8.3']
+                php-version: ['8.3', '8.4']
         steps:
             - uses: shivammathur/setup-php@v2
               with:
@@ -35,7 +35,5 @@ jobs:
                       ${{ runner.os }}-php-${{ matrix.php-version }}-
             - name: Install Dependencies
               run: composer install --no-scripts --no-ansi --no-interaction --no-progress
-            - name: Run PHP Code Sniffer
-              run: vendor/bin/phpcs --extensions=php --warning-severity=0 --standard=PSR12 -p ./src
             - name: Run PHPStan
               run: vendor/bin/phpstan analyse --no-progress -c phpstan.neon

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2024 Ambroise Maupate
+Copyright © 2025 Ambroise Maupate
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

Makefile

@@ -12,13 +12,13 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
+        "php": ">=8.3",
         "psr/log": ">=1.1",
         "ext-openssl": "*"
     },
     "require-dev": {
         "phpstan/phpstan": "^1.5.3",
-        "squizlabs/php_codesniffer": "^3.5"
+        "phpstan/phpdoc-parser": "<2"
     },
     "autoload": {
         "psr-4": {
@@ -27,8 +27,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.3.x-dev",
-            "dev-develop": "2.4.x-dev"
+            "dev-main": "2.6.x-dev",
+            "dev-develop": "2.7.x-dev"
         }
     }
 }

composer.json

@@ -11,21 +11,19 @@ class PasswordGenerator extends RandomGenerator implements PasswordGeneratorInte
      * one uppercase letter, one digit, and one special character. The remaining characters
      * in the password are chosen at random from those four sets.
      *
-     * The available characters in each set are user friendly - there are no ambiguous
+     * The available characters in each set are user-friendly - there are no ambiguous
      * characters such as i, l, 1, o, 0, etc.
      *
-     * @param int $length
-     * @return string
-     *
      * @see https://gist.github.com/tylerhall/521810
      */
-    public function generatePassword(int $length = 12)
+    #[\Override]
+    public function generatePassword(int $length = 16): string
     {
         $sets = [];
         $sets[] = 'abcdefghjkmnpqrstuvwxyz';
         $sets[] = 'ABCDEFGHJKMNPQRSTUVWXYZ';
         $sets[] = '23456789';
-        $sets[] = '!@#$%&*?';
+        $sets[] = '!@#$%&*?-';
 
         $all = '';
         $password = '';
@@ -35,12 +33,10 @@ public function generatePassword(int $length = 12)
         }
 
         $all = \mb_str_split($all);
-        for ($i = 0; $i < $length - count($sets); $i++) {
+        for ($i = 0; $i < $length - count($sets); ++$i) {
             $password .= $all[array_rand($all)];
         }
 
-        $password = str_shuffle($password);
-
-        return $password;
+        return str_shuffle($password);
     }
 }

phpcs.xml.dist

@@ -6,9 +6,5 @@
 
 interface PasswordGeneratorInterface
 {
-    /**
-     * @param int $length
-     * @return string
-     */
-    public function generatePassword(int $length = 12);
+    public function generatePassword(int $length = 16): string;
 }

src/PasswordGenerator.php

@@ -8,47 +8,22 @@
 
 class RandomGenerator
 {
-    protected ?LoggerInterface $logger;
-    protected bool $useOpenSsl;
-
-    /**
-     * @param LoggerInterface|null $logger
-     */
-    public function __construct(LoggerInterface $logger = null)
+    public function __construct(protected readonly LoggerInterface $logger)
     {
-        $this->logger = $logger;
-        // determine whether to use OpenSSL
-        if (defined('PHP_WINDOWS_VERSION_BUILD') && version_compare(PHP_VERSION, '5.3.4', '<')) {
-            $this->useOpenSsl = false;
-        } elseif (!function_exists('openssl_random_pseudo_bytes')) {
-            if (null !== $this->logger) {
-                $this->logger->notice('It is recommended that you enable the "openssl" extension for random number generation.');
-            }
-            $this->useOpenSsl = false;
-        } else {
-            $this->useOpenSsl = true;
+        if (!function_exists('openssl_random_pseudo_bytes')) {
+            throw new \RuntimeException('You must enable the "openssl" extension for secure random number generation.');
         }
     }
 
-    /**
-     * @param int $nbBytes
-     * @return string
-     */
     public function getRandomNumber(int $nbBytes = 32): string
     {
         // try OpenSSL
-        if ($this->useOpenSsl) {
-            $bytes = \openssl_random_pseudo_bytes($nbBytes, $strong);
-
-            if (false !== $bytes && true === $strong) {
-                return $bytes;
-            }
+        $bytes = \openssl_random_pseudo_bytes($nbBytes, $strong);
 
-            if (null !== $this->logger) {
-                $this->logger->info('OpenSSL did not produce a secure random number.');
-            }
+        if (false !== $bytes && true === $strong) {
+            return $bytes;
         }
 
-        return hash('sha256', uniqid((string) mt_rand(), true), true);
+        throw new \RuntimeException('Unable to generate a secure random number.');
     }
 }

src/PasswordGeneratorInterface.php

@@ -6,10 +6,8 @@
 
 class SaltGenerator extends RandomGenerator implements SaltGeneratorInterface
 {
-    /**
-     * @return string
-     */
-    public function generateSalt()
+    #[\Override]
+    public function generateSalt(): string
     {
         return strtr(base64_encode($this->getRandomNumber(24)), '{}', '-_');
     }

src/RandomGenerator.php

@@ -6,8 +6,5 @@
 
 interface SaltGeneratorInterface
 {
-    /**
-     * @return string
-     */
-    public function generateSalt();
+    public function generateSalt(): string;
 }