From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 20 Sep 2016 23:24:16 +0000 (-0700)
Subject: Remove Database clone call from DatabaseTests.php
X-Git-Tag: 1.31.0-rc.0~5438^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=ccbab078f76b370ea90f3a66b65537587511e9a5;p=lhc%2Fweb%2Fwiklou.git

Remove Database clone call from DatabaseTests.php

Change-Id: I60a22de9ccc7253abc9bbefe2a4f38675655ee4f
---

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index deaa396dea..9993277217 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -3525,7 +3525,7 @@ abstract class Database implements IDatabase, LoggerAwareInterface {
 	 * @throws DBConnectionError
 	 */
 	public function __clone() {
-		$this->connLogger->debug(
+		$this->connLogger->warning(
 			"Cloning " . get_class( $this ) . " is not recomended; forking connection:\n" .
 			( new RuntimeException() )->getTraceAsString()
 		);
diff --git a/tests/phpunit/includes/db/DatabaseTest.php b/tests/phpunit/includes/db/DatabaseTest.php
index 846509cd16..48dc332a6d 100644
--- a/tests/phpunit/includes/db/DatabaseTest.php
+++ b/tests/phpunit/includes/db/DatabaseTest.php
@@ -359,24 +359,26 @@ class DatabaseTest extends MediaWikiTestCase {
 		$origTrx = $db->getFlag( DBO_TRX );
 		$origSsl = $db->getFlag( DBO_SSL );
 
-		if ( $origTrx ) {
-			$db->clearFlag( DBO_TRX, $db::REMEMBER_PRIOR );
-		} else {
-			$db->setFlag( DBO_TRX, $db::REMEMBER_PRIOR );
-		}
+		$origTrx
+			? $db->clearFlag( DBO_TRX, $db::REMEMBER_PRIOR )
+			: $db->setFlag( DBO_TRX, $db::REMEMBER_PRIOR );
 		$this->assertEquals( !$origTrx, $db->getFlag( DBO_TRX ) );
 
-		if ( $origSsl ) {
-			$db->clearFlag( DBO_SSL, $db::REMEMBER_PRIOR );
-		} else {
-			$db->setFlag( DBO_SSL, $db::REMEMBER_PRIOR );
-		}
+		$origSsl
+			? $db->clearFlag( DBO_SSL, $db::REMEMBER_PRIOR )
+			: $db->setFlag( DBO_SSL, $db::REMEMBER_PRIOR );
 		$this->assertEquals( !$origSsl, $db->getFlag( DBO_SSL ) );
 
-		$db2 = clone $db;
-		$db2->restoreFlags( $db::RESTORE_INITIAL );
-		$this->assertEquals( $origTrx, $db2->getFlag( DBO_TRX ) );
-		$this->assertEquals( $origSsl, $db2->getFlag( DBO_SSL ) );
+		$db->restoreFlags( $db::RESTORE_INITIAL );
+		$this->assertEquals( $origTrx, $db->getFlag( DBO_TRX ) );
+		$this->assertEquals( $origSsl, $db->getFlag( DBO_SSL ) );
+
+		$origTrx
+			? $db->clearFlag( DBO_TRX, $db::REMEMBER_PRIOR )
+			: $db->setFlag( DBO_TRX, $db::REMEMBER_PRIOR );
+		$origSsl
+			? $db->clearFlag( DBO_SSL, $db::REMEMBER_PRIOR )
+			: $db->setFlag( DBO_SSL, $db::REMEMBER_PRIOR );
 
 		$db->restoreFlags();
 		$this->assertEquals( $origSsl, $db->getFlag( DBO_SSL ) );