Merge "Stop doing $that = $this in includes/specialpage"

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 564cd2e..bd1e375 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1925,7 +1925,6 @@ abstract class DatabaseBase implements IDatabase {
        /**
         * Get the name of an index in a given table.
         *
-        * @protected Don't use outside of DatabaseBase and childs
         * @param string $index
         * @return string
         */

diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index bb3028d..664484b 100644 (file)
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -429,7 +429,7 @@ class DatabaseSqlite extends Database {
         * @param string $index
         * @return string
         */
-       function indexName( $index ) {
+       protected function indexName( $index ) {
                return $index;
        }
 

diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index 673bb2d..81dc412 100755 (executable)
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -254,14 +254,6 @@ class PHPUnitMaintClass extends Maintenance {
 $maintClass = 'PHPUnitMaintClass';
 require RUN_MAINTENANCE_IF_MAIN;
 
-// Prevent segfault when we have lots of unit tests (bug 62623)
-if ( version_compare( PHP_VERSION, '5.4.0', '<' ) ) {
-       register_shutdown_function( function () {
-               gc_collect_cycles();
-               gc_disable();
-       } );
-}
-
 $ok = false;
 
 if ( class_exists( 'PHPUnit_TextUI_Command' ) ) {