Merge pull request phalcon#11667 from sergeyklay/2.1.x

Improved Random::number

config.json

@@ -15,6 +15,9 @@
     "optimizer-dirs": [
         "optimizers"
     ],
+    "prototype-dir": {
+        "php7": "prototypes/php7"
+    },
     "constants-sources": [
         "ext/phalcon/mvc/model/query/scanner.h",
         "ext/phalcon/annotations/scanner.h",

phalcon/security/random.zep

@@ -311,8 +311,13 @@ class Random
 			throw new Exception("Require a positive integer > 0");
 		}
 
+		if function_exists("random_int") {
+			return random_int(0, len);
+		}
+
 		if function_exists("\\Sodium\\randombytes_uniform") {
-			return \\Sodium\\randombytes_uniform(len);
+			// \Sodium\randombytes_uniform will return a random integer between 0 and len - 1
+			return \\Sodium\\randombytes_uniform(len) + 1;
 		}
 
 		let hex = dechex(len);

prototypes/php7/php7.php

@@ -0,0 +1,12 @@
+<?php
+/**
+ * PHP 7 prototypes
+ */
+
+if (!function_exists('random_bytes')) {
+    function random_bytes($length) {}
+}
+
+if (!function_exists('random_int')) {
+    function random_int($min, $max) {}
+}