From f91ac326a13c78b8e012d4ddbb575d5f2a5167b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Fri, 20 Apr 2018 17:32:20 +0200 Subject: [PATCH 1/2] document the usage of SYMFONY_PHPUNIT_REMOVE in the phpunit.xml.dist --- components/phpunit_bridge.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/components/phpunit_bridge.rst b/components/phpunit_bridge.rst index 360fe6b1986..84350af7768 100644 --- a/components/phpunit_bridge.rst +++ b/components/phpunit_bridge.rst @@ -447,6 +447,9 @@ The script writes the modified PHPUnit it builds in a directory that can be configured by the ``SYMFONY_PHPUNIT_DIR`` env var, or in the same directory as the ``simple-phpunit`` if it is not provided. +It's also possible to define the environment variable in the +``phpunit.xml.dist`` file. + If you have installed the bridge through Composer, you can run it by calling e.g.: .. code-block:: bash @@ -458,11 +461,16 @@ If you have installed the bridge through Composer, you can run it by calling e.g Set the ``SYMFONY_PHPUNIT_VERSION`` env var to e.g. ``5.5`` to change the base version of PHPUnit to ``5.5`` instead of the default ``5.3``. + It's also possible to define the environment variable in the + ``phpunit.xml.dist`` file. + .. tip:: If you still need to use ``prophecy`` (but not ``symfony/yaml``), then set the ``SYMFONY_PHPUNIT_REMOVE`` env var to ``symfony/yaml``. + It's also possible to set this variable in the ``phpunit.xml.dist`` file. + Code coverage listener ---------------------- From 8c9c9ee9dda0b465db375894a1079b08dae90d69 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 24 Apr 2018 16:56:50 +0200 Subject: [PATCH 2/2] Minor reword for consistency --- components/phpunit_bridge.rst | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/components/phpunit_bridge.rst b/components/phpunit_bridge.rst index 84350af7768..5db1918b2a4 100644 --- a/components/phpunit_bridge.rst +++ b/components/phpunit_bridge.rst @@ -447,8 +447,7 @@ The script writes the modified PHPUnit it builds in a directory that can be configured by the ``SYMFONY_PHPUNIT_DIR`` env var, or in the same directory as the ``simple-phpunit`` if it is not provided. -It's also possible to define the environment variable in the -``phpunit.xml.dist`` file. +It's also possible to set this env var in the ``phpunit.xml.dist`` file. If you have installed the bridge through Composer, you can run it by calling e.g.: @@ -461,15 +460,14 @@ If you have installed the bridge through Composer, you can run it by calling e.g Set the ``SYMFONY_PHPUNIT_VERSION`` env var to e.g. ``5.5`` to change the base version of PHPUnit to ``5.5`` instead of the default ``5.3``. - It's also possible to define the environment variable in the - ``phpunit.xml.dist`` file. + It's also possible to set this env var in the ``phpunit.xml.dist`` file. .. tip:: If you still need to use ``prophecy`` (but not ``symfony/yaml``), then set the ``SYMFONY_PHPUNIT_REMOVE`` env var to ``symfony/yaml``. - It's also possible to set this variable in the ``phpunit.xml.dist`` file. + It's also possible to set this env var in the ``phpunit.xml.dist`` file. Code coverage listener ----------------------