From: C. Scott Ananian <cscott@cscott.net>
Date: Tue, 16 Jul 2013 18:06:04 +0000 (-0400)
Subject: Code style cleanups to parserTest.inc and NewParserTest.php.
X-Git-Tag: 1.31.0-rc.0~19049^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/?a=commitdiff_plain;h=414e7ecae3aa7f0beff2c7636d2facb4b3361fd0;p=lhc%2Fweb%2Fwiklou.git

Code style cleanups to parserTest.inc and NewParserTest.php.

Break some long lines which were causing WARNINGs and ERRORs from the
PHP code style checker.

Change-Id: Id52e18119277030041786d0130e693289b3c519e
---

diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index 0469138ec8..3ca28c61cc 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -885,7 +885,8 @@ class ParserTest {
 		}
 
 		# Update certain things in site_stats
-		$this->db->insert( 'site_stats', array( 'ss_row_id' => 1, 'ss_images' => 2, 'ss_good_articles' => 1 ) );
+		$this->db->insert( 'site_stats',
+			array( 'ss_row_id' => 1, 'ss_images' => 2, 'ss_good_articles' => 1 ) );
 
 		# Reinitialise the LocalisationCache to match the database state
 		Language::getLocalisationCache()->unloadAll();
@@ -982,8 +983,11 @@ class ParserTest {
 		$tables = $this->listTables();
 
 		foreach ( $tables as $table ) {
-			$sql = $this->db->getType() == 'oracle' ? "DROP TABLE pt_$table DROP CONSTRAINTS" : "DROP TABLE `parsertest_$table`";
-			$this->db->query( $sql );
+			if ( $this->db->getType() == 'oracle' ) {
+				$this->db->query( "DROP TABLE pt_$table DROP CONSTRAINTS" );
+			} else {
+				$this->db->query( "DROP TABLE `parsertest_$table`" );
+			}
 		}
 
 		if ( $this->db->getType() == 'oracle' ) {
@@ -1210,7 +1214,9 @@ class ParserTest {
 	 * @param $outFileTail String: tailing for the output file name
 	 * @return String
 	 */
-	protected function quickDiff( $input, $output, $inFileTail = 'expected', $outFileTail = 'actual' ) {
+	protected function quickDiff( $input, $output,
+		$inFileTail = 'expected', $outFileTail = 'actual'
+	) {
 		# Windows, or at least the fc utility, is retarded
 		$slash = wfIsWindows() ? '\\' : '/';
 		$prefix = wfTempDir() . "{$slash}mwParser-" . mt_rand();
diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php
index 9551b2f614..89103a2558 100644
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -105,11 +105,14 @@ class NewParserTest extends MediaWikiTestCase {
 		) );
 		$tmpGlobals['wgNamespaceProtection'] = array( NS_MEDIAWIKI => 'editinterface' );
 
-		$tmpGlobals['wgParser'] = new StubObject( 'wgParser', $GLOBALS['wgParserConf']['class'], array( $GLOBALS['wgParserConf'] ) );
+		$tmpGlobals['wgParser'] = new StubObject(
+			'wgParser', $GLOBALS['wgParserConf']['class'],
+			array( $GLOBALS['wgParserConf'] ) );
 
 		$tmpGlobals['wgFileExtensions'][] = 'svg';
 		$tmpGlobals['wgSVGConverter'] = 'rsvg';
-		$tmpGlobals['wgSVGConverters']['rsvg'] = '$path/rsvg-convert -w $width -h $height $input -o $output';
+		$tmpGlobals['wgSVGConverters']['rsvg'] =
+			'$path/rsvg-convert -w $width -h $height $input -o $output';
 
 		if ( $GLOBALS['wgStyleDirectory'] === false ) {
 			$tmpGlobals['wgStyleDirectory'] = "$IP/skins";
@@ -698,7 +701,9 @@ class NewParserTest extends MediaWikiTestCase {
 			} catch ( Exception $exception ) {
 				$input_dump = sprintf( "string(%d) \"%s\"\n", strlen( $input ), $input );
 
-				$this->assertTrue( false, "Test $id, fuzz seed {$this->fuzzSeed}. \n\nInput: $input_dump\n\nError: {$exception->getMessage()}\n\nBacktrace: {$exception->getTraceAsString()}" );
+				$this->assertTrue( false, "Test $id, fuzz seed {$this->fuzzSeed}. \n\n" .
+					"Input: $input_dump\n\nError: {$exception->getMessage()}\n\n" .
+					"Backtrace: {$exception->getTraceAsString()}" );
 			}
 
 			$this->teardownGlobals();