From a57af76a0f05dac6b9dde425d8e9c5fad0c1ad19 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 6 Feb 2017 21:20:39 -0800
Subject: [PATCH] Move LikeMatch to Rdbms namespace

Change-Id: I0cba263cd02fc5c4bfe8f063f38d1b4be28246b0
---
 autoload.php                                  | 2 +-
 includes/LinkFilter.php                       | 1 +
 includes/libs/rdbms/database/Database.php     | 1 +
 includes/libs/rdbms/database/IDatabase.php    | 1 +
 includes/libs/rdbms/encasing/LikeMatch.php    | 3 +++
 tests/phpunit/includes/LinkFilterTest.php     | 2 ++
 tests/phpunit/includes/db/DatabaseSQLTest.php | 2 ++
 7 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/autoload.php b/autoload.php
index 970dff0f9f..4a97e7c195 100644
--- a/autoload.php
+++ b/autoload.php
@@ -727,7 +727,6 @@ $wgAutoloadLocalClasses = [
 	'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 @@ $wgAutoloadLocalClasses = [
 	'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 7b3d72b336..2f5055871a 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 d15d6f1937..17c9fdafb9 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -27,6 +27,7 @@ use Psr\Log\LoggerAwareInterface;
 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 c6055dbdbd..f1613ebc5a 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 b0b3c87984..98812a5a28 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 428b0129a0..ed4958f254 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 656e661690..57754bc214 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.
-- 
2.20.1