Skip to content

Commit 5cef790

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: 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 d39277e + 41b71d4 commit 5cef790

31 files changed

+154
-58
lines changed

components/asset.rst

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

327+
Learn more
328+
----------
329+
327330
.. _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
@@ -97,3 +97,9 @@ Several pseudo-classes are not yet supported:
9797
name (e.g. ``li:first-of-type``) but not with ``*``.
9898

9999
.. _Packagist: https://packagist.org/packages/symfony/css-selector
100+
101+
Learn more
102+
----------
103+
104+
* :doc:`/testing`
105+
* :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
@@ -454,3 +454,9 @@ the whole form or specific field(s)::
454454

455455
.. _`Goutte`: https://github.com/FriendsOfPHP/Goutte
456456
.. _Packagist: https://packagist.org/packages/symfony/dom-crawler
457+
458+
Learn more
459+
----------
460+
461+
* :doc:`/testing`
462+
* :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
@@ -743,6 +743,15 @@ method to access the list of errors. It returns a
743743
This is useful, for example, if you want to use PHP's ``array_`` function
744744
on the form errors.
745745

746+
Learn more
747+
----------
748+
749+
.. toctree::
750+
:maxdepth: 1
751+
:glob:
752+
753+
/form/*
754+
746755
.. _Packagist: https://packagist.org/packages/symfony/form
747756
.. _Twig: http://twig.sensiolabs.org
748757
.. _`Twig Configuration`: http://twig.sensiolabs.org/doc/intro.html

components/http_foundation.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,12 @@ Learn More
596596
:maxdepth: 1
597597
:glob:
598598

599-
http_foundation/*
599+
/components/http_foundation/*
600+
/controller
601+
/controller/*
602+
/request/*
603+
/session/*
604+
/http_cache/*
600605

601606
.. _Packagist: https://packagist.org/packages/symfony/http-foundation
602607
.. _Nginx: http://wiki.nginx.org/XSendfile

components/http_kernel.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,15 @@ look like this::
702702
// ...
703703
}
704704

705+
Learn more
706+
----------
707+
708+
.. toctree::
709+
:maxlength: 1
710+
:glob:
711+
712+
/reference/events
713+
705714
.. _Packagist: https://packagist.org/packages/symfony/http-kernel
706715
.. _reflection: http://php.net/manual/en/book.reflection.php
707716
.. _FOSRestBundle: https://github.com/friendsofsymfony/FOSRestBundle

components/intl.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,18 @@ to the current default locale::
337337

338338
That's all you need to know for now. Have fun coding!
339339

340+
Learn more
341+
----------
342+
343+
.. toctree::
344+
:maxdepth: 1
345+
:glob:
346+
347+
/reference/forms/types/country
348+
/reference/forms/types/currency
349+
/reference/forms/types/language
350+
/reference/forms/types/locale
351+
340352
.. _Packagist: https://packagist.org/packages/symfony/intl
341353
.. _Icu component: https://packagist.org/packages/symfony/icu
342354
.. _intl extension: http://www.php.net/manual/en/book.intl.php

components/routing.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,4 +346,17 @@ automatically in the background if you want to use it. A basic example of the
346346
are saved in the ``cache_dir``. This means your script must have write
347347
permissions for that location.
348348

349+
Learn more
350+
----------
351+
352+
.. toctree::
353+
:maxdepth: 1
354+
:glob:
355+
356+
/routing
357+
/routing/*
358+
/controller
359+
/controller/*
360+
/configuration/apache_router
361+
349362
.. _Packagist: https://packagist.org/packages/symfony/routing

components/security.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ Learn More
4545
:maxdepth: 1
4646
:glob:
4747

48-
security/*
48+
/components/security/*
49+
/security
50+
/security/*
51+
/reference/configuration/security
52+
/reference/constraints/UserPassword
4953

5054
.. _Packagist: https://packagist.org/packages/symfony/security
5155
.. _`CSRF attacks`: https://en.wikipedia.org/wiki/Cross-site_request_forgery

components/serializer.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -680,5 +680,14 @@ you indicate that you're expecting an array instead of a single object.
680680
A popular alternative to the Symfony Serializer Component is the third-party
681681
library, `JMS serializer`_ (released under the Apache license, so incompatible with GPLv2 projects).
682682

683+
Learn more
684+
----------
685+
686+
.. toctree::
687+
:maxdepth: 1
688+
:glob:
689+
690+
/serializer
691+
683692
.. _`JMS serializer`: https://github.com/schmittjoh/serializer
684693
.. _Packagist: https://packagist.org/packages/symfony/serializer

components/templating.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ Learn More
208208
:maxdepth: 1
209209
:glob:
210210

211-
templating/*
211+
/components/templating/*
212+
/templating
213+
/templating/*
212214

213215
.. _Packagist: https://packagist.org/packages/symfony/templating

components/translation.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,10 @@ Learn More
219219
:maxdepth: 1
220220
:glob:
221221

222-
translation/*
222+
/components/translation/*
223+
/translation
224+
/translation/*
225+
/validation/translation
223226

224227
.. _Packagist: https://packagist.org/packages/symfony/translation
225228
.. _`ISO 3166-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_3166-1#Current_codes

components/validator.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,15 @@ You can install the component in 2 different ways:
1717

1818
For more information, see the code in the Git Repository.
1919

20+
Learn more
21+
----------
22+
23+
.. toctree::
24+
:maxdepth: 1
25+
:glob:
26+
27+
/validation
28+
/validation/*
29+
/reference/constraints/*
30+
2031
.. _Packagist: https://packagist.org/packages/symfony/validator

configuration.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -388,11 +388,6 @@ And the many other topics.
388388
Learn more
389389
----------
390390

391-
.. toctree::
392-
:hidden:
393-
394-
forms
395-
396391
.. toctree::
397392
:maxdepth: 1
398393
:glob:

contributing/documentation/overview.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ while you're reading the Symfony documentation.
3939
and you'll be redirected to GitHub:
4040

4141
.. image:: /_images/contributing/docs-github-edit-page.png
42+
:align: center
43+
:class: with-browser
4244

4345
**Step 2.** Edit the contents, describe your changes and click on the
4446
**Propose file change** button.
@@ -48,6 +50,8 @@ and you'll be redirected to GitHub:
4850
also display a preview of your changes:
4951

5052
.. image:: /_images/contributing/docs-github-create-pr.png
53+
:align: center
54+
:class: with-browser
5155

5256
If everything is correct, click on the **Create pull request** button.
5357

controller/error_pages.rst

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,17 @@ with lots of debug information to help you quickly discover the root problem:
1515

1616
.. image:: /_images/controller/error_pages/exceptions-in-dev-environment.png
1717
:alt: A typical exception page in the development environment
18+
:align: center
19+
:class: with-browser
1820

1921
Since these pages contain a lot of sensitive internal information, Symfony won't
2022
display them in the production environment. Instead, it'll show a simple and
2123
generic **error page**:
2224

2325
.. image:: /_images/controller/error_pages/errors-in-prod-environment.png
2426
:alt: A typical error page in the production environment
27+
:align: center
28+
:class: with-browser
2529

2630
Error pages for the production environment can be customized in different ways
2731
depending on your needs:
@@ -251,19 +255,19 @@ will be passed two parameters:
251255
Instead of creating a new exception controller from scratch you can, of course,
252256
also extend the default :class:`Symfony\\Bundle\\TwigBundle\\Controller\\ExceptionController`.
253257
In that case, you might want to override one or both of the ``showAction()`` and
254-
``findTemplate()`` methods. The latter one locates the template to be used.
258+
``findTemplate()`` methods. The latter one locates the template to be used.
255259

256260
.. note::
257-
261+
258262
In case of extending the
259263
:class:`Symfony\\Bundle\\TwigBundle\\Controller\\ExceptionController` you
260264
may configure a service to pass the Twig environment and the ``debug`` flag
261-
to the constructor.
262-
265+
to the constructor.
266+
263267
.. configuration-block::
264-
268+
265269
.. code-block:: yaml
266-
270+
267271
# app/config/services.yml
268272
services:
269273
app.exception_controller:

form/type_guesser.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ creating a service and tagging it as ``form.type_guesser``:
217217
->addTag('form.type_guesser')
218218
;
219219
220-
221220
.. sidebar:: Registering a Type Guesser in the Component
222221

223222
If you're using the Form component standalone in your PHP project, use

page_creation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ way of building beautiful, functional, fast and maintainable apps.
224224

225225
Ok, time to finish mastering the fundamentals by reading these chapters:
226226

227-
* :doc:`/controller`
228227
* :doc:`/routing`
228+
* :doc:`/controller`
229229
* :doc:`/templating`
230230

231231
Then, learn about other important topics like the

quick_tour/the_big_picture.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,15 @@ developer's best friend!
175175

176176
.. image:: /_images/quick_tour/web_debug_toolbar.png
177177
:align: center
178+
:class: with-browser
178179

179180
But what you see initially is only the tip of the iceberg; click on any
180181
of the bar sections to open the profiler and get much more detailed information
181182
about the request, the query parameters, security details and database queries:
182183

183184
.. image:: /_images/quick_tour/profiler.png
184185
:align: center
186+
: class: with-browser
185187

186188
This tool provides so much internal information about your application that
187189
you may be worried about your visitors accessing sensible information. Symfony

routing/debug.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ the command by running the following from the root of your project.
1111

1212
.. code-block:: bash
1313
14-
$ php bin/console debug:router
14+
$ php app/console debug:router
1515
1616
.. versionadded:: 2.6
1717
Prior to Symfony 2.6, this command was called ``router:debug``.
@@ -33,14 +33,14 @@ the route name after the command:
3333

3434
.. code-block:: bash
3535
36-
$ php bin/console debug:router article_show
36+
$ php app/console debug:router article_show
3737
3838
Likewise, if you want to test whether a URL matches a given route, you can
3939
use the ``router:match`` console command:
4040

4141
.. code-block:: bash
4242
43-
$ php bin/console router:match /blog/my-latest-post
43+
$ php app/console router:match /blog/my-latest-post
4444
4545
This command will print which route the URL matches.
4646

routing/generate_url_javascript.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ variables. The ``escape`` function helps escape any non-JavaScript-safe values:
1616

1717
<script>
1818
var route = "<?php echo $view->escape(
19-
$view['router']->generate('blow_show', array(
19+
$view['router']->path('blow_show', array(
2020
'slug' => 'my-blog-post',
2121
)),
2222
'js'

setup.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ Welcome Page of Symfony:
139139
.. image:: /_images/quick_tour/welcome.png
140140
:align: center
141141
:alt: Symfony Welcome Page
142+
:class: with-browser
142143

143144
If you see a blank page or an error page instead of the Welcome Page, there is
144145
a directory permission misconfiguration. The solution to this problem is

0 commit comments

Comments
 (0)