Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '4.7'

  • Loading branch information...
commit 60bbaff8602bd8eaae76196f6427b4b2396c72fb 2 parents 43e4df7 + 290923e
@sebastianbergmann authored
View
4 tests/Regression/GitHub/1216.phpt
@@ -16,12 +16,10 @@ PHPUnit_TextUI_Command::main();
--EXPECTF--
PHPUnit %s by Sebastian Bergmann and contributors.
-Configuration read from %s
-
Starting test 'Issue1216Test::testConfigAvailableInBootstrap'.
.
Time: %s, Memory: %sMb
-OK (1 test, 1 assertion)
+OK (1 test, 1 assertion)
View
2  tests/Regression/GitHub/1265.phpt
@@ -14,8 +14,6 @@ PHPUnit_TextUI_Command::main();
--EXPECTF--
PHPUnit %s by Sebastian Bergmann and contributors.
-Configuration read from %s
-
.
Time: %s, Memory: %sMb
View
2  tests/Regression/GitHub/1330.phpt
@@ -15,8 +15,6 @@ PHPUnit_TextUI_Command::main();
--EXPECTF--
PHPUnit %s by Sebastian Bergmann and contributors.
-Configuration read from %s
-
Starting test 'Issue1330Test::testTrue'.
.
View
2  tests/Regression/GitHub/322.phpt
@@ -17,8 +17,6 @@ PHPUnit_TextUI_Command::main();
--EXPECTF--
PHPUnit %s by Sebastian Bergmann and contributors.
-Configuration read from %s
-
Starting test 'Issue322Test::testOne'.
.
View
2  tests/TextUI/custom-printer-debug.phpt
@@ -14,8 +14,6 @@ PHPUnit_TextUI_Command::main();
--EXPECTF--
PHPUnit %s by Sebastian Bergmann and contributors.
-Configuration read from %sconfiguration.custom-printer.xml
-
Starting test 'BankAccountTest::testBalanceIsInitiallyZero'.
.
View
3  tests/TextUI/custom-printer-verbose.phpt
@@ -14,7 +14,8 @@ PHPUnit_TextUI_Command::main();
--EXPECTF--
PHPUnit %s by Sebastian Bergmann and contributors.
-Configuration read from %sconfiguration.custom-printer.xml
+Runtime: %s
+Configuration: %sconfiguration.custom-printer.xml
I
View
2  tests/TextUI/dependencies-isolation.phpt
@@ -14,6 +14,8 @@ PHPUnit_TextUI_Command::main();
--EXPECTF--
PHPUnit %s by Sebastian Bergmann and contributors.
+Runtime: %s
+
...FSS
Time: %s, Memory: %sMb
View
2  tests/TextUI/dependencies.phpt
@@ -13,6 +13,8 @@ PHPUnit_TextUI_Command::main();
--EXPECTF--
PHPUnit %s by Sebastian Bergmann and contributors.
+Runtime: %s
+
...FSS
Time: %s, Memory: %sMb
Please sign in to comment.
Something went wrong with that request. Please try again.