Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/libraries/core/PMA_fatalError_test.php5
-rw-r--r--test/selenium/TestBase.php2
2 files changed, 2 insertions, 5 deletions
diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php
index 8233b68536..7ab7c893ac 100644
--- a/test/libraries/core/PMA_fatalError_test.php
+++ b/test/libraries/core/PMA_fatalError_test.php
@@ -79,10 +79,7 @@ class PMA_FatalError_Test extends PHPUnit_Framework_TestCase
$message = "Fatal error #%d in file %s.";
$params = array(1, 'error_file.php');
- $this->expectOutputRegex(
- "/Fatal error #1 in file error_file.php./",
- "Not EQ"
- );
+ $this->expectOutputRegex("/Fatal error #1 in file error_file.php./");
PMA_fatalError($message, $params);
$message = "Fatal error in file %s.";
diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
index 090d35e1cf..a60cd09dad 100644
--- a/test/selenium/TestBase.php
+++ b/test/selenium/TestBase.php
@@ -512,7 +512,7 @@ abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase
* Wrapper around alertText method to not use it on not supported
* browsers.
*
- * @return void
+ * @return mixed
*/
public function alertText()
{