Move DatabaseDomain to Rdbms namespace

Change-Id: Ifb06e792a36b5123ec3596933d0d394711ee5d08

diff --git a/autoload.php b/autoload.php
index 4a97e7c..ec32f31 100644 (file)
--- a/autoload.php
+++ b/autoload.php
@@ -324,7 +324,6 @@ $wgAutoloadLocalClasses = [
        'DataUpdate' => __DIR__ . '/includes/deferred/DataUpdate.php',
        'Database' => __DIR__ . '/includes/libs/rdbms/database/Database.php',
        'DatabaseBase' => __DIR__ . '/includes/libs/rdbms/database/Database.php',
        'DataUpdate' => __DIR__ . '/includes/deferred/DataUpdate.php',
        'Database' => __DIR__ . '/includes/libs/rdbms/database/Database.php',
        'DatabaseBase' => __DIR__ . '/includes/libs/rdbms/database/Database.php',

-       'DatabaseDomain' => __DIR__ . '/includes/libs/rdbms/database/DatabaseDomain.php',

        'DatabaseInstaller' => __DIR__ . '/includes/installer/DatabaseInstaller.php',
        'DatabaseLag' => __DIR__ . '/maintenance/lag.php',
        'DatabaseLogEntry' => __DIR__ . '/includes/logging/LogEntry.php',
        'DatabaseInstaller' => __DIR__ . '/includes/installer/DatabaseInstaller.php',
        'DatabaseLag' => __DIR__ . '/maintenance/lag.php',
        'DatabaseLogEntry' => __DIR__ . '/includes/logging/LogEntry.php',


@@ -1586,6 +1585,7 @@ $wgAutoloadLocalClasses = [
        'WikiTextStructure' => __DIR__ . '/includes/content/WikiTextStructure.php',
        'Wikimedia\\Rdbms\\ChronologyProtector' => __DIR__ . '/includes/libs/rdbms/ChronologyProtector.php',
        'Wikimedia\\Rdbms\\ConnectionManager' => __DIR__ . '/includes/libs/rdbms/connectionmanager/ConnectionManager.php',
        'WikiTextStructure' => __DIR__ . '/includes/content/WikiTextStructure.php',
        'Wikimedia\\Rdbms\\ChronologyProtector' => __DIR__ . '/includes/libs/rdbms/ChronologyProtector.php',
        'Wikimedia\\Rdbms\\ConnectionManager' => __DIR__ . '/includes/libs/rdbms/connectionmanager/ConnectionManager.php',

+       'Wikimedia\\Rdbms\\DatabaseDomain' => __DIR__ . '/includes/libs/rdbms/database/DatabaseDomain.php',

        'Wikimedia\\Rdbms\\ILBFactory' => __DIR__ . '/includes/libs/rdbms/lbfactory/ILBFactory.php',
        'Wikimedia\\Rdbms\\ILoadMonitor' => __DIR__ . '/includes/libs/rdbms/loadmonitor/ILoadMonitor.php',
        'Wikimedia\\Rdbms\\LBFactory' => __DIR__ . '/includes/libs/rdbms/lbfactory/LBFactory.php',
        'Wikimedia\\Rdbms\\ILBFactory' => __DIR__ . '/includes/libs/rdbms/lbfactory/ILBFactory.php',
        'Wikimedia\\Rdbms\\ILoadMonitor' => __DIR__ . '/includes/libs/rdbms/loadmonitor/ILoadMonitor.php',
        'Wikimedia\\Rdbms\\LBFactory' => __DIR__ . '/includes/libs/rdbms/lbfactory/LBFactory.php',

diff --git a/includes/db/MWLBFactory.php b/includes/db/MWLBFactory.php
index b215acd..09d8fab 100644 (file)
--- a/includes/db/MWLBFactory.php
+++ b/includes/db/MWLBFactory.php
@@ -23,6 +23,7 @@
 
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;

+use Wikimedia\Rdbms\DatabaseDomain;

 
 /**
  * MediaWiki-specific class for generating database load balancers
 
 /**
  * MediaWiki-specific class for generating database load balancers

diff --git a/includes/libs/rdbms/database/DBConnRef.php b/includes/libs/rdbms/database/DBConnRef.php
index b268b9f..bd5cdb5 100644 (file)
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.php
@@ -1,4 +1,7 @@
 <?php
 <?php

+
+use Wikimedia\Rdbms\DatabaseDomain;
+

 /**
  * Helper class to handle automatically marking connections as reusable (via RAII pattern)
  * as well handling deferring the actual network connection until the handle is used
 /**
  * Helper class to handle automatically marking connections as reusable (via RAII pattern)
  * as well handling deferring the actual network connection until the handle is used

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 17c9fda..72e39b7 100644 (file)
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -28,6 +28,7 @@ use Psr\Log\LoggerInterface;
 use Wikimedia\ScopedCallback;
 use Wikimedia\Rdbms\TransactionProfiler;
 use Wikimedia\Rdbms\LikeMatch;
 use Wikimedia\ScopedCallback;
 use Wikimedia\Rdbms\TransactionProfiler;
 use Wikimedia\Rdbms\LikeMatch;

+use Wikimedia\Rdbms\DatabaseDomain;

 
 /**
  * Relational database abstraction object
 
 /**
  * Relational database abstraction object

diff --git a/includes/libs/rdbms/database/DatabaseDomain.php b/includes/libs/rdbms/database/DatabaseDomain.php
index a3ae6f1..ef6600b 100644 (file)
--- a/includes/libs/rdbms/database/DatabaseDomain.php
+++ b/includes/libs/rdbms/database/DatabaseDomain.php
@@ -18,6 +18,9 @@
  * @file
  * @ingroup Database
  */
  * @file
  * @ingroup Database
  */

+namespace Wikimedia\Rdbms;
+
+use InvalidArgumentException;

 
 /**
  * Class to handle database/prefix specification for IDatabase domains
 
 /**
  * Class to handle database/prefix specification for IDatabase domains

diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php b/includes/libs/rdbms/lbfactory/LBFactory.php
index 7a2ad3f..982b286 100644 (file)
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -28,7 +28,6 @@ use Wikimedia\ScopedCallback;
 use BagOStuff;
 use EmptyBagOStuff;
 use WANObjectCache;
 use BagOStuff;
 use EmptyBagOStuff;
 use WANObjectCache;

-use DatabaseDomain;

 use Exception;
 use RuntimeException;
 use ILoadBalancer;
 use Exception;
 use RuntimeException;
 use ILoadBalancer;

diff --git a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
index 643b110..bb6e445 100644 (file)
--- a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
+++ b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
@@ -25,7 +25,6 @@ namespace Wikimedia\Rdbms;
 
 use LoadBalancer;
 use IDatabase;
 
 use LoadBalancer;
 use IDatabase;

-use DatabaseDomain;

 use InvalidArgumentException;
 
 /**
 use InvalidArgumentException;
 
 /**

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index baac3d0..101f330 100644 (file)
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -25,6 +25,7 @@ use Psr\Log\NullLogger;
 use Wikimedia\ScopedCallback;
 use Wikimedia\Rdbms\TransactionProfiler;
 use Wikimedia\Rdbms\ILoadMonitor;
 use Wikimedia\ScopedCallback;
 use Wikimedia\Rdbms\TransactionProfiler;
 use Wikimedia\Rdbms\ILoadMonitor;

+use Wikimedia\Rdbms\DatabaseDomain;

 
 /**
  * Database connection, tracking, load balancing, and transaction manager for a cluster
 
 /**
  * Database connection, tracking, load balancing, and transaction manager for a cluster

diff --git a/tests/phpunit/includes/db/DatabaseMysqlBaseTest.php b/tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
index 3b69590..1524b78 100644 (file)
--- a/tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
+++ b/tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
@@ -26,6 +26,7 @@
  */
 
 use Wikimedia\Rdbms\TransactionProfiler;
  */
 
 use Wikimedia\Rdbms\TransactionProfiler;

+use Wikimedia\Rdbms\DatabaseDomain;

 
 /**
  * Fake class around abstract class so we can call concrete methods.
 
 /**
  * Fake class around abstract class so we can call concrete methods.

diff --git a/tests/phpunit/includes/db/DatabaseTestHelper.php b/tests/phpunit/includes/db/DatabaseTestHelper.php
index d689d50..ce05e33 100644 (file)
--- a/tests/phpunit/includes/db/DatabaseTestHelper.php
+++ b/tests/phpunit/includes/db/DatabaseTestHelper.php
@@ -1,6 +1,7 @@
 <?php
 
 use Wikimedia\Rdbms\TransactionProfiler;
 <?php
 
 use Wikimedia\Rdbms\TransactionProfiler;

+use Wikimedia\Rdbms\DatabaseDomain;

 
 /**
  * Helper for testing the methods from the Database class
 
 /**
  * Helper for testing the methods from the Database class

diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php
index d13fbf9..3dc7e28 100644 (file)
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php
@@ -1,7 +1,9 @@
 <?php
 
 <?php
 

+use Wikimedia\Rdbms\DatabaseDomain;
+

 /**
 /**

- * @covers DatabaseDomain
+ * @covers Wikimedia\Rdbms\DatabaseDomain

  */
 class DatabaseDomainTest extends PHPUnit_Framework_TestCase {
        public static function provideConstruct() {
  */
 class DatabaseDomainTest extends PHPUnit_Framework_TestCase {
        public static function provideConstruct() {