From 45de3c80571242ac9da620da3ddeebfb257ca790 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 4 Nov 2013 11:02:48 +0100
Subject: [PATCH] Remove underscore from CdbReader_[DBA|PHP] classes and
 related file

Also gets rid of some CodeSniffer errors. There are more cases in core
(cache, pool counter, installer, database, load balancer, diff, CSS
Janus, less (argh!), media, parser, revdel, ...), that have class names
with underscores I'd be trying to get rid of later.

Change-Id: I33709c05e597978a5574a445fa43c583cbd7e12b
---
 includes/AutoLoader.php                    | 10 +++++-----
 includes/utils/Cdb.php                     | 14 +++++++-------
 includes/utils/{Cdb_PHP.php => CdbPHP.php} |  4 ++--
 tests/phpunit/includes/utils/CdbTest.php   | 12 ++++++------
 4 files changed, 20 insertions(+), 20 deletions(-)
 rename includes/utils/{Cdb_PHP.php => CdbPHP.php} (99%)

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index dc977fe4c1..f79fdc9243 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -1044,13 +1044,13 @@ $wgAutoloadLocalClasses = array(
 
 	# includes/utils
 	'ArrayUtils' => 'includes/utils/ArrayUtils.php',
-	'CdbFunctions' => 'includes/utils/Cdb_PHP.php',
+	'CdbFunctions' => 'includes/utils/CdbPHP.php',
 	'CdbReader' => 'includes/utils/Cdb.php',
-	'CdbReader_DBA' => 'includes/utils/Cdb.php',
-	'CdbReader_PHP' => 'includes/utils/Cdb_PHP.php',
+	'CdbReaderDBA' => 'includes/utils/Cdb.php',
+	'CdbReaderPHP' => 'includes/utils/CdbPHP.php',
 	'CdbWriter' => 'includes/utils/Cdb.php',
-	'CdbWriter_DBA' => 'includes/utils/Cdb.php',
-	'CdbWriter_PHP' => 'includes/utils/Cdb_PHP.php',
+	'CdbWriterDBA' => 'includes/utils/Cdb.php',
+	'CdbWriterPHP' => 'includes/utils/CdbPHP.php',
 	'ConfEditor' => 'includes/utils/ConfEditor.php',
 	'ConfEditorParseError' => 'includes/utils/ConfEditor.php',
 	'ConfEditorToken' => 'includes/utils/ConfEditor.php',
diff --git a/includes/utils/Cdb.php b/includes/utils/Cdb.php
index 996b7af520..c6de088182 100644
--- a/includes/utils/Cdb.php
+++ b/includes/utils/Cdb.php
@@ -35,11 +35,11 @@ abstract class CdbReader {
 	 */
 	public static function open( $fileName ) {
 		if ( self::haveExtension() ) {
-			return new CdbReader_DBA( $fileName );
+			return new CdbReaderDBA( $fileName );
 		} else {
 			wfDebug( "Warning: no dba extension found, using emulation.\n" );
 
-			return new CdbReader_PHP( $fileName );
+			return new CdbReaderPHP( $fileName );
 		}
 	}
 
@@ -89,15 +89,15 @@ abstract class CdbWriter {
 	 *
 	 * @param $fileName string
 	 *
-	 * @return CdbWriter_DBA|CdbWriter_PHP
+	 * @return CdbWriterDBA|CdbWriterPHP
 	 */
 	public static function open( $fileName ) {
 		if ( CdbReader::haveExtension() ) {
-			return new CdbWriter_DBA( $fileName );
+			return new CdbWriterDBA( $fileName );
 		} else {
 			wfDebug( "Warning: no dba extension found, using emulation.\n" );
 
-			return new CdbWriter_PHP( $fileName );
+			return new CdbWriterPHP( $fileName );
 		}
 	}
 
@@ -125,7 +125,7 @@ abstract class CdbWriter {
 /**
  * Reader class which uses the DBA extension
  */
-class CdbReader_DBA {
+class CdbReaderDBA {
 	var $handle;
 
 	function __construct( $fileName ) {
@@ -150,7 +150,7 @@ class CdbReader_DBA {
 /**
  * Writer class which uses the DBA extension
  */
-class CdbWriter_DBA {
+class CdbWriterDBA {
 	var $handle, $realFileName, $tmpFileName;
 
 	function __construct( $fileName ) {
diff --git a/includes/utils/Cdb_PHP.php b/includes/utils/CdbPHP.php
similarity index 99%
rename from includes/utils/Cdb_PHP.php
rename to includes/utils/CdbPHP.php
index 8c10b53a05..f14921d6b6 100644
--- a/includes/utils/Cdb_PHP.php
+++ b/includes/utils/CdbPHP.php
@@ -98,7 +98,7 @@ class CdbFunctions {
 /**
  * CDB reader class
  */
-class CdbReader_PHP extends CdbReader {
+class CdbReaderPHP extends CdbReader {
 	/** The filename */
 	var $fileName;
 
@@ -289,7 +289,7 @@ class CdbReader_PHP extends CdbReader {
 /**
  * CDB writer class
  */
-class CdbWriter_PHP extends CdbWriter {
+class CdbWriterPHP extends CdbWriter {
 	var $handle, $realFileName, $tmpFileName;
 
 	var $hplist;
diff --git a/tests/phpunit/includes/utils/CdbTest.php b/tests/phpunit/includes/utils/CdbTest.php
index 4832ada657..487ee1fc82 100644
--- a/tests/phpunit/includes/utils/CdbTest.php
+++ b/tests/phpunit/includes/utils/CdbTest.php
@@ -2,8 +2,8 @@
 
 /**
  * Test the CDB reader/writer
- * @covers CdbWriter_PHP
- * @covers CdbWriter_DBA
+ * @covers CdbWriterPHP
+ * @covers CdbWriterDBA
  */
 class CdbTest extends MediaWikiTestCase {
 
@@ -26,8 +26,8 @@ class CdbTest extends MediaWikiTestCase {
 		$phpcdbfile = $this->getNewTempFile();
 		$dbacdbfile = $this->getNewTempFile();
 
-		$w1 = new CdbWriter_PHP( $phpcdbfile );
-		$w2 = new CdbWriter_DBA( $dbacdbfile );
+		$w1 = new CdbWriterPHP( $phpcdbfile );
+		$w2 = new CdbWriterDBA( $dbacdbfile );
 
 		$data = array();
 		for ( $i = 0; $i < 1000; $i++ ) {
@@ -50,8 +50,8 @@ class CdbTest extends MediaWikiTestCase {
 			'same hash'
 		);
 
-		$r1 = new CdbReader_PHP( $phpcdbfile );
-		$r2 = new CdbReader_DBA( $dbacdbfile );
+		$r1 = new CdbReaderPHP( $phpcdbfile );
+		$r2 = new CdbReaderDBA( $dbacdbfile );
 
 		foreach ( $data as $key => $value ) {
 			if ( $key === '' ) {
-- 
2.20.1