Skip to content

Commit cd5afd3

Browse files
committed
Merge branch '2.8' into 3.0
* 2.8: fix some issues after merging 2.7 into 2.8 fix another bug due to choosing the wrong branch Update some screenshots to wrap them with a browser window some minor tweaks fix bugs due to choosing the wrong base branch complete component cross references Updated the Global Composer Installation article Removing an index to forms - this seemed to cause big errors in how the index/breadcrumbs were built Switching wrong link order
2 parents 181157f + ffd7507 commit cd5afd3

35 files changed

+170
-60
lines changed

components/asset.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,4 +321,7 @@ document inside a template::
321321
echo $packages->getUrl('/resume.pdf', 'doc');
322322
// result: /somewhere/deep/for/documents/resume.pdf?v1
323323

324+
Learn more
325+
----------
326+
324327
.. _Packagist: https://packagist.org/packages/symfony/asset

components/browser_kit.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,5 +224,12 @@ also delete all the cookies::
224224
// delete history
225225
$client->restart();
226226

227+
Learn more
228+
----------
229+
230+
* :doc:`/testing`
231+
* :doc:`/components/css_selector`
232+
* :doc:`/components/dom_crawler`
233+
227234
.. _`Packagist`: https://packagist.org/packages/symfony/browser-kit
228235
.. _`Goutte`: https://github.com/fabpot/Goutte

components/config.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,8 @@ Learn More
2828
:glob:
2929

3030
config/*
31+
/bundles/configuration
32+
/bundles/extension
33+
/bundles/prepend_extension
3134

3235
.. _Packagist: https://packagist.org/packages/symfony/config

components/console.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Then, you can register the commands using
4949

5050
See the :doc:`/console` article for information about how to create commands.
5151

52-
Learn More
52+
Learn more
5353
----------
5454

5555
.. toctree::
@@ -59,5 +59,6 @@ Learn More
5959
/console
6060
/components/console/*
6161
/components/console/helpers/index
62+
/console/*
6263

6364
.. _Packagist: https://packagist.org/packages/symfony/console

components/css_selector.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,9 @@ Several pseudo-classes are not yet supported:
9393
name (e.g. ``li:first-of-type``) but not with ``*``.
9494

9595
.. _Packagist: https://packagist.org/packages/symfony/css-selector
96+
97+
Learn more
98+
----------
99+
100+
* :doc:`/testing`
101+
* :doc:`/components/dom_crawler`

components/dependency_injection.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ Learn More
293293
:maxdepth: 1
294294
:glob:
295295

296-
dependency_injection/*
296+
/components/dependency_injection/*
297+
/dependency_injection/*
297298

298299
.. _Packagist: https://packagist.org/packages/symfony/dependency-injection

components/dom_crawler.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,3 +447,9 @@ the whole form or specific field(s)::
447447

448448
.. _`Goutte`: https://github.com/FriendsOfPHP/Goutte
449449
.. _Packagist: https://packagist.org/packages/symfony/dom-crawler
450+
451+
Learn more
452+
----------
453+
454+
* :doc:`/testing`
455+
* :doc:`/components/css_selector`

components/event_dispatcher.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,11 @@ Learn More
519519
:maxdepth: 1
520520
:glob:
521521

522-
event_dispatcher/*
522+
/components/event_dispatcher/*
523+
/event_dispatcher/*
524+
525+
* :ref:`The kernel.event_listener tag <dic-tags-kernel-event-listener>`
526+
* :ref:`The kernel.event_subscriber tag <dic-tags-kernel-event-subscriber>`
523527

524528
.. _Mediator: https://en.wikipedia.org/wiki/Mediator_pattern
525529
.. _Closures: http://php.net/manual/en/functions.anonymous.php

components/expression_language.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ Learn More
119119
:maxdepth: 1
120120
:glob:
121121

122-
expression_language/*
122+
/expressions
123+
/components/expression_language/*
124+
/service_container/expression_language
125+
/reference/constraints/Expression
123126

124127
.. _Packagist: https://packagist.org/packages/symfony/expression-language

components/form.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,15 @@ method to access the list of errors. It returns a
720720
// a FormErrorIterator instance representing the form tree structure
721721
$errors = $form->getErrors(true, false);
722722

723+
Learn more
724+
----------
725+
726+
.. toctree::
727+
:maxdepth: 1
728+
:glob:
729+
730+
/form/*
731+
723732
.. _Packagist: https://packagist.org/packages/symfony/form
724733
.. _Twig: http://twig.sensiolabs.org
725734
.. _`Twig Configuration`: http://twig.sensiolabs.org/doc/intro.html

0 commit comments

Comments
 (0)