Skip to content

Commit 6b6c796

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: Removed merge conflict Follow up to remove the debug component
2 parents 5bff359 + 2e90b61 commit 6b6c796

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

_build/redirection_map

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,6 @@
428428
/contributing/community/other /contributing/community
429429
/profiler/storage /profiler
430430
/setup/composer /setup
431-
<<<<<<< HEAD
432431
/security/security_checker /setup
433432
/service_container/parameters /configuration
434433
/routing/generate_url_javascript /routing
@@ -447,7 +446,7 @@
447446
/console/request_context /routing
448447
/form/action_method /forms
449448
/reference/requirements /setup
450-
/bundles/inheritance /bundles/override
449+
/bundles/inheritance /bundles/override
451450
/templating /templates
452451
/templating/escaping /templates
453452
/templating/syntax /templates

components/phpunit_bridge.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ Deprecation Notices at Autoloading Time
311311
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
312312

313313
By default, the PHPUnit Bridge uses ``DebugClassLoader`` from the
314-
:doc:`Debug component </components/debug>` to throw deprecation notices at
315-
class autoloading time. This can be disabled with the ``debug-class-loader`` option.
314+
`Debug component`_ to throw deprecation notices at class autoloading time.
315+
This can be disabled with the ``debug-class-loader`` option.
316316

317317
.. code-block:: xml
318318
@@ -978,3 +978,4 @@ not find the SUT:
978978
.. _`test listener`: https://phpunit.de/manual/current/en/appendixes.configuration.html#appendixes.configuration.test-listeners
979979
.. _`@covers`: https://phpunit.de/manual/current/en/appendixes.annotations.html#appendixes.annotations.covers
980980
.. _`PHP namespace resolutions rules`: https://php.net/manual/en/language.namespaces.rules.php
981+
.. _Debug component: https://github.com/symfony/debug

0 commit comments

Comments
 (0)