Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/336374 )
Change subject: Move LikeMatch to Rdbms namespace
......................................................................
Move LikeMatch to Rdbms namespace
Change-Id: I0cba263cd02fc5c4bfe8f063f38d1b4be28246b0
---
M autoload.php
M includes/LinkFilter.php
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/database/IDatabase.php
M includes/libs/rdbms/encasing/LikeMatch.php
M tests/phpunit/includes/LinkFilterTest.php
M tests/phpunit/includes/db/DatabaseSQLTest.php
7 files changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/74/336374/1
diff --git a/autoload.php b/autoload.php
index 970dff0..4a97e7c 100644
--- a/autoload.php
+++ b/autoload.php
@@ -727,7 +727,6 @@
'LegacyLogFormatter' => __DIR__ . '/includes/logging/LogFormatter.php',
'License' => __DIR__ . '/includes/Licenses.php',
'Licenses' => __DIR__ . '/includes/Licenses.php',
- 'LikeMatch' => __DIR__ . '/includes/libs/rdbms/encasing/LikeMatch.php',
'LinkBatch' => __DIR__ . '/includes/cache/LinkBatch.php',
'LinkCache' => __DIR__ . '/includes/cache/LinkCache.php',
'LinkFilter' => __DIR__ . '/includes/LinkFilter.php',
@@ -1593,6 +1592,7 @@
'Wikimedia\\Rdbms\\LBFactoryMulti' => __DIR__ .
'/includes/libs/rdbms/lbfactory/LBFactoryMulti.php',
'Wikimedia\\Rdbms\\LBFactorySimple' => __DIR__ .
'/includes/libs/rdbms/lbfactory/LBFactorySimple.php',
'Wikimedia\\Rdbms\\LBFactorySingle' => __DIR__ .
'/includes/libs/rdbms/lbfactory/LBFactorySingle.php',
+ 'Wikimedia\\Rdbms\\LikeMatch' => __DIR__ .
'/includes/libs/rdbms/encasing/LikeMatch.php',
'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',
diff --git a/includes/LinkFilter.php b/includes/LinkFilter.php
index 7b3d72b..2f50558 100644
--- a/includes/LinkFilter.php
+++ b/includes/LinkFilter.php
@@ -19,6 +19,7 @@
*
* @file
*/
+use Wikimedia\Rdbms\LikeMatch;
/**
* Some functions to help implement an external link filter for spam control.
diff --git a/includes/libs/rdbms/database/Database.php
b/includes/libs/rdbms/database/Database.php
index d15d6f1..17c9fda 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -27,6 +27,7 @@
use Psr\Log\LoggerInterface;
use Wikimedia\ScopedCallback;
use Wikimedia\Rdbms\TransactionProfiler;
+use Wikimedia\Rdbms\LikeMatch;
/**
* Relational database abstraction object
diff --git a/includes/libs/rdbms/database/IDatabase.php
b/includes/libs/rdbms/database/IDatabase.php
index c6055db..f1613eb 100644
--- a/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -24,6 +24,7 @@
* @ingroup Database
*/
use Wikimedia\ScopedCallback;
+use Wikimedia\Rdbms\LikeMatch;
/**
* Basic database interface for live and lazy-loaded relation database handles
diff --git a/includes/libs/rdbms/encasing/LikeMatch.php
b/includes/libs/rdbms/encasing/LikeMatch.php
index b0b3c87..98812a5 100644
--- a/includes/libs/rdbms/encasing/LikeMatch.php
+++ b/includes/libs/rdbms/encasing/LikeMatch.php
@@ -1,4 +1,7 @@
<?php
+
+namespace Wikimedia\Rdbms;
+
/**
* Used by Database::buildLike() to represent characters that have special
* meaning in SQL LIKE clauses and thus need no escaping. Don't instantiate it
diff --git a/tests/phpunit/includes/LinkFilterTest.php
b/tests/phpunit/includes/LinkFilterTest.php
index 428b012..ed4958f 100644
--- a/tests/phpunit/includes/LinkFilterTest.php
+++ b/tests/phpunit/includes/LinkFilterTest.php
@@ -1,5 +1,7 @@
<?php
+use Wikimedia\Rdbms\LikeMatch;
+
/**
* @group Database
*/
diff --git a/tests/phpunit/includes/db/DatabaseSQLTest.php
b/tests/phpunit/includes/db/DatabaseSQLTest.php
index 656e661..57754bc 100644
--- a/tests/phpunit/includes/db/DatabaseSQLTest.php
+++ b/tests/phpunit/includes/db/DatabaseSQLTest.php
@@ -1,5 +1,7 @@
<?php
+use Wikimedia\Rdbms\LikeMatch;
+
/**
* Test the abstract database layer
* This is a non DBMS depending test.
--
To view, visit https://gerrit.wikimedia.org/r/336374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cba263cd02fc5c4bfe8f063f38d1b4be28246b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
