From: Nikita Popov Date: Mon, 28 Jan 2019 11:24:20 +0000 (+0100) Subject: Remove deprecated gmp_random() function X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=734c305a822581c27ca3608cba482385dc247cf0;p=php Remove deprecated gmp_random() function Deprecated in PHP 7.2 as part of https://wiki.php.net/rfc/deprecations_php_7_2. --- diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index 3c92735cf6..e920879dbb 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -99,10 +99,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_prob_prime, 0, 0, 1) ZEND_ARG_INFO(0, reps) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_random, 0, 0, 0) - ZEND_ARG_INFO(0, limiter) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_random_seed, 0, 0, 1) ZEND_ARG_INFO(0, seed) ZEND_END_ARG_INFO() @@ -175,7 +171,6 @@ static const zend_function_entry gmp_functions[] = { ZEND_FE(gmp_kronecker, arginfo_gmp_binary) ZEND_FE(gmp_cmp, arginfo_gmp_binary) ZEND_FE(gmp_sign, arginfo_gmp_unary) - ZEND_DEP_FE(gmp_random, arginfo_gmp_random) ZEND_FE(gmp_random_seed, arginfo_gmp_random_seed) ZEND_FE(gmp_random_bits, arginfo_gmp_random_bits) ZEND_FE(gmp_random_range, arginfo_gmp_random_range) @@ -1882,28 +1877,6 @@ static void gmp_init_random(void) } } -/* {{{ proto GMP gmp_random([int limiter]) - Gets random number */ -ZEND_FUNCTION(gmp_random) -{ - zend_long limiter = 20; - mpz_ptr gmpnum_result; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &limiter) == FAILURE) { - return; - } - - INIT_GMP_RETVAL(gmpnum_result); - gmp_init_random(); - -#ifdef GMP_LIMB_BITS - mpz_urandomb(gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS); -#else - mpz_urandomb(gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB); -#endif -} -/* }}} */ - /* {{{ proto GMP gmp_random_seed(mixed seed) Seed the RNG */ ZEND_FUNCTION(gmp_random_seed) diff --git a/ext/gmp/tests/gmp_random.phpt b/ext/gmp/tests/gmp_random.phpt deleted file mode 100644 index ab2b11b3f7..0000000000 --- a/ext/gmp/tests/gmp_random.phpt +++ /dev/null @@ -1,60 +0,0 @@ ---TEST-- -gmp_random() basic tests ---SKIPIF-- - ---FILE-- - ---EXPECTF-- -Deprecated: Function gmp_random() is deprecated in %s on line %d -string(%d) "%d" - -Deprecated: Function gmp_random() is deprecated in %s on line %d -string(%d) "%d" - -Deprecated: Function gmp_random() is deprecated in %s on line %d -string(1) "%d" - -Deprecated: Function gmp_random() is deprecated in %s on line %d -string(%d) "%d" - -Deprecated: Function gmp_random() is deprecated in %s on line %d -string(%d) "%d" - -Deprecated: Function gmp_random() is deprecated in %s on line %d -string(%d) "%d" - -Deprecated: Function gmp_random() is deprecated in %s on line %d - -Warning: gmp_random() expects parameter 1 to be int, array given in %s on line %d -NULL - -Deprecated: Function gmp_random() is deprecated in %s on line %d - -Warning: gmp_random() expects at most 1 parameter, 2 given in %s on line %d -NULL - -Deprecated: Function gmp_random() is deprecated in %s on line %d - -Warning: gmp_random() expects parameter 1 to be int, string given in %s on line %d -NULL - -Deprecated: Function gmp_random() is deprecated in %s on line %d - -Warning: gmp_random() expects parameter 1 to be int, string given in %s on line %d -NULL -Done diff --git a/ext/gmp/tests/gmp_random_seed.phpt b/ext/gmp/tests/gmp_random_seed.phpt index e143a5153e..80f49ee32c 100644 --- a/ext/gmp/tests/gmp_random_seed.phpt +++ b/ext/gmp/tests/gmp_random_seed.phpt @@ -3,18 +3,12 @@ gmp_random_seed() basic tests --SKIPIF-- ---INI-- -error_reporting=E_ALL&~E_DEPRECATED --FILE-- --EXPECTF-- NULL -string(386) "16100871751340485642888774479422205950971474538471317276388238970713821926852258806210387669237144400278914671533438653274777493140545293541785377162348524402063489947660558889561219968642920852870483050552936324125257259316643328803697665037881088889859735075814746314563786538493931260996669892959501637800179548654075887300734264333417283208357503038004080669367070111848040502362219" -string(18) "255344473360201232" -string(192) "566276705882089203328999735915155615747289398229935944715725865523491463654289449864817867794422824157675456435165973986660058784111212531276312901205233176071526587181942240113004108328736022" -string(3) "766" -string(31) "1251852006013618829761115383588" -string(301) "2904442664575028522451529381233481137998826790384445089758175726247096826023839957531211794198483328480161675791738894500687706952157332727908305084432443942315866545175274665372161864357698401817740956147940095302549920711069038378541222669595494627580205085300332122174778540693048337420608925104417" -string(4) "5969" -string(5) "-4126" -string(4) "-926" +string(3) "107" +string(30) "576055025228722307492589900056" +string(301) "5075491613651149525976453192895895253653438900772590630831858908690082668789318258254821002217677675804439098856210618572534955562143303188483908287009522532300439665975877709754914215718998849272363858786685187951932478210775857465448084868199807983919191214972626993925394176279001074206804955195464" +string(4) "4098" +string(3) "866" +string(5) "-4602" NULL -string(386) "16100871751340485642888774479422205950971474538471317276388238970713821926852258806210387669237144400278914671533438653274777493140545293541785377162348524402063489947660558889561219968642920852870483050552936324125257259316643328803697665037881088889859735075814746314563786538493931260996669892959501637800179548654075887300734264333417283208357503038004080669367070111848040502362219" -string(18) "255344473360201232" -string(192) "566276705882089203328999735915155615747289398229935944715725865523491463654289449864817867794422824157675456435165973986660058784111212531276312901205233176071526587181942240113004108328736022" -string(3) "766" -string(31) "1251852006013618829761115383588" -string(301) "2904442664575028522451529381233481137998826790384445089758175726247096826023839957531211794198483328480161675791738894500687706952157332727908305084432443942315866545175274665372161864357698401817740956147940095302549920711069038378541222669595494627580205085300332122174778540693048337420608925104417" -string(4) "5969" -string(5) "-4126" -string(4) "-926" +string(3) "107" +string(30) "576055025228722307492589900056" +string(301) "5075491613651149525976453192895895253653438900772590630831858908690082668789318258254821002217677675804439098856210618572534955562143303188483908287009522532300439665975877709754914215718998849272363858786685187951932478210775857465448084868199807983919191214972626993925394176279001074206804955195464" +string(4) "4098" +string(3) "866" +string(5) "-4602" NULL -string(386) "13477111096113160882601567427091178332669645276785709413953468738199940626922635042144840457533224221336117027441609364710893482124071124759231943384805378201041406842697962243732316555316214869988749798708139879922380266366387589101775891621221881149417841139463207495993669582399783202126977651864760442797681787747348653884279195479310922110107643437514016795836672871442926389274400" -string(20) "15370156633245019617" -string(192) "294354325919119835375781661354719128667828860233586416953977190644006896604022494655398295674227944872858213051595447565156112646032890737200590095517623075051828676500990477704073251304424133" -string(3) "683" -string(31) "1105092118036828878542238774672" -string(301) "2700084798786584694260166508009114488318099110808331607090845844712329387915039325877090587052399841255219556028410036280510827424748532204766771994624650610348058361519239518625728955462297681525123214377383395734875500143425080808436274385326255154393544373636015993206705180032889399161843788895374" -string(4) "7268" -string(5) "-3518" -string(5) "-8432" +string(3) "800" +string(30) "136797365759249926716355081555" +string(300) "983682312243221532860194306859606025979259367996304596374614332718375645173854152266611727577102182844028492473112400528817154210713755887896949560718745264129216953815968005630126359941634684721501777057142617647654380585317016323758806063124938232519551123440573348326061244006512869165793958775168" +string(4) "1029" +string(4) "7093" +string(5) "-9074" NULL -string(386) "13477111096113160882601567427091178332669645276785709413953468738199940626922635042144840457533224221336117027441609364710893482124071124759231943384805378201041406842697962243732316555316214869988749798708139879922380266366387589101775891621221881149417841139463207495993669582399783202126977651864760442797681787747348653884279195479310922110107643437514016795836672871442926389274400" -string(20) "15370156633245019617" -string(192) "294354325919119835375781661354719128667828860233586416953977190644006896604022494655398295674227944872858213051595447565156112646032890737200590095517623075051828676500990477704073251304424133" -string(3) "683" -string(31) "1105092118036828878542238774672" -string(301) "2700084798786584694260166508009114488318099110808331607090845844712329387915039325877090587052399841255219556028410036280510827424748532204766771994624650610348058361519239518625728955462297681525123214377383395734875500143425080808436274385326255154393544373636015993206705180032889399161843788895374" -string(4) "7268" -string(5) "-3518" -string(5) "-8432" +string(3) "800" +string(30) "136797365759249926716355081555" +string(300) "983682312243221532860194306859606025979259367996304596374614332718375645173854152266611727577102182844028492473112400528817154210713755887896949560718745264129216953815968005630126359941634684721501777057142617647654380585317016323758806063124938232519551123440573348326061244006512869165793958775168" +string(4) "1029" +string(4) "7093" +string(5) "-9074" NULL -string(386) "13477111096113160882601567427091178332669645276785709413953468738199940626922635042144840457533224221336117027441609364710893482124071124759231943384805378201041406842697962243732316555316214869988749798708139879922380266366387589101775891621221881149417841139463207495993669582399783202126977651864760442797681787747348653884279195479310922110107643437514016795836672871442926389274400" -string(20) "15370156633245019617" -string(192) "294354325919119835375781661354719128667828860233586416953977190644006896604022494655398295674227944872858213051595447565156112646032890737200590095517623075051828676500990477704073251304424133" -string(3) "683" -string(31) "1105092118036828878542238774672" -string(301) "2700084798786584694260166508009114488318099110808331607090845844712329387915039325877090587052399841255219556028410036280510827424748532204766771994624650610348058361519239518625728955462297681525123214377383395734875500143425080808436274385326255154393544373636015993206705180032889399161843788895374" -string(4) "7268" -string(5) "-3518" -string(5) "-8432" +string(3) "800" +string(30) "136797365759249926716355081555" +string(300) "983682312243221532860194306859606025979259367996304596374614332718375645173854152266611727577102182844028492473112400528817154210713755887896949560718745264129216953815968005630126359941634684721501777057142617647654380585317016323758806063124938232519551123440573348326061244006512869165793958775168" +string(4) "1029" +string(4) "7093" +string(5) "-9074" NULL -string(386) "13477111096113160882601567427091178332669645276785709413953468738199940626922635042144840457533224221336117027441609364710893482124071124759231943384805378201041406842697962243732316555316214869988749798708139879922380266366387589101775891621221881149417841139463207495993669582399783202126977651864760442797681787747348653884279195479310922110107643437514016795836672871442926389274400" -string(20) "15370156633245019617" -string(192) "294354325919119835375781661354719128667828860233586416953977190644006896604022494655398295674227944872858213051595447565156112646032890737200590095517623075051828676500990477704073251304424133" -string(3) "683" -string(31) "1105092118036828878542238774672" -string(301) "2700084798786584694260166508009114488318099110808331607090845844712329387915039325877090587052399841255219556028410036280510827424748532204766771994624650610348058361519239518625728955462297681525123214377383395734875500143425080808436274385326255154393544373636015993206705180032889399161843788895374" -string(4) "7268" -string(5) "-3518" -string(5) "-8432" +string(3) "800" +string(30) "136797365759249926716355081555" +string(300) "983682312243221532860194306859606025979259367996304596374614332718375645173854152266611727577102182844028492473112400528817154210713755887896949560718745264129216953815968005630126359941634684721501777057142617647654380585317016323758806063124938232519551123440573348326061244006512869165793958775168" +string(4) "1029" +string(4) "7093" +string(5) "-9074" NULL -string(386) "17517289823903393220742578279919954815229524740463730368402128237511862318453381595675765692750750649609755422480004471234960388086555321894591036872550129477305413674775698107868844953599169316550102271816620108199930104365341610775602960735862041722613145476720452800951958891882288668416542937408952006310656170195090436314902430700708511047189929836145291647101130135292078875631354" -string(19) "1662391866670215057" -string(193) "1951928859951518261564127834731454911658112769477733872890285741065126442731035642243573666695893929882207432512593006044657806021743917753379619843420559355572830613932424235592411658293328273" -string(3) "888" -string(30) "136524289584478309125073026188" -string(301) "4487372666528061674404740793683112894444118579769413902123304803304884162086348577960502430419080687314731489440882833272125181594897832730214825704339272207090970657364333461383490282984012738008555512699878911293400686609929745464733074891420787002129849587668122219953473716759349853748437799165176" -string(4) "8559" -string(4) "9426" -string(5) "-2932" +string(3) "762" +string(30) "822340340897453415684831711085" +string(301) "7240560133683902061389868703829443708354917824328579773726122219756981024103097560162756171513655189995985599958252688592185764428631571614485572869738344560301294144844739876478557439580966605216861285841689262517286639329902832431755450003123084728943981078635297917573398492558065003906539489023830" +string(4) "9636" +string(5) "-9848" +string(5) "-9648" NULL -string(386) "17517289823903393220742578279919954815229524740463730368402128237511862318453381595675765692750750649609755422480004471234960388086555321894591036872550129477305413674775698107868844953599169316550102271816620108199930104365341610775602960735862041722613145476720452800951958891882288668416542937408952006310656170195090436314902430700708511047189929836145291647101130135292078875631354" -string(19) "1662391866670215057" -string(193) "1951928859951518261564127834731454911658112769477733872890285741065126442731035642243573666695893929882207432512593006044657806021743917753379619843420559355572830613932424235592411658293328273" -string(3) "888" -string(30) "136524289584478309125073026188" -string(301) "4487372666528061674404740793683112894444118579769413902123304803304884162086348577960502430419080687314731489440882833272125181594897832730214825704339272207090970657364333461383490282984012738008555512699878911293400686609929745464733074891420787002129849587668122219953473716759349853748437799165176" -string(4) "8559" -string(4) "9426" -string(5) "-2932" +string(3) "762" +string(30) "822340340897453415684831711085" +string(301) "7240560133683902061389868703829443708354917824328579773726122219756981024103097560162756171513655189995985599958252688592185764428631571614485572869738344560301294144844739876478557439580966605216861285841689262517286639329902832431755450003123084728943981078635297917573398492558065003906539489023830" +string(4) "9636" +string(5) "-9848" +string(5) "-9648" Warning: gmp_random_seed(): Unable to convert variable to GMP - string is not an integer in %s on line %d bool(false)