Jeroen De Dauw has submitted this change and it was merged.
Change subject: Consistency fixes for 15361a7ea6232a4493beef87809247c770b1cbf3
......................................................................
Consistency fixes for 15361a7ea6232a4493beef87809247c770b1cbf3
Change-Id: Ifafda600b602eda100ce96ca76b6f5f58b6a0769
---
M src/MySQL/MySqlFieldSqlBuilder.php
R src/SQLite/SQLiteFieldSqlBuilder.php
M src/SQLite/SQLiteTableSqlBuilder.php
R tests/phpunit/SQLite/SQLiteFieldSqlBuilderTest.php
4 files changed, 10 insertions(+), 7 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
diff --git a/src/MySQL/MySqlFieldSqlBuilder.php
b/src/MySQL/MySqlFieldSqlBuilder.php
index c760b32..095ca3f 100644
--- a/src/MySQL/MySqlFieldSqlBuilder.php
+++ b/src/MySQL/MySqlFieldSqlBuilder.php
@@ -2,6 +2,7 @@
namespace Wikibase\Database\MySQL;
+use RuntimeException;
use Wikibase\Database\Escaper;
use Wikibase\Database\Schema\Definitions\FieldDefinition;
use Wikibase\Database\Schema\FieldSqlBuilder;
@@ -18,7 +19,7 @@
/**
* @param Escaper $escaper
*/
- function __construct( $escaper ) {
+ public function __construct( Escaper $escaper ) {
$this->escaper = $escaper;
}
diff --git a/src/SQLite/SQliteFieldSqlBuilder.php
b/src/SQLite/SQLiteFieldSqlBuilder.php
similarity index 90%
rename from src/SQLite/SQliteFieldSqlBuilder.php
rename to src/SQLite/SQLiteFieldSqlBuilder.php
index 53b3e20..13eba45 100644
--- a/src/SQLite/SQliteFieldSqlBuilder.php
+++ b/src/SQLite/SQLiteFieldSqlBuilder.php
@@ -2,6 +2,8 @@
namespace Wikibase\Database\SQLite;
+use RuntimeException;
+use Wikibase\Database\Escaper;
use Wikibase\Database\Schema\Definitions\FieldDefinition;
use Wikibase\Database\Schema\FieldSqlBuilder;
@@ -10,14 +12,14 @@
* @licence GNU GPL v2+
* @author Adam Shorland
*/
-class SQliteFieldSqlBuilder extends FieldSqlBuilder {
+class SQLiteFieldSqlBuilder extends FieldSqlBuilder {
protected $escaper;
/**
* @param Escaper $escaper
*/
- function __construct( $escaper ) {
+ public function __construct( Escaper $escaper ) {
$this->escaper = $escaper;
}
diff --git a/src/SQLite/SQLiteTableSqlBuilder.php
b/src/SQLite/SQLiteTableSqlBuilder.php
index 7b5dca4..c190b1b 100644
--- a/src/SQLite/SQLiteTableSqlBuilder.php
+++ b/src/SQLite/SQLiteTableSqlBuilder.php
@@ -31,7 +31,7 @@
public function __construct( Escaper $fieldValueEscaper,
TableNameFormatter $tableNameFormatter ) {
$this->escaper = $fieldValueEscaper;
$this->tableNameFormatter = $tableNameFormatter;
- $this->fieldSqlBuilder = new SQliteFieldSqlBuilder(
$this->escaper );
+ $this->fieldSqlBuilder = new SQLiteFieldSqlBuilder(
$this->escaper );
}
/**
diff --git a/tests/phpunit/SQLite/SQliteFieldSqlBuilderTest.php
b/tests/phpunit/SQLite/SQLiteFieldSqlBuilderTest.php
similarity index 88%
rename from tests/phpunit/SQLite/SQliteFieldSqlBuilderTest.php
rename to tests/phpunit/SQLite/SQLiteFieldSqlBuilderTest.php
index c9b4d1e..2216998 100644
--- a/tests/phpunit/SQLite/SQliteFieldSqlBuilderTest.php
+++ b/tests/phpunit/SQLite/SQLiteFieldSqlBuilderTest.php
@@ -2,7 +2,7 @@
namespace Wikibase\Database\Tests\MySQL;
use Wikibase\Database\Schema\Definitions\FieldDefinition;
-use Wikibase\Database\SQLite\SQliteFieldSqlBuilder;
+use Wikibase\Database\SQLite\SQLiteFieldSqlBuilder;
/**
* @covers Wikibase\Database\SQLite\SQLiteFieldSqlBuilder
@@ -14,7 +14,7 @@
* @licence GNU GPL v2+
* @author Adam Shorland
*/
-class SQliteFieldSqlBuilderTest extends \PHPUnit_Framework_TestCase {
+class SQLiteFieldSqlBuilderTest extends \PHPUnit_Framework_TestCase {
private function newInstance() {
$mockEscaper = $this->getMock( 'Wikibase\Database\Escaper' );
@@ -22,7 +22,7 @@
->method( 'getEscapedValue' )
->will( $this->returnArgument(0) );
- return new SQliteFieldSqlBuilder( $mockEscaper );
+ return new SQLiteFieldSqlBuilder( $mockEscaper );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/86882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifafda600b602eda100ce96ca76b6f5f58b6a0769
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikibaseDatabase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
