Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345389 )
Change subject: Move DBConnRef/MaintainableDBConnRef to Rdbms namespace
......................................................................
Move DBConnRef/MaintainableDBConnRef to Rdbms namespace
Change-Id: I7ca6b40f973b2aae83747de92e280ded222c87e3
---
M autoload.php
M includes/libs/rdbms/database/DBConnRef.php
M includes/libs/rdbms/database/MaintainableDBConnRef.php
3 files changed, 11 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/89/345389/1
diff --git a/autoload.php b/autoload.php
index b53c7ae..956d504 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1591,6 +1591,7 @@
'Wikimedia\\Rdbms\\Blob' => __DIR__ .
'/includes/libs/rdbms/encasing/Blob.php',
'Wikimedia\\Rdbms\\ChronologyProtector' => __DIR__ .
'/includes/libs/rdbms/ChronologyProtector.php',
'Wikimedia\\Rdbms\\ConnectionManager' => __DIR__ .
'/includes/libs/rdbms/connectionmanager/ConnectionManager.php',
+ 'Wikimedia\\Rdbms\\DBConnRef' => __DIR__ .
'/includes/libs/rdbms/database/DBConnRef.php',
'Wikimedia\\Rdbms\\DBMasterPos' => __DIR__ .
'/includes/libs/rdbms/database/position/DBMasterPos.php',
'Wikimedia\\Rdbms\\DatabaseDomain' => __DIR__ .
'/includes/libs/rdbms/database/DatabaseDomain.php',
'Wikimedia\\Rdbms\\FakeResultWrapper' => __DIR__ .
'/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php',
@@ -1612,6 +1613,7 @@
'Wikimedia\\Rdbms\\LoadMonitor' => __DIR__ .
'/includes/libs/rdbms/loadmonitor/LoadMonitor.php',
'Wikimedia\\Rdbms\\LoadMonitorMySQL' => __DIR__ .
'/includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php',
'Wikimedia\\Rdbms\\LoadMonitorNull' => __DIR__ .
'/includes/libs/rdbms/loadmonitor/LoadMonitorNull.php',
+ 'Wikimedia\\Rdbms\\MaintainableDBConnRef' => __DIR__ .
'/includes/libs/rdbms/database/MaintainableDBConnRef.php',
'Wikimedia\\Rdbms\\MssqlBlob' => __DIR__ .
'/includes/libs/rdbms/encasing/MssqlBlob.php',
'Wikimedia\\Rdbms\\MssqlField' => __DIR__ .
'/includes/libs/rdbms/field/MssqlField.php',
'Wikimedia\\Rdbms\\MssqlResultWrapper' => __DIR__ .
'/includes/libs/rdbms/database/resultwrapper/MssqlResultWrapper.php',
diff --git a/includes/libs/rdbms/database/DBConnRef.php
b/includes/libs/rdbms/database/DBConnRef.php
index e96fe5b..0d5fbf5 100644
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.php
@@ -1,9 +1,9 @@
<?php
-use Wikimedia\Rdbms\DatabaseDomain;
-use Wikimedia\Rdbms\ILoadBalancer;
-use Wikimedia\Rdbms\DBMasterPos;
-use Wikimedia\Rdbms\IDatabase;
+namespace Wikimedia\Rdbms;
+
+use Database;
+use InvalidArgumentException;
/**
* Helper class to handle automatically marking connections as reusable (via
RAII pattern)
@@ -604,3 +604,5 @@
}
}
}
+
+class_alias( 'Wikimedia\Rdbms\DBConnRef', 'DBConnRef' );
diff --git a/includes/libs/rdbms/database/MaintainableDBConnRef.php
b/includes/libs/rdbms/database/MaintainableDBConnRef.php
index b5ff575..30c62de 100644
--- a/includes/libs/rdbms/database/MaintainableDBConnRef.php
+++ b/includes/libs/rdbms/database/MaintainableDBConnRef.php
@@ -1,6 +1,6 @@
<?php
-use Wikimedia\Rdbms\IMaintainableDatabase;
+namespace Wikimedia\Rdbms;
/**
* Helper class to handle automatically marking connections as reusable (via
RAII pattern)
@@ -69,3 +69,5 @@
return $this->__call( __FUNCTION__, func_get_args() );
}
}
+
+class_alias( 'Wikimedia\Rdbms\MaintainableDBConnRef', 'MaintainableDBConnRef'
);
--
To view, visit https://gerrit.wikimedia.org/r/345389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ca6b40f973b2aae83747de92e280ded222c87e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
