Merge "Remove wfCheckEntropy() as unused and deprecated in 1.27"

diff --combined includes/GlobalFunctions.php
index 7a41f11,1863939..eb174f2
--- 1/includes/GlobalFunctions.php
--- 2/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@@ -2988,22 -2988,6 +2988,6 @@@ function wfBaseConvert( $input, $source
        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
@@@ -3046,6 -3030,12 +3030,6 @@@ function wfResetSessionID() 
  function wfSetupSession( $sessionId = false ) {
        wfDeprecated( __FUNCTION__, '1.27' );
  
 -      // If they're calling this, they probably want our session management even
 -      // if NO_SESSION was set for Setup.php.
 -      if ( !MediaWiki\Session\PHPSessionHandler::isInstalled() ) {
 -              MediaWiki\Session\PHPSessionHandler::install( SessionManager::singleton() );
 -      }
 -
        if ( $sessionId ) {
                session_id( $sessionId );
        }