Merge branch '7.0'

sebastianbergmann · Feb 13, 2018 · 58c4b17 · 58c4b17
2 parents 63f3a05 + 2c7fd6a
commit 58c4b17
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/tests/TextUI/dataprovider-testdox.phpt b/tests/TextUI/dataprovider-testdox.phpt
@@ -18,6 +18,6 @@ DataProviderTestDox
  ✔ Does something else with data set "one"
  ✔ Does something else with data set "two"
 
-Time: %d ms, Memory: %fMB
+Time: %s, Memory: %s
 
 OK (4 tests, 4 assertions)
diff --git a/tests/TextUI/defaulttestsuite-using-testsuite.phpt b/tests/TextUI/defaulttestsuite-using-testsuite.phpt
@@ -16,6 +16,6 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 DummyFoo
  ✔ Foo equals foo
 
-Time: %d ms, Memory: %fMB
+Time: %s, Memory: %s
 
 OK (1 test, 1 assertion)
diff --git a/tests/TextUI/defaulttestsuite.phpt b/tests/TextUI/defaulttestsuite.phpt
@@ -14,6 +14,6 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 DummyBar
  ✔ Bar equals bar
 
-Time: %d ms, Memory: %fMB
+Time: %s, Memory: %s
 
 OK (1 test, 1 assertion)
diff --git a/tests/TextUI/testdox-verbose.phpt b/tests/TextUI/testdox-verbose.phpt
@@ -20,6 +20,6 @@ BankAccount
  ✔ Balance cannot become negative [%f ms]
  ✔ Balance cannot become negative [%f ms]
 
-Time: %d ms, Memory: %fMB
+Time: %s, Memory: %s
 
 OK (3 tests, 3 assertions)
diff --git a/tests/TextUI/testdox.phpt b/tests/TextUI/testdox.phpt
@@ -17,6 +17,6 @@ BankAccount
  ✔ Balance cannot become negative
  ✔ Balance cannot become negative
 
-Time: %d ms, Memory: %fMB
+Time: %s, Memory: %s
 
 OK (3 tests, 3 assertions)