Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/189492
Change subject: Move connection manager to Lib
......................................................................
Move connection manager to Lib
Change-Id: I94d3e9a8cc0efb6742c7e755c3fc9cee989a2a9f
---
M client/includes/Usage/Sql/SqlSubscriptionManager.php
M client/includes/Usage/Sql/SqlUsageTracker.php
M client/includes/store/sql/DirectSqlStore.php
M client/tests/phpunit/includes/Usage/Sql/SqlSubscriptionManagerTest.php
M client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php
R lib/includes/store/sql/ConnectionManager.php
R lib/tests/phpunit/store/ConnectionManagerTest.php
7 files changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/92/189492/1
diff --git a/client/includes/Usage/Sql/SqlSubscriptionManager.php
b/client/includes/Usage/Sql/SqlSubscriptionManager.php
index 2d3bb1a..ddc3608 100644
--- a/client/includes/Usage/Sql/SqlSubscriptionManager.php
+++ b/client/includes/Usage/Sql/SqlSubscriptionManager.php
@@ -7,7 +7,7 @@
use Exception;
use InvalidArgumentException;
use ResultWrapper;
-use Wikibase\Client\Store\Sql\ConnectionManager;
+use Wikibase\Store\Sql\ConnectionManager;
use Wikibase\Client\Usage\SubscriptionManager;
use Wikibase\Client\Usage\UsageTrackerException;
use Wikibase\DataModel\Entity\EntityId;
@@ -23,7 +23,7 @@
class SqlSubscriptionManager implements SubscriptionManager {
/**
- * @var ConnectionManager
+ * @var \Wikibase\Store\Sql\ConnectionManager
*/
private $connectionManager;
diff --git a/client/includes/Usage/Sql/SqlUsageTracker.php
b/client/includes/Usage/Sql/SqlUsageTracker.php
index 829c5ae..f29672d 100644
--- a/client/includes/Usage/Sql/SqlUsageTracker.php
+++ b/client/includes/Usage/Sql/SqlUsageTracker.php
@@ -8,7 +8,7 @@
use Exception;
use InvalidArgumentException;
use Iterator;
-use Wikibase\Client\Store\Sql\ConnectionManager;
+use Wikibase\Store\Sql\ConnectionManager;
use Wikibase\Client\Usage\EntityUsage;
use Wikibase\Client\Usage\PageEntityUsages;
use Wikibase\Client\Usage\UsageLookup;
@@ -31,7 +31,7 @@
private $idParser;
/**
- * @var ConnectionManager
+ * @var \Wikibase\Store\Sql\ConnectionManager
*/
private $connectionManager;
diff --git a/client/includes/store/sql/DirectSqlStore.php
b/client/includes/store/sql/DirectSqlStore.php
index c8dbeb0..00b2a91 100644
--- a/client/includes/store/sql/DirectSqlStore.php
+++ b/client/includes/store/sql/DirectSqlStore.php
@@ -5,7 +5,7 @@
use HashBagOStuff;
use LoadBalancer;
use ObjectCache;
-use Wikibase\Client\Store\Sql\ConnectionManager;
+use Wikibase\Store\Sql\ConnectionManager;
use Wikibase\Client\Store\Sql\PagePropsEntityIdLookup;
use Wikibase\Client\Store\TitleFactory;
use Wikibase\Client\Usage\NullSubscriptionManager;
diff --git
a/client/tests/phpunit/includes/Usage/Sql/SqlSubscriptionManagerTest.php
b/client/tests/phpunit/includes/Usage/Sql/SqlSubscriptionManagerTest.php
index e93415c..b8361e4 100644
--- a/client/tests/phpunit/includes/Usage/Sql/SqlSubscriptionManagerTest.php
+++ b/client/tests/phpunit/includes/Usage/Sql/SqlSubscriptionManagerTest.php
@@ -2,7 +2,7 @@
namespace Wikibase\Client\Tests\Usage\Sql;
-use Wikibase\Client\Store\Sql\ConnectionManager;
+use Wikibase\Store\Sql\ConnectionManager;
use Wikibase\Client\Usage\Sql\SqlSubscriptionManager;
use Wikibase\Client\WikibaseClient;
use Wikibase\DataModel\Entity\ItemId;
diff --git a/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php
b/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php
index 3cfccf7..0bcc68b 100644
--- a/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php
+++ b/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php
@@ -2,7 +2,7 @@
namespace Wikibase\Client\Tests\Usage\Sql;
-use Wikibase\Client\Store\Sql\ConnectionManager;
+use Wikibase\Store\Sql\ConnectionManager;
use Wikibase\Client\Tests\Usage\UsageLookupContractTester;
use Wikibase\Client\Tests\Usage\UsageTrackerContractTester;
use Wikibase\Client\Usage\Sql\SqlUsageTracker;
@@ -48,7 +48,7 @@
$this->sqlUsageTracker = new SqlUsageTracker(
new BasicEntityIdParser(),
- new ConnectionManager( wfGetLB() )
+ new \Wikibase\Store\Sql\ConnectionManager( wfGetLB() )
);
$this->trackerTester = new UsageTrackerContractTester(
$this->sqlUsageTracker );
diff --git a/client/includes/store/sql/ConnectionManager.php
b/lib/includes/store/sql/ConnectionManager.php
similarity index 98%
rename from client/includes/store/sql/ConnectionManager.php
rename to lib/includes/store/sql/ConnectionManager.php
index f1426e3..a88342b 100644
--- a/client/includes/store/sql/ConnectionManager.php
+++ b/lib/includes/store/sql/ConnectionManager.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Client\Store\Sql;
+namespace Wikibase\Store\Sql;
use DatabaseBase;
use IDatabase;
diff --git a/client/tests/phpunit/includes/store/sql/ConnectionManagerTest.php
b/lib/tests/phpunit/store/ConnectionManagerTest.php
similarity index 88%
rename from client/tests/phpunit/includes/store/sql/ConnectionManagerTest.php
rename to lib/tests/phpunit/store/ConnectionManagerTest.php
index 434632f..d61eaad 100644
--- a/client/tests/phpunit/includes/store/sql/ConnectionManagerTest.php
+++ b/lib/tests/phpunit/store/ConnectionManagerTest.php
@@ -1,8 +1,8 @@
<?php
-namespace Wikibase\Client\Tests\Store\Sql;
+namespace Wikibase\Tests\Store\Sql;
-use Wikibase\Client\Store\Sql\ConnectionManager;
+use Wikibase\Store\Sql\ConnectionManager;
/**
* @covers Wikibase\Client\Store\Sql\ConnectionManager
@@ -41,7 +41,7 @@
->with( DB_SLAVE )
->will( $this->returnValue( $connection ) );
- $manager = new ConnectionManager( $lb );
+ $manager = new \Wikibase\Store\Sql\ConnectionManager( $lb );
$actual = $manager->getReadConnection();
$this->assertSame( $connection, $actual );
@@ -56,7 +56,7 @@
->with( DB_MASTER )
->will( $this->returnValue( $connection ) );
- $manager = new ConnectionManager( $lb );
+ $manager = new \Wikibase\Store\Sql\ConnectionManager( $lb );
$manager->forceMaster();
$manager->getReadConnection();
}
@@ -70,7 +70,7 @@
->with( $connection )
->will( $this->returnValue( null ) );
- $manager = new ConnectionManager( $lb );
+ $manager = new \Wikibase\Store\Sql\ConnectionManager( $lb );
$manager->releaseConnection( $connection );
}
@@ -108,7 +108,7 @@
->method( 'endAtomic' )
->will( $this->returnValue( null ) );
- $manager = new ConnectionManager( $lb );
+ $manager = new \Wikibase\Store\Sql\ConnectionManager( $lb );
$manager->commitAtomicSection( $connection, 'TEST' );
}
@@ -125,7 +125,7 @@
->method( 'rollback' )
->will( $this->returnValue( null ) );
- $manager = new ConnectionManager( $lb );
+ $manager = new \Wikibase\Store\Sql\ConnectionManager( $lb );
$manager->rollbackAtomicSection( $connection, 'TEST' );
}
--
To view, visit https://gerrit.wikimedia.org/r/189492
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94d3e9a8cc0efb6742c7e755c3fc9cee989a2a9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
