Revert for now

diff --git a/NEWS b/NEWS
index 178909bedf41b723933a9bee3a93c11dcf5668ef..02f2cf4d0870ca3d0b3adb0d886a26aba070aefe 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -101,9 +101,6 @@
 - Improved the performance of unserialize(). (galaxy dot mipt at gmail dot com, 
   Kalle)
 
-- Added PHP_RAND_MAX & PHP_MT_RAND_MAX constants to get the maximum random 
-  range instead of their counterpart functions. (Kalle)
-
 - Removed legacy features:
   . allow_call_time_pass_reference. (Pierrick)
   . define_syslog_variables ini option and its associated function. (Kalle)
@@ -122,7 +119,6 @@
   PDO_mysql. (Johannes)
 
 - Deprecated mysql_list_dbs() (Request #50667). (Andrey)
-- Deprecated getrandmax() & mt_getrandmax() in favour of constants. (Kalle)
 
 - Implemented FR #52555 (Ability to get HTTP response code). (Paul Dragoonis)
 - Implemented FR #51295 (SQLite3::busyTimeout not existing). (Mark)

diff --git a/UPGRADING b/UPGRADING
index 386934891f714f5559c92a9134187a325e12bf3e..a39cd6fb471f16d303b87ac5f908ecea6666f1c5 100755 (executable)
--- a/UPGRADING
+++ b/UPGRADING
@@ -8,7 +8,6 @@ UPGRADE NOTES - PHP X.Y
 4. Changes made to existing methods
 5. Changes made to existing classes
 6. Deprecated
-     a. deprecated functions
 7. Extensions:
      a. moved out to PECL and actively maintained there
      b. no longer maintained
@@ -110,11 +109,6 @@ UPGRADE NOTES - PHP X.Y
 6. Deprecated
 =============
 
-    a. deprecated functions
-
-       - getrandmax()          -- use the PHP_RAND_MAX constant
-       - mt_getrandmax()       -- use the PHP_MT_RAND_MAX constant
-
 ==========
 7. Removed
 ==========
@@ -241,8 +235,6 @@ UPGRADE NOTES - PHP X.Y
 
        - JSON_PRETTY_PRINT
        - JSON_UNESCAPED_SLASHES
-       - PHP_RAND_MAX
-       - PHP_MT_RAND_MAX
 
      g. New classes
 

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index cdff83c9a44a00665fd98f73266e94240616dc01..139a45996a2b33160d3996c76a5123935e94b181 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -33,7 +33,6 @@
 #include "ext/session/php_session.h"
 #include "zend_operators.h"
 #include "ext/standard/php_dns.h"
-#include "ext/standard/php_rand.h"
 #include "ext/standard/php_uuencode.h"
 
 #ifdef PHP_WIN32
@@ -2829,7 +2828,7 @@ const zend_function_entry basic_functions[] = { /* {{{ */
 
        PHP_FE(rand,                                                                                                                    arginfo_rand)
        PHP_FE(srand,                                                                                                                   arginfo_srand)
-       PHP_DEP_FE(getrandmax,                                                                                                  arginfo_getrandmax)
+       PHP_FE(getrandmax,                                                                                                      arginfo_getrandmax)
        PHP_FE(mt_rand,                                                                                                         arginfo_mt_rand)
        PHP_FE(mt_srand,                                                                                                                arginfo_mt_srand)
        PHP_DEP_FE(mt_getrandmax,                                                                                                       arginfo_mt_getrandmax)
@@ -3552,9 +3551,6 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
        REGISTER_MATH_CONSTANT(M_SQRT3);
        REGISTER_DOUBLE_CONSTANT("INF", php_get_inf(), CONST_CS | CONST_PERSISTENT);
        REGISTER_DOUBLE_CONSTANT("NAN", php_get_nan(), CONST_CS | CONST_PERSISTENT);
-       
-       REGISTER_MATH_CONSTANT(PHP_RAND_MAX);
-       REGISTER_MATH_CONSTANT(PHP_MT_RAND_MAX);
 
        REGISTER_LONG_CONSTANT("PHP_ROUND_HALF_UP", PHP_ROUND_HALF_UP, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("PHP_ROUND_HALF_DOWN", PHP_ROUND_HALF_DOWN, CONST_CS | CONST_PERSISTENT);