From: Reedy <reedy@wikimedia.org>
Date: Wed, 10 Feb 2016 21:30:01 +0000 (+0000)
Subject: Remove wfCheckEntropy() as unused and deprecated in 1.27
X-Git-Tag: 1.31.0-rc.0~7864^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=6ad9e97182af88f349163063c7a379fe627fe85a

Remove wfCheckEntropy() as unused and deprecated in 1.27

Change-Id: Ib2eda8c5ab7b124a283b9e0ec934c034d3da864c
---

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 3a83b36ca7..50b5006dbd 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -317,6 +317,7 @@ changes to languages because of Phabricator reports.
   rather than consume everything until the end of the page.
 * New maintenance script resetUserEmail.php allows sysadmins to reset user emails in case
   a user forgot password/account was stolen.
+* wfCheckEntropy() was removed (deprecated in 1.27).
 
 == Compatibility ==
 
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index ac1dd6d049..1863939543 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2988,22 +2988,6 @@ function wfBaseConvert( $input, $sourceBase, $destBase, $pad = 1,
 	return Wikimedia\base_convert( $input, $sourceBase, $destBase, $pad, $lowercase, $engine );
 }
 
-/**
- * Check if there is sufficient entropy in php's built-in session generation
- *
- * @deprecated since 1.27, PHP's session generation isn't used with
- *  MediaWiki\\Session\\SessionManager
- * @return bool True = there is sufficient entropy
- */
-function wfCheckEntropy() {
-	wfDeprecated( __FUNCTION__, '1.27' );
-	return (
-			( wfIsWindows() && version_compare( PHP_VERSION, '5.3.3', '>=' ) )
-			|| ini_get( 'session.entropy_file' )
-		)
-		&& intval( ini_get( 'session.entropy_length' ) ) >= 32;
-}
-
 /**
  * @deprecated since 1.27, PHP's session generation isn't used with
  *  MediaWiki\\Session\\SessionManager