diff --git a/test/classes/PMA_DBQbe_test.php b/test/classes/PMA_DBQbe_test.php index 1f9ba1bec1..054070f172 100644 --- a/test/classes/PMA_DBQbe_test.php +++ b/test/classes/PMA_DBQbe_test.php @@ -100,7 +100,7 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase '_getSortRow', array() ) - ); + ); } /** diff --git a/test/classes/PMA_Error_Handler_test.php b/test/classes/PMA_Error_Handler_test.php index 22e4a3688b..463efe299e 100644 --- a/test/classes/PMA_Error_Handler_test.php +++ b/test/classes/PMA_Error_Handler_test.php @@ -71,10 +71,12 @@ class PMA_Error_Handler_test extends PHPUnit_Framework_TestCase */ public function testHandleError($errno, $errstr, $errfile, $errline, $output) { - $GLOBALS['cfg']['Error_Handler']['gather'] = true; - $this->assertEquals( $output, $this->object->handleError($errno, $errstr, $errfile, $errline)); + $this->assertEquals( + $output, + $this->object->handleError($errno, $errstr, $errfile, $errline) + ); } /** diff --git a/test/classes/PMA_Theme_test.php b/test/classes/PMA_Theme_test.php index 3fa5eeb020..7f535fc17b 100644 --- a/test/classes/PMA_Theme_test.php +++ b/test/classes/PMA_Theme_test.php @@ -289,7 +289,7 @@ background: -o-linear-gradient(top, #12345, #54321);' { $this->assertEquals( $this->object->getCssCodeMirror(), - 'span.cm-keyword, span.cm-statement-verb { + 'span.cm-keyword, span.cm-statement-verb { color: #909; } span.cm-variable { diff --git a/test/engines/PMA_StorageEngine_innodb_test.php b/test/engines/PMA_StorageEngine_innodb_test.php index 36ac2d8b15..e4638b0b21 100644 --- a/test/engines/PMA_StorageEngine_innodb_test.php +++ b/test/engines/PMA_StorageEngine_innodb_test.php @@ -272,9 +272,7 @@ class PMA_StorageEngine_innodb_test extends PHPUnit_Framework_TestCase public function testGetPageStatus() { $this->assertEquals( - '
' . "\n"
-                . "\n"
-                . '
' . "\n", + '
' . "\n" . "\n" . '
' . "\n", $this->object->getPageStatus() ); @@ -290,9 +288,7 @@ class PMA_StorageEngine_innodb_test extends PHPUnit_Framework_TestCase ); $this->object->support = 2; $this->assertEquals( - '
' . "\n"
-                . "\n"
-                . '
' . "\n", + '
' . "\n" . "\n" . '
' . "\n", $this->object->getPage('Status') ); }