Localisation updates from https://translatewiki.net.

[lhc/web/wiklou.git] / maintenance / update.php

diff --git a/maintenance/update.php b/maintenance/update.php
old mode 100644 (file)
new mode 100755 (executable)
index 51bbd6f..a51564a
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -1,3 +1,4 @@
+#!/usr/bin/env php
 <?php
 /**
  * Run all updaters.
@@ -47,43 +48,55 @@ class UpdateMediaWiki extends Maintenance {
                $this->addOption( 'doshared', 'Also update shared tables' );
                $this->addOption( 'nopurge', 'Do not purge the objectcache table after updates' );
                $this->addOption( 'noschema', 'Only do the updates that are not done during schema updates' );
-               $this->addOption( 'schema', 'Output SQL to do the schema updates instead of doing them.  Works even when $wgAllowSchemaUpdates is false', false, true );
+               $this->addOption(
+                       'schema',
+                       'Output SQL to do the schema updates instead of doing them. Works '
+                               . 'even when $wgAllowSchemaUpdates is false',
+                       false,
+                       true
+               );
                $this->addOption( 'force', 'Override when $wgAllowSchemaUpdates disables this script' );
        }
 
        function getDbType() {
                /* If we used the class constant PHP4 would give a parser error here */
-               return 2 /* Maintenance::DB_ADMIN */;
+               return 2; /* Maintenance::DB_ADMIN */
        }
 
        function compatChecks() {
-               $test = new PhpXmlBugTester();
-               if ( !$test->ok ) {
+               // Avoid syntax error in PHP4
+               $minimumPcreVersion = constant( 'Installer::MINIMUM_PCRE_VERSION' );
+
+               list( $pcreVersion ) = explode( ' ', PCRE_VERSION, 2 );
+               if ( version_compare( $pcreVersion, $minimumPcreVersion, '<' ) ) {
                        $this->error(
-                               "Your system has a combination of PHP and libxml2 versions which is buggy\n" .
-                               "and can cause hidden data corruption in MediaWiki and other web apps.\n" .
-                               "Upgrade to PHP 5.2.9 or later and libxml2 2.7.3 or later!\n" .
-                               "ABORTING (see http://bugs.php.net/bug.php?id=45996).\n",
+                               "PCRE $minimumPcreVersion or later is required.\n" .
+                               "Your PHP binary is linked with PCRE $pcreVersion.\n\n" .
+                               "More information:\n" .
+                               "https://www.mediawiki.org/wiki/Manual:Errors_and_symptoms/PCRE\n\n" .
+                               "ABORTING.\n",
                                true );
                }
 
-               $test = new PhpRefCallBugTester;
-               $test->execute();
+               $test = new PhpXmlBugTester();
                if ( !$test->ok ) {
-                       $ver = phpversion();
                        $this->error(
-                               "PHP $ver is not compatible with MediaWiki due to a bug involving\n" .
-                               "reference parameters to __call. Upgrade to PHP 5.3.2 or higher, or \n" .
-                               "downgrade to PHP 5.3.0 to fix this.\n" .
-                               "ABORTING (see http://bugs.php.net/bug.php?id=50394 for details)\n",
+                               "Your system has a combination of PHP and libxml2 versions that is buggy\n" .
+                               "and can cause hidden data corruption in MediaWiki and other web apps.\n" .
+                               "Upgrade to libxml2 2.7.3 or later.\n" .
+                               "ABORTING (see https://bugs.php.net/bug.php?id=45996).\n",
                                true );
                }
        }
 
        function execute() {
-               global $wgVersion, $wgTitle, $wgLang, $wgAllowSchemaUpdates;
+               global $wgVersion, $wgLang, $wgAllowSchemaUpdates;
 
-               if ( !$wgAllowSchemaUpdates && !( $this->hasOption( 'force' ) || $this->hasOption( 'schema' ) || $this->hasOption( 'noschema' ) ) ) {
+               if ( !$wgAllowSchemaUpdates
+                       && !( $this->hasOption( 'force' )
+                               || $this->hasOption( 'schema' )
+                               || $this->hasOption( 'noschema' ) )
+               ) {
                        $this->error( "Do not run update.php on this wiki. If you're seeing this you should\n"
                                . "probably ask for some help in performing your schema updates or use\n"
                                . "the --noschema and --schema options to get an SQL file for someone\n"
@@ -104,7 +117,8 @@ class UpdateMediaWiki extends Maintenance {
                }
 
                $wgLang = Language::factory( 'en' );
-               $wgTitle = Title::newFromText( "MediaWiki database updater" );
+
+               define( 'MW_UPDATER', true );
 
                $this->output( "MediaWiki {$wgVersion} Updater\n\n" );
 
@@ -128,7 +142,8 @@ class UpdateMediaWiki extends Maintenance {
                $this->output( "Depending on the size of your database this may take a while!\n" );
 
                if ( !$this->hasOption( 'quick' ) ) {
-                       $this->output( "Abort with control-c in the next five seconds (skip this countdown with --quick) ... " );
+                       $this->output( "Abort with control-c in the next five seconds "
+                               . "(skip this countdown with --quick) ... " );
                        wfCountDown( 5 );
                }
 
@@ -168,8 +183,8 @@ class UpdateMediaWiki extends Maintenance {
                }
                $time2 = new MWTimestamp();
 
-               $this->output( "\nDone.\n" );
-               $this->output( "\nThe job took " . $time2->diff( $time1 )->format( "%i:%S" ) . ".\n" );
+               $timeDiff = $time2->diff( $time1 );
+               $this->output( "\nDone in " . $timeDiff->format( "%i:%S" ) . ".\n" );
        }
 
        function afterFinalSetup() {