Fix a bunch of call-time pass-by-reference errors

Change-Id: I3bd8e7c4d2dca465957a353cb7dc2a906699ff6a

diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index 9af9604..1306ae6 100644 (file)
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -138,7 +138,7 @@ class BackupDumper extends Maintenance {
                        require_once $file;
                }
                $register = array( $class, 'register' );
-               call_user_func_array( $register, array( &$this ) );
+               call_user_func_array( $register, array( $this ) );
        }
 
        function execute() {

diff --git a/maintenance/cleanupTitles.php b/maintenance/cleanupTitles.php
index 574d5bd..1277e83 100644 (file)
--- a/maintenance/cleanupTitles.php
+++ b/maintenance/cleanupTitles.php
@@ -90,7 +90,7 @@ class TitleCleanup extends TableCleanup {
        protected function moveIllegalPage( $row ) {
                $legal = 'A-Za-z0-9_/\\\\-';
                $legalized = preg_replace_callback( "!([^$legal])!",
-                       array( &$this, 'hexChar' ),
+                       array( $this, 'hexChar' ),
                        $row->page_title );
                if ( $legalized == '.' ) {
                        $legalized = '(dot)';

diff --git a/maintenance/dumpIterator.php b/maintenance/dumpIterator.php
index eef535a..0f39513 100644 (file)
--- a/maintenance/dumpIterator.php
+++ b/maintenance/dumpIterator.php
@@ -76,7 +76,7 @@ abstract class DumpIterator extends Maintenance {
                $importer = new WikiImporter( $source, $this->getConfig() );
 
                $importer->setRevisionCallback(
-                       array( &$this, 'handleRevision' ) );
+                       array( $this, 'handleRevision' ) );
 
                $this->from = $this->getOption( 'from', null );
                $this->count = 0;

diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php
index 8169ef5..12ccd0e 100644 (file)
--- a/maintenance/dumpTextPass.php
+++ b/maintenance/dumpTextPass.php
@@ -426,10 +426,10 @@ TEXT
 
                xml_set_element_handler(
                        $parser,
-                       array( &$this, 'startElement' ),
-                       array( &$this, 'endElement' )
+                       array( $this, 'startElement' ),
+                       array( $this, 'endElement' )
                );
-               xml_set_character_data_handler( $parser, array( &$this, 'characterData' ) );
+               xml_set_character_data_handler( $parser, array( $this, 'characterData' ) );
 
                $offset = 0; // for context extraction on error reporting
                do {

diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index 7c452a6..3bf8b27 100644 (file)
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -297,13 +297,13 @@ TEXT
                                return false;
                        }
                }
-               $importer->setPageCallback( array( &$this, 'reportPage' ) );
+               $importer->setPageCallback( array( $this, 'reportPage' ) );
                $this->importCallback = $importer->setRevisionCallback(
-                       array( &$this, 'handleRevision' ) );
+                       array( $this, 'handleRevision' ) );
                $this->uploadCallback = $importer->setUploadCallback(
-                       array( &$this, 'handleUpload' ) );
+                       array( $this, 'handleUpload' ) );
                $this->logItemCallback = $importer->setLogItemCallback(
-                       array( &$this, 'handleLogItem' ) );
+                       array( $this, 'handleLogItem' ) );
                if ( $this->uploads ) {
                        $importer->setImportUploads( true );
                }

diff --git a/maintenance/renderDump.php b/maintenance/renderDump.php
index 09b1b1c..33d6e50 100644 (file)
--- a/maintenance/renderDump.php
+++ b/maintenance/renderDump.php
@@ -65,7 +65,7 @@ class DumpRenderer extends Maintenance {
                $importer = new WikiImporter( $source, $this->getConfig() );
 
                $importer->setRevisionCallback(
-                       array( &$this, 'handleRevision' ) );
+                       array( $this, 'handleRevision' ) );
 
                $importer->doImport();
 

diff --git a/maintenance/storage/checkStorage.php b/maintenance/storage/checkStorage.php
index c0f6c7b..95e3ca7 100644 (file)
--- a/maintenance/storage/checkStorage.php
+++ b/maintenance/storage/checkStorage.php
@@ -471,7 +471,7 @@ class CheckStorage {
                        $source,
                        ConfigFactory::getDefaultInstance()->makeConfig( 'main' )
                );
-               $importer->setRevisionCallback( array( &$this, 'importRevision' ) );
+               $importer->setRevisionCallback( array( $this, 'importRevision' ) );
                $importer->doImport();
        }