X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FMaintenance.php;h=04aa3a5e0352ff3ca454fba28384b6fa16c6c87c;hb=7f67c5566d37549e0297caa6c78b6de5dc2eaa6e;hp=a8dbd5f28061e6a54ad72442efb51cda6605a9e2;hpb=b3efe0ca7d05ce6551b82e63de46b2dc44c1f4af;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index a8dbd5f280..04aa3a5e03 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -20,12 +20,10 @@
  * @defgroup Maintenance Maintenance
  */
 
-// Make sure we're on PHP5.3.3 or better
-if ( !function_exists( 'version_compare' ) || version_compare( PHP_VERSION, '5.3.3' ) < 0 ) {
-	// We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+
-	require_once dirname( __FILE__ ) . '/../includes/PHPVersionError.php';
-	wfPHPVersionError( 'cli' );
-}
+// Bail on old versions of PHP, or if composer has not been run yet to install
+// dependencies. Using dirname( __FILE__ ) here because __DIR__ is PHP5.3+.
+require_once dirname( __FILE__ ) . '/../includes/PHPVersionCheck.php';
+wfEntryPointCheck( 'cli' );
 
 /**
  * @defgroup MaintenanceArchive Maintenance archives
@@ -603,13 +601,19 @@ abstract class Maintenance {
 	 * Activate the profiler (assuming $wgProfiler is set)
 	 */
 	protected function activateProfiler() {
-		global $wgProfiler;
+		global $wgProfiler, $wgProfileLimit, $wgTrxProfilerLimits;
 
 		$output = $this->getOption( 'profiler' );
-		if ( $output && is_array( $wgProfiler ) && isset( $wgProfiler['class'] ) ) {
+		if ( !$output ) {
+			return;
+		}
+
+		if ( is_array( $wgProfiler ) && isset( $wgProfiler['class'] ) ) {
 			$class = $wgProfiler['class'];
 			$profiler = new $class(
-				array( 'sampling' => 1, 'output' => $output ) + $wgProfiler
+				array( 'sampling' => 1, 'output' => array( $output ) )
+					+ $wgProfiler
+					+ array( 'threshold' => $wgProfileLimit )
 			);
 			$profiler->setTemplated( true );
 			Profiler::replaceStubInstance( $profiler );
@@ -617,8 +621,7 @@ abstract class Maintenance {
 
 		$trxProfiler = Profiler::instance()->getTransactionProfiler();
 		$trxProfiler->setLogger( LoggerFactory::getInstance( 'DBPerformance' ) );
-		# Catch huge single updates that lead to slave lag
-		$trxProfiler->setExpectation( 'maxAffected', 1000, __METHOD__ );
+		$trxProfiler->setExpectations( $wgTrxProfilerLimits['Maintenance'], __METHOD__ );
 	}
 
 	/**
@@ -954,10 +957,9 @@ abstract class Maintenance {
 
 		$wgShowSQLErrors = true;
 
-		// @codingStandardsIgnoreStart Allow error suppression. wfSuppressWarnings()
-		// is not available.
-		@set_time_limit( 0 );
-		// @codingStandardsIgnoreStart
+		MediaWiki\suppressWarnings();
+		set_time_limit( 0 );
+		MediaWiki\restoreWarnings();
 
 		$this->adjustMemoryLimit();
 	}
@@ -1106,7 +1108,7 @@ abstract class Maintenance {
 	 */
 	private function lockSearchindex( $db ) {
 		$write = array( 'searchindex' );
-		$read = array( 'page', 'revision', 'text', 'interwiki', 'l10n_cache', 'user' );
+		$read = array( 'page', 'revision', 'text', 'interwiki', 'l10n_cache', 'user', 'page_restrictions' );
 		$db->lockTables( $read, $write, __CLASS__ . '::' . __METHOD__ );
 	}