Merge "Remove global namespaced LBFactory"

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index b30a568..fb2829b 100644 (file)
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -314,6 +314,8 @@ because of Phabricator reports.
 * $wgSpecialPages no longer accepts array syntax, deprecated since 1.18.
 * The MailAddress constructor can no longer be called with a User object,
   behaviour which has been deprecated since 1.24.
+* LBFactory, deprecated since 1.28, has been removed. Instead, use
+  Wikimedia\Rdbms\LBFactory.
 
 === Deprecations in 1.32 ===
 * HTMLForm::setSubmitProgressive() is deprecated. No need to call it. Submit

diff --git a/autoload.php b/autoload.php
index 67285d0..96a7dc3 100644 (file)
--- a/autoload.php
+++ b/autoload.php
@@ -717,7 +717,6 @@ $wgAutoloadLocalClasses = [
        'JsonContentHandler' => __DIR__ . '/includes/content/JsonContentHandler.php',
        'KkConverter' => __DIR__ . '/languages/classes/LanguageKk.php',
        'KuConverter' => __DIR__ . '/languages/classes/LanguageKu.php',
-       'LBFactory' => __DIR__ . '/includes/libs/rdbms/lbfactory/LBFactory.php',
        'LCStore' => __DIR__ . '/includes/cache/localisation/LCStore.php',
        'LCStoreCDB' => __DIR__ . '/includes/cache/localisation/LCStoreCDB.php',
        'LCStoreDB' => __DIR__ . '/includes/cache/localisation/LCStoreDB.php',

diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php b/includes/libs/rdbms/lbfactory/LBFactory.php
index e736ab9..1612f41 100644 (file)
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -728,8 +728,3 @@ abstract class LBFactory implements ILBFactory {
                $this->destroy();
        }
 }
-
-/**
- * @deprecated since 1.29
- */
-class_alias( LBFactory::class, 'LBFactory' );

diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php
index a0bc038..1616139 100644 (file)
--- a/tests/phpunit/includes/db/LBFactoryTest.php
+++ b/tests/phpunit/includes/db/LBFactoryTest.php
@@ -34,13 +34,14 @@ use Wikimedia\Rdbms\DatabaseDomain;
 
 /**
  * @group Database
+ * @covers \Wikimedia\Rdbms\LBFactory
  * @covers \Wikimedia\Rdbms\LBFactorySimple
  * @covers \Wikimedia\Rdbms\LBFactoryMulti
  */
 class LBFactoryTest extends MediaWikiTestCase {
 
        /**
-        * @covers MWLBFactory::getLBFactoryClass
+        * @covers MWLBFactory::getLBFactoryClass()
         * @dataProvider getLBFactoryClassProvider
         */
        public function testGetLBFactoryClass( $expected, $deprecated ) {
@@ -76,8 +77,8 @@ class LBFactoryTest extends MediaWikiTestCase {
        }
 
        /**
-        * @covers LBFactory::getLocalDomainID()
-        * @covers LBFactory::resolveDomainID()
+        * @covers \Wikimedia\Rdbms\LBFactory::getLocalDomainID()
+        * @covers \Wikimedia\Rdbms\LBFactory::resolveDomainID()
         */
        public function testLBFactorySimpleServer() {
                global $wgDBserver, $wgDBname, $wgDBuser, $wgDBpassword, $wgDBtype, $wgSQLiteDataDir;