Merge branch '7.3'

.gitignore

@@ -12,9 +12,9 @@
 /build/binary-phar-autoload.php
 /cache.properties
 /composer.lock
-/tests/TextUI/*.diff
-/tests/TextUI/*.exp
-/tests/TextUI/*.log
-/tests/TextUI/*.out
-/tests/TextUI/*.php
+/tests/end-to-end/*.diff
+/tests/end-to-end/*.exp
+/tests/end-to-end/*.log
+/tests/end-to-end/*.out
+/tests/end-to-end/*.php
 /vendor

build/travis-ci-fail.xml

@@ -6,7 +6,7 @@
          verbose="true">
   <testsuites>
     <testsuite name="small">
-      <directory suffix=".phpt">../tests/Fail</directory>
+      <directory suffix=".phpt">../tests/fail</directory>
     </testsuite>
   </testsuites>
 

phpunit.xml

@@ -5,16 +5,12 @@
          cacheResult="true"
          verbose="true">
     <testsuites>
-        <testsuite name="small">
-            <directory>tests/Framework</directory>
-            <directory>tests/Runner</directory>
-            <directory>tests/Util</directory>
+        <testsuite name="unit">
+            <directory suffix="Test.php">tests/unit</directory>
         </testsuite>
 
-        <testsuite name="large">
-            <directory suffix=".phpt">tests/Framework/MockObject/Generator</directory>
-            <directory suffix=".phpt">tests/TextUI</directory>
-            <directory suffix=".phpt">tests/Regression</directory>
+        <testsuite name="end-to-end">
+            <directory suffix=".phpt">tests/end-to-end</directory>
         </testsuite>
     </testsuites>
 

tests/_files/configuration.one-file-suite.xml

@@ -1,7 +1,7 @@
 <phpunit>
     <testsuites>
         <testsuite name="One File Suite">
-            <file>../../tests/TextUI/debug.phpt</file>
+            <file>../../tests/end-to-end/debug.phpt</file>
         </testsuite>
     </testsuites>
 </phpunit>

tests/TextUI/abstract-test-class.phpt → tests/end-to-end/abstract-test-class.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit AbstractTest ../_files/AbstractTest.php
+phpunit AbstractTest ../../_files/AbstractTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/assertion.phpt → tests/end-to-end/assertion.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit AssertionExampleTest ../_files/AssertionExampleTest.php
+phpunit AssertionExampleTest ../../_files/AssertionExampleTest.php
 --SKIPIF--
 <?php
 if (PHP_MAJOR_VERSION < 7) {

tests/TextUI/code-coverage-ignore.phpt → tests/end-to-end/code-coverage-ignore.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --colors=never --coverage-text=php://stdout IgnoreCodeCoverageClassTest ../_files/IgnoreCodeCoverageClassTest.php --whitelist ../../tests/_files/IgnoreCodeCoverageClass.php
+phpunit --colors=never --coverage-text=php://stdout IgnoreCodeCoverageClassTest ../../_files/IgnoreCodeCoverageClassTest.php --whitelist ../../../tests/_files/IgnoreCodeCoverageClass.php
 --SKIPIF--
 <?php
 if (!extension_loaded('xdebug')) {

tests/TextUI/code-coverage-phpt.phpt → tests/end-to-end/code-coverage-phpt.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --colors=never --coverage-text=php://stdout ../_files/phpt-for-coverage.phpt --whitelist ../_files/CoveredClass.php
+phpunit --colors=never --coverage-text=php://stdout ../../_files/phpt-for-coverage.phpt --whitelist ../../_files/CoveredClass.php
 --SKIPIF--
 <?php
 if (!extension_loaded('xdebug')) {

tests/TextUI/colors-always.phpt → tests/end-to-end/colors-always.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --colors=always BankAccountTest ../_files/BankAccountTest.php
+phpunit --colors=always BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/concrete-test-class.phpt → tests/end-to-end/concrete-test-class.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit ConcreteTest ../_files/ConcreteTest.php
+phpunit ConcreteTest ../../_files/ConcreteTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/custom-printer-debug.phpt → tests/end-to-end/custom-printer-debug.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit -c ../_files/configuration.custom-printer.xml --debug BankAccountTest ../_files/BankAccountTest.php
+phpunit -c ../../_files/configuration.custom-printer.xml --debug BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '-c';

tests/TextUI/custom-printer-verbose.phpt → tests/end-to-end/custom-printer-verbose.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit -c ../_files/configuration.custom-printer.xml --verbose IncompleteTest ../_files/IncompleteTest.php
+phpunit -c ../../_files/configuration.custom-printer.xml --verbose IncompleteTest ../../_files/IncompleteTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '-c';

tests/TextUI/dataprovider-debug.phpt → tests/end-to-end/dataprovider-debug.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --debug DataProviderDebugTest ../_files/DataProviderDebugTest.php
+phpunit --debug DataProviderDebugTest ../../_files/DataProviderDebugTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/dataprovider-issue-2833.phpt → tests/end-to-end/dataprovider-issue-2833.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit ../_files/DataProviderIssue2833
+phpunit ../../_files/DataProviderIssue2833
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/dataprovider-issue-2859.phpt → tests/end-to-end/dataprovider-issue-2859.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit -c ../_files/DataProviderIssue2859/phpunit.xml
+phpunit -c ../../_files/DataProviderIssue2859/phpunit.xml
 --FILE--
 <?php
 $_SERVER['argv'][1] = '-c';

tests/TextUI/dataprovider-issue-2922.phpt → tests/end-to-end/dataprovider-issue-2922.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --exclude-group=foo ../_files/DataProviderIssue2922
+phpunit --exclude-group=foo ../../_files/DataProviderIssue2922
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/dataprovider-log-xml-isolation.phpt → tests/end-to-end/dataprovider-log-xml-isolation.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --log-junit php://stdout DataProviderTest ../_files/DataProviderTest.php
+phpunit --process-isolation --log-junit php://stdout DataProviderTest ../../_files/DataProviderTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/dataprovider-log-xml.phpt → tests/end-to-end/dataprovider-log-xml.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --log-junit php://stdout DataProviderTest ../_files/DataProviderTest.php
+phpunit --log-junit php://stdout DataProviderTest ../../_files/DataProviderTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/dataprovider-testdox.phpt → tests/end-to-end/dataprovider-testdox.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit DataProviderTestDoxTest ../_files/DataProviderTestDoxTest.php
+phpunit DataProviderTestDoxTest ../../_files/DataProviderTestDoxTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/debug.phpt → tests/end-to-end/debug.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --debug BankAccountTest ../_files/BankAccountTest.php
+phpunit --debug BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/default-isolation.phpt → tests/end-to-end/default-isolation.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation BankAccountTest ../_files/BankAccountTest.php
+phpunit --process-isolation BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/default.phpt → tests/end-to-end/default.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit BankAccountTest ../_files/BankAccountTest.php
+phpunit BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/dependencies-clone.phpt → tests/end-to-end/dependencies-clone.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --verbose ClonedDependencyTest ../_files/ClonedDependencyTest.php
+phpunit --verbose ClonedDependencyTest ../../_files/ClonedDependencyTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/dependencies-isolation.phpt → tests/end-to-end/dependencies-isolation.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --verbose DependencyTestSuite ../_files/DependencyTestSuite.php
+phpunit --process-isolation --verbose DependencyTestSuite ../../_files/DependencyTestSuite.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/dependencies.phpt → tests/end-to-end/dependencies.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --verbose DependencyTestSuite ../_files/DependencyTestSuite.php
+phpunit --verbose DependencyTestSuite ../../_files/DependencyTestSuite.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/dependencies2-isolation.phpt → tests/end-to-end/dependencies2-isolation.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation StackTest ../_files/StackTest.php
+phpunit --process-isolation StackTest ../../_files/StackTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/dependencies2.phpt → tests/end-to-end/dependencies2.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit StackTest ../_files/StackTest.php
+phpunit StackTest ../../_files/StackTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/dependencies3-isolation.phpt → tests/end-to-end/dependencies3-isolation.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation MultiDependencyTest ../_files/MultiDependencyTest.php
+phpunit --process-isolation MultiDependencyTest ../../_files/MultiDependencyTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/dependencies3.phpt → tests/end-to-end/dependencies3.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit MultiDependencyTest ../_files/MultiDependencyTest.php
+phpunit MultiDependencyTest ../../_files/MultiDependencyTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/disable-code-coverage-ignore.phpt → tests/end-to-end/disable-code-coverage-ignore.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --colors=never --coverage-text=php://stdout --disable-coverage-ignore IgnoreCodeCoverageClassTest tests/_files/IgnoreCodeCoverageClassTest.php --whitelist ../../tests/_files/IgnoreCodeCoverageClass.php
+phpunit --colors=never --coverage-text=php://stdout --disable-coverage-ignore IgnoreCodeCoverageClassTest tests/_files/IgnoreCodeCoverageClassTest.php --whitelist ../../../tests/_files/IgnoreCodeCoverageClass.php
 --SKIPIF--
 <?php
 if (!extension_loaded('xdebug')) {

tests/TextUI/empty-testcase.phpt → tests/end-to-end/empty-testcase.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit EmptyTestCaseTest ../_files/EmptyTestCaseTest.php
+phpunit EmptyTestCaseTest ../../_files/EmptyTestCaseTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/exception-stack.phpt → tests/end-to-end/exception-stack.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit ExceptionStackTest ../_files/ExceptionStackTest.php
+phpunit ExceptionStackTest ../../_files/ExceptionStackTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/exclude-group-isolation.phpt → tests/end-to-end/exclude-group-isolation.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --exclude-group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+phpunit --process-isolation --exclude-group balanceIsInitiallyZero BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/exclude-group.phpt → tests/end-to-end/exclude-group.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --exclude-group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+phpunit --exclude-group balanceIsInitiallyZero BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/failure-isolation.phpt → tests/end-to-end/failure-isolation.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation FailureTest ../_files/FailureTest.php
+phpunit --process-isolation FailureTest ../../_files/FailureTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/failure-reverse-list.phpt → tests/end-to-end/failure-reverse-list.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --reverse-list FailureTest ../_files/FailureTest.php
+phpunit --reverse-list FailureTest ../../_files/FailureTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/failure.phpt → tests/end-to-end/failure.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit FailureTest ../_files/FailureTest.php
+phpunit FailureTest ../../_files/FailureTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/fatal-isolation.phpt → tests/end-to-end/fatal-isolation.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit FatalTest --process-isolation ../_files/FatalTest.php
+phpunit FatalTest --process-isolation ../../_files/FatalTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/filter-class-isolation.phpt → tests/end-to-end/filter-class-isolation.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter BankAccountTest BankAccountTest ../_files/BankAccountTest.php
+phpunit --process-isolation --filter BankAccountTest BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/filter-class.phpt → tests/end-to-end/filter-class.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter BankAccountTest BankAccountTest ../_files/BankAccountTest.php
+phpunit --filter BankAccountTest BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt → tests/end-to-end/filter-dataprovider-by-classname-and-range-isolation.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter DataProviderFilterTest#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter DataProviderFilterTest#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/filter-dataprovider-by-classname-and-range.phpt → tests/end-to-end/filter-dataprovider-by-classname-and-range.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter DataProviderFilterTest#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter DataProviderFilterTest#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/filter-dataprovider-by-number-isolation.phpt → tests/end-to-end/filter-dataprovider-by-number-isolation.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter testTrue#3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter testTrue#3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/filter-dataprovider-by-number.phpt → tests/end-to-end/filter-dataprovider-by-number.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter testTrue#3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter testTrue#3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt → tests/end-to-end/filter-dataprovider-by-only-range-isolation.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter \#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter \#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/filter-dataprovider-by-only-range.phpt → tests/end-to-end/filter-dataprovider-by-only-range.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter \#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter \#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt → tests/end-to-end/filter-dataprovider-by-only-regexp-isolation.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter @false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter @false.* DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/filter-dataprovider-by-only-regexp.phpt → tests/end-to-end/filter-dataprovider-by-only-regexp.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter @false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter @false.* DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt → tests/end-to-end/filter-dataprovider-by-only-string-isolation.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter @false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter @false\ test DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/filter-dataprovider-by-only-string.phpt → tests/end-to-end/filter-dataprovider-by-only-string.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter @false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter @false\ test DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/filter-dataprovider-by-range-isolation.phpt → tests/end-to-end/filter-dataprovider-by-range-isolation.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter testTrue#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter testTrue#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/filter-dataprovider-by-range.phpt → tests/end-to-end/filter-dataprovider-by-range.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter testTrue#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter testTrue#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt → tests/end-to-end/filter-dataprovider-by-regexp-isolation.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter testFalse@false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter testFalse@false.* DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';