Merge pull request #133 from gsteel/drop-math

Drop `Laminas\Math` dependency

composer.json

@@ -42,7 +42,6 @@
         "laminas/laminas-filter": "^2.14.0",
         "laminas/laminas-http": "^2.14.2",
         "laminas/laminas-i18n": "^2.15.0",
-        "laminas/laminas-math": "^2.7.1",
         "laminas/laminas-session": "^2.12.1",
         "laminas/laminas-uri": "^2.9.1",
         "phpspec/prophecy-phpunit": "^2.0",
@@ -58,7 +57,6 @@
         "laminas/laminas-filter": "Laminas\\Filter component, required by the Digits validator",
         "laminas/laminas-i18n": "Laminas\\I18n component to allow translation of validation error messages",
         "laminas/laminas-i18n-resources": "Translations of validator messages",
-        "laminas/laminas-math": "Laminas\\Math component, required by the Csrf validator",
         "laminas/laminas-servicemanager": "Laminas\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
         "laminas/laminas-session": "Laminas\\Session component, ^2.8; required by the Csrf validator",
         "laminas/laminas-uri": "Laminas\\Uri component, required by the Uri and Sitemap\\Loc validators",

src/Csrf.php

@@ -2,7 +2,6 @@
 
 namespace Laminas\Validator;
 
-use Laminas\Math\Rand;
 use Laminas\Session\Container as SessionContainer;
 use Laminas\Stdlib\ArrayUtils;
 use Traversable;
@@ -11,6 +10,7 @@
 use function is_array;
 use function is_string;
 use function md5;
+use function random_bytes;
 use function sprintf;
 use function str_replace;
 use function strtolower;
@@ -301,7 +301,7 @@ protected function initCsrfToken()
      */
     protected function generateHash()
     {
-        $token = md5($this->getSalt() . Rand::getBytes(32) . $this->getName());
+        $token = md5($this->getSalt() . random_bytes(32) . $this->getName());
 
         $this->hash = $this->formatHash($token, $this->generateTokenId());
 
@@ -314,7 +314,7 @@ protected function generateHash()
      */
     protected function generateTokenId()
     {
-        return md5(Rand::getBytes(32));
+        return md5(random_bytes(32));
     }
 
     /**