Merge "Remove global namespaced LBFactory"

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index 32ef63c..fb2829b 100644 (file)
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -454,8 +454,8 @@ because of Phabricator reports.
   in MediaWiki 1.26, have now been hard deprecated. This affects $wgUseTidy,
   $wgTidyBin, $wgTidyConf, $wgTidyOpts, $wgTidyInternal, and $wgDebugTidy. Use
   $wgTidyConfig instead.
-* All Tidy configurations other than Remex have been deprecated; future parsers
-  will not emit compatible output for these configurations.
+* All Tidy configurations other than Remex have been hard deprecated;
+  future parsers will not emit compatible output for these configurations.
 
 === Other changes in 1.32 ===
 * (T198811) The following tables have had their UNIQUE indexes turned into

diff --git a/includes/CommentStore.php b/includes/CommentStore.php
index bf3e3d6..9969b78 100644 (file)
--- a/includes/CommentStore.php
+++ b/includes/CommentStore.php
@@ -115,8 +115,7 @@ class CommentStore {
         */
        public static function newKey( $key ) {
                global $wgCommentTableSchemaMigrationStage;
-               // TODO uncomment once not used in extensions
-               // wfDeprecated( __METHOD__, '1.31' );
+               wfDeprecated( __METHOD__, '1.31' );
                $store = new CommentStore( MediaWikiServices::getInstance()->getContentLanguage(),
                        $wgCommentTableSchemaMigrationStage );
                $store->key = $key;

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 387e9e3..9602bd2 100644 (file)
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -848,6 +848,7 @@ class DifferenceEngine extends ContextSource {
                                // New revision is unsaved; bail out.
                                // TODO in theory rendering the new revision is a meaningful thing to do
                                // even if it's unsaved, but a lot of untangling is required to do it safely.
+                               return;
                        }
 
                        $out->setRevisionId( $this->mNewid );

diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php
index ec85556..0da8c45 100644 (file)
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@ -981,14 +981,14 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                        'type' => 'float',
                        'label-message' => 'recentchangesdays',
                        'section' => 'rc/displayrc',
-                       'min' => 1,
+                       'min' => 1 / 24,
                        'max' => ceil( $rcMaxAge / ( 3600 * 24 ) ),
                        'help' => $l10n->msg( 'recentchangesdays-max' )->numParams(
                                ceil( $rcMaxAge / ( 3600 * 24 ) ) )->escaped()
                ];
                $defaultPreferences['rclimit'] = [
                        'type' => 'int',
-                       'min' => 0,
+                       'min' => 1,
                        'max' => 1000,
                        'label-message' => 'recentchangescount',
                        'help-message' => 'prefs-help-recentchangescount',

diff --git a/includes/tidy/RaggettBase.php b/includes/tidy/RaggettBase.php
index ed91735..878099f 100644 (file)
--- a/includes/tidy/RaggettBase.php
+++ b/includes/tidy/RaggettBase.php
@@ -8,6 +8,14 @@ use MWException;
  * @deprecated since 1.32, use RemexDriver
  */
 abstract class RaggettBase extends TidyDriverBase {
+
+       function __construct( $config ) {
+               parent::__construct( $config );
+
+               // All tidy modes other than remex are deprecated.
+               wfDeprecated( __METHOD__, '1.32' );
+       }
+
        /**
         * Generic interface for wrapping and unwrapping HTML for Dave Raggett's tidy.
         *

diff --git a/tests/phpunit/includes/ActorMigrationTest.php b/tests/phpunit/includes/ActorMigrationTest.php
index d28be7a..c938750 100644 (file)
--- a/tests/phpunit/includes/ActorMigrationTest.php
+++ b/tests/phpunit/includes/ActorMigrationTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\User\UserIdentity;
+use MediaWiki\MediaWikiServices;
 use Wikimedia\TestingAccessWrapper;
 
 /**
@@ -635,8 +636,8 @@ class ActorMigrationTest extends MediaWikiLangTestCase {
                $userIdentity->method( 'getName' )->willReturn( $user->getName() );
                $userIdentity->method( 'getActorId' )->willReturn( 0 );
 
-               list( $cFields, $cCallback ) = CommentStore::newKey( 'rev_comment' )
-                       ->insertWithTempTable( $this->db, '' );
+               list( $cFields, $cCallback ) = MediaWikiServices::getInstance()->getCommentStore()
+                       ->insertWithTempTable( $this->db, 'rev_comment', '' );
                $m = $this->makeMigration( MIGRATION_WRITE_BOTH );
                list( $fields, $callback ) =
                        $m->getInsertValuesWithTempTable( $this->db, 'rev_user', $userIdentity );

diff --git a/tests/phpunit/includes/CommentStoreTest.php b/tests/phpunit/includes/CommentStoreTest.php
index f9b592e..0c5d8e3 100644 (file)
--- a/tests/phpunit/includes/CommentStoreTest.php
+++ b/tests/phpunit/includes/CommentStoreTest.php
@@ -35,6 +35,7 @@ class CommentStoreTest extends MediaWikiLangTestCase {
         * @return CommentStore
         */
        protected function makeStoreWithKey( $stage, $key ) {
+               $this->hideDeprecated( 'CommentStore::newKey' );
                $store = CommentStore::newKey( $key );
                TestingAccessWrapper::newFromObject( $store )->stage = $stage;
                return $store;
@@ -774,6 +775,7 @@ class CommentStoreTest extends MediaWikiLangTestCase {
        }
 
        public function testNewKey() {
+               $this->hideDeprecated( 'CommentStore::newKey' );
                $this->assertInstanceOf( CommentStore::class, CommentStore::newKey( 'dummy' ) );
        }