Skip to content

Commit 5d43c01

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: Clarify some words about simple-phpunit
2 parents 2d974b6 + c19d405 commit 5d43c01

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

components/phpunit_bridge.rst

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ The PHPUnit Bridge
66
==================
77

88
The PHPUnit Bridge provides utilities to report legacy tests and usage of
9-
deprecated code and a helper for time-sensitive tests.
9+
deprecated code and helpers for mocking native functions related to time,
10+
DNS and class existence.
1011

1112
It comes with the following features:
1213

@@ -19,10 +20,13 @@ It comes with the following features:
1920

2021
* Displays the stack trace of a deprecation on-demand;
2122

22-
* Provides a ``ClockMock`` and ``DnsMock`` helper classes for time or network-sensitive tests.
23+
* Provides a ``ClockMock``, ``DnsMock`` and ``ClassExistsMock`` classes for tests
24+
sensitive to time, network or class existence.
2325

24-
* Provides a modified version of PHPUnit that does not embed ``symfony/yaml`` nor
25-
``prophecy`` to prevent any conflicts with these dependencies.
26+
* Provides a modified version of PHPUnit that allows 1. separating the
27+
dependencies of your app from those of phpunit to prevent any unwanted
28+
constraints to apply; 2. running tests in parallel when a test suite is split
29+
in several phpunit.xml files; 3. recording and replaying skipped tests.
2630

2731
Installation
2832
------------
@@ -622,8 +626,8 @@ Modified PHPUnit script
622626
This bridge provides a modified version of PHPUnit that you can call by using
623627
its ``bin/simple-phpunit`` command. It has the following features:
624628

625-
* Does not embed ``symfony/yaml`` nor ``prophecy`` to prevent any conflicts with
626-
these dependencies;
629+
* Works with a standalone vendor directory that doesn't conflict with yours;
630+
* Does not embed ``prophecy`` to prevent any conflicts with its dependencies;
627631
* Uses PHPUnit 4.8 when run with PHP <=5.5, PHPUnit 5.7 when run with PHP >=5.6
628632
and PHPUnit 6.5 when run with PHP >=7.2;
629633
* Collects and replays skipped tests when the ``SYMFONY_PHPUNIT_SKIPPED_TESTS``

0 commit comments

Comments
 (0)