Skip to content

Commit 3658a5a

Browse files
committed
Merge branch '2.8' into 3.1
2 parents fe66a3b + f17e4fe commit 3658a5a

File tree

13 files changed

+204
-23
lines changed

13 files changed

+204
-23
lines changed

.platform.app.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ disk: 512
4646
# Build time dependencies.
4747
dependencies:
4848
python:
49-
sphinx: ">=1"
49+
sphinx: "1.3.6"
5050

5151
# The hooks that will be performed when the package is deployed.
5252
hooks:

_build/redirection_map

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,3 +331,4 @@
331331
/components/yaml/index /components/yaml
332332
/deployment/tools /deployment
333333
/install/bundles /setup/bundles
334+
/form /forms

changelog.rst

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,152 @@ documentation.
1313
Do you also want to participate in the Symfony Documentation? Take a look
1414
at the ":doc:`/contributing/documentation/overview`" article.
1515

16+
September, 2016
17+
---------------
18+
19+
New Documentation
20+
~~~~~~~~~~~~~~~~~
21+
22+
* `#6989 <https://github.com/symfony/symfony-docs/pull/6989>`_ Added paths options in Framework::translator configuration (mickaelandrieu)
23+
* `#6926 <https://github.com/symfony/symfony-docs/pull/6926>`_ [Serializer] Add information about name converter parameter (michaelperrin)
24+
* `#6976 <https://github.com/symfony/symfony-docs/pull/6976>`_ [Finishing][Serializer] Document the encoders (Ener-Getick, weaverryan)
25+
26+
Fixed Documentation
27+
~~~~~~~~~~~~~~~~~~~
28+
29+
30+
Minor Documentation Changes
31+
~~~~~~~~~~~~~~~~~~~~~~~~~~~
32+
33+
* `#7016 <https://github.com/symfony/symfony-docs/pull/7016>`_ Add empty parentheses to method names (bocharsky-bw)
34+
* `#7015 <https://github.com/symfony/symfony-docs/pull/7015>`_ Replace title placeholder name with slug (bocharsky-bw)
35+
* `#7009 <https://github.com/symfony/symfony-docs/pull/7009>`_ Update form_dependencies.rst: fix DI (ReDnAxE)
36+
* `#7010 <https://github.com/symfony/symfony-docs/pull/7010>`_ Update service_decoration.rst (lamari)
37+
* `#6979 <https://github.com/symfony/symfony-docs/pull/6979>`_ Add specific tip about the http-kernel component (greg0ire)
38+
* `#6686 <https://github.com/symfony/symfony-docs/pull/6686>`_ Update installation.rst (mgkimsal)
39+
* `#7007 <https://github.com/symfony/symfony-docs/pull/7007>`_ normalize versionadded wording (xabbuh)
40+
* `#6992 <https://github.com/symfony/symfony-docs/pull/6992>`_ [Serializer] versionadded directive for name_converter option (xabbuh)
41+
* `#7005 <https://github.com/symfony/symfony-docs/pull/7005>`_ Use new array syntax and make a few minor tweaks (bocharsky-bw)
42+
* `#7004 <https://github.com/symfony/symfony-docs/pull/7004>`_ Tweak URL - CMF project moved to the other repo (bocharsky-bw)
43+
* `#7000 <https://github.com/symfony/symfony-docs/pull/7000>`_ Several typo fixes (emirb)
44+
* `#6999 <https://github.com/symfony/symfony-docs/pull/6999>`_ Several typo fixes (emirb)
45+
* `#6997 <https://github.com/symfony/symfony-docs/pull/6997>`_ Update console.rst (adyassine)
46+
* `#6917 <https://github.com/symfony/symfony-docs/pull/6917>`_ [Finder] document array use for locations (mickaelandrieu)
47+
* `#6993 <https://github.com/symfony/symfony-docs/pull/6993>`_ Update create_custom_field_type.rst (yceruto)
48+
* `#6993 <https://github.com/symfony/symfony-docs/pull/6993>`_ Update create_custom_field_type.rst (yceruto)
49+
* `#6995 <https://github.com/symfony/symfony-docs/pull/6995>`_ the least -> least (konrados)
50+
* `#6996 <https://github.com/symfony/symfony-docs/pull/6996>`_ fix reference syntax (xabbuh)
51+
* `#6934 <https://github.com/symfony/symfony-docs/pull/6934>`_ Update events.rst (asandjivy)
52+
* `#6897 <https://github.com/symfony/symfony-docs/pull/6897>`_ Update voters.rst (asandjivy)
53+
* `#6920 <https://github.com/symfony/symfony-docs/pull/6920>`_ [Config] Note about bundle priority for PrependExtensionInterface (wodor)
54+
* `#6905 <https://github.com/symfony/symfony-docs/pull/6905>`_ Change example of ignoring dependencies for yaml (Integrity-178B)
55+
* `#6885 <https://github.com/symfony/symfony-docs/pull/6885>`_ [FormComponent]Fix wrong mention in side note (rendler-denis)
56+
* `#6911 <https://github.com/symfony/symfony-docs/pull/6911>`_ Article about logout. (BorodinDemid)
57+
* `#6923 <https://github.com/symfony/symfony-docs/pull/6923>`_ Clarify by_reference use (jxmallett)
58+
* `#6942 <https://github.com/symfony/symfony-docs/pull/6942>`_ Updated the "Build a Login Form" article (javiereguiluz)
59+
* `#6931 <https://github.com/symfony/symfony-docs/pull/6931>`_ [Guard] Improve clarity using the configured provider (chalasr)
60+
* `#6933 <https://github.com/symfony/symfony-docs/pull/6933>`_ Misplaced paragraph about placeholders in routing.rst (antoin-m)
61+
* `#6930 <https://github.com/symfony/symfony-docs/pull/6930>`_ Use Terminal lexer for console examples (wouterj)
62+
* `#6893 <https://github.com/symfony/symfony-docs/pull/6893>`_ Update entity_provider.rst (asandjivy)
63+
* `#6895 <https://github.com/symfony/symfony-docs/pull/6895>`_ fixing $formatLevelMap array values (zrashwani)
64+
* `#6970 <https://github.com/symfony/symfony-docs/pull/6970>`_ Fix subject/verb agreement (micheal)
65+
* `#6971 <https://github.com/symfony/symfony-docs/pull/6971>`_ Update composer.rst (TravisCarden)
66+
* `#6983 <https://github.com/symfony/symfony-docs/pull/6983>`_ Update voters.rst (seferov)
67+
* `#6986 <https://github.com/symfony/symfony-docs/pull/6986>`_ Fixed directory name typo (JoeThielen)
68+
* `#6988 <https://github.com/symfony/symfony-docs/pull/6988>`_ fix link role syntax (xabbuh)
69+
* `#6960 <https://github.com/symfony/symfony-docs/pull/6960>`_ [Reference] add back the option's description (xabbuh)
70+
* `#6974 <https://github.com/symfony/symfony-docs/pull/6974>`_ Fix minor typo in security chapter How to Build a Traditional Login Form (peterkokot)
71+
* `#6941 <https://github.com/symfony/symfony-docs/pull/6941>`_ Mentioned the "Symfony Upgrade Fixer" in the upgrade article (javiereguiluz)
72+
* `#6936 <https://github.com/symfony/symfony-docs/pull/6936>`_ Improved the title of Validation Groups article to make it easier to find (javiereguiluz)
73+
* `#6925 <https://github.com/symfony/symfony-docs/pull/6925>`_ Method "$this->getMock()" is deprecated (JohnnyEvo)
74+
* `#6964 <https://github.com/symfony/symfony-docs/pull/6964>`_ Fix typo in validator example (svenluijten)
75+
* `#6945 <https://github.com/symfony/symfony-docs/pull/6945>`_ Fixed indentation issues in alias_private article (javiereguiluz)
76+
* `#6954 <https://github.com/symfony/symfony-docs/pull/6954>`_ Typo fix in tags.rst (NoScopie)
77+
* `#6955 <https://github.com/symfony/symfony-docs/pull/6955>`_ Typo in the class name. (pythagor)
78+
79+
80+
August, 2016
81+
------------
82+
83+
New Documentation
84+
~~~~~~~~~~~~~~~~~
85+
86+
* `#6908 <https://github.com/symfony/symfony-docs/pull/6908>`_ Add deprecation warnings to relevant profiler options (jameshalsall)
87+
* `#5974 <https://github.com/symfony/symfony-docs/pull/5974>`_ [PropertyInfo] Add Component Documentation (zanderbaldwin)
88+
* `#6765 <https://github.com/symfony/symfony-docs/pull/6765>`_ [Contributing] [Standards] Do not use spaces inside/around offset accessors (phansys)
89+
* `#6746 <https://github.com/symfony/symfony-docs/pull/6746>`_ Removing the alias stuff - not required after symfony/symfony#17074 (weaverryan)
90+
* `#6798 <https://github.com/symfony/symfony-docs/pull/6798>`_ Finishing Validator Docs (wouterj, mickaelandrieu, javiereguiluz, weaverryan)
91+
92+
Fixed Documentation
93+
~~~~~~~~~~~~~~~~~~~
94+
95+
* `#6915 <https://github.com/symfony/symfony-docs/pull/6915>`_ Fix the error in code example (kruglikov)
96+
* `#6907 <https://github.com/symfony/symfony-docs/pull/6907>`_ fix wrong variable name in OptionsResolver example (dincho)
97+
* `#6904 <https://github.com/symfony/symfony-docs/pull/6904>`_ Update create_custom_field_type.rst (tuanalumi)
98+
* `#6892 <https://github.com/symfony/symfony-docs/pull/6892>`_ Update custom_provider.rst (asandjivy)
99+
* `#6884 <https://github.com/symfony/symfony-docs/pull/6884>`_ service_container : fix php Definition instance (ReDnAxE)
100+
* `#6883 <https://github.com/symfony/symfony-docs/pull/6883>`_ [Routing] Fix a route path in a routing example (thomasbisignani)
101+
* `#6869 <https://github.com/symfony/symfony-docs/pull/6869>`_ Update templating.rst (asandjivy)
102+
* `#6822 <https://github.com/symfony/symfony-docs/pull/6822>`_ Adjust Application use statement (kvdnberg)
103+
* `#6881 <https://github.com/symfony/symfony-docs/pull/6881>`_ Error in CSRF example code snippet (makoru-hikage)
104+
* `#6848 <https://github.com/symfony/symfony-docs/pull/6848>`_ Fix Varnish 4 code example (Dreimus)
105+
* `#6845 <https://github.com/symfony/symfony-docs/pull/6845>`_ Fixed the extension of a logging article (javiereguiluz)
106+
* `#6800 <https://github.com/symfony/symfony-docs/pull/6800>`_ Fix missing function name (JosefVitu)
107+
* `#6843 <https://github.com/symfony/symfony-docs/pull/6843>`_ fix index directive syntax (xabbuh)
108+
* `#6784 <https://github.com/symfony/symfony-docs/pull/6784>`_ Fix CS for form templates locations (javiereguiluz)
109+
* `#6797 <https://github.com/symfony/symfony-docs/pull/6797>`_ fix FlattenException namespace (alchimik)
110+
* `#6787 <https://github.com/symfony/symfony-docs/pull/6787>`_ Fix reference to output object (micheal)
111+
* `#6761 <https://github.com/symfony/symfony-docs/pull/6761>`_ fixed missing level in namespace (themasch)
112+
* `#6757 <https://github.com/symfony/symfony-docs/pull/6757>`_ Fix typo in external_parameters.rst (gmorel)
113+
* `#6754 <https://github.com/symfony/symfony-docs/pull/6754>`_ Add missing use statements to data collector example (richardmiller)
114+
115+
Minor Documentation Changes
116+
~~~~~~~~~~~~~~~~~~~~~~~~~~~
117+
118+
* `#6921 <https://github.com/symfony/symfony-docs/pull/6921>`_ Fix var_dumper advanced usage link (ogizanagi)
119+
* `#6913 <https://github.com/symfony/symfony-docs/pull/6913>`_ [Controller Description] Fix typos and class link (rendler-denis)
120+
* `#6909 <https://github.com/symfony/symfony-docs/pull/6909>`_ DumpFile() third argument is deprecated and doesn't exists anymore (mickaelandrieu)
121+
* `#6901 <https://github.com/symfony/symfony-docs/pull/6901>`_ [EventDispatcher] paragraph duplicated (ReDnAxE)
122+
* `#6899 <https://github.com/symfony/symfony-docs/pull/6899>`_ Update access_control.rst (asandjivy)
123+
* `#6898 <https://github.com/symfony/symfony-docs/pull/6898>`_ Fixes after tonight's merge round (wouterj)
124+
* `#6896 <https://github.com/symfony/symfony-docs/pull/6896>`_ Tweaks to property info component (weaverryan)
125+
* `#6849 <https://github.com/symfony/symfony-docs/pull/6849>`_ Link to inversedBy/mappedBy documentation (soulchainer, wouterj)
126+
* `#6846 <https://github.com/symfony/symfony-docs/pull/6846>`_ Adds bin folder creation instruction (joelrfcosta)
127+
* `#6835 <https://github.com/symfony/symfony-docs/pull/6835>`_ Updated the instructions to build docs locally (javiereguiluz)
128+
* 5a5720fe minor #6834 Refactored how to get the container in a test (javiereguiluz)
129+
* `#6814 <https://github.com/symfony/symfony-docs/pull/6814>`_ Created the main article about "deployment" (javiereguiluz)
130+
* `#6882 <https://github.com/symfony/symfony-docs/pull/6882>`_ Update serializer.rst (seferov)
131+
* `#6880 <https://github.com/symfony/symfony-docs/pull/6880>`_ Remove extra quotes from ExprBuilder::thenInvalid() usage (chalasr)
132+
* `#6878 <https://github.com/symfony/symfony-docs/pull/6878>`_ missing "`" (jevgenijusr)
133+
* `#6877 <https://github.com/symfony/symfony-docs/pull/6877>`_ added lyrixx to the core team (fabpot)
134+
* `#6867 <https://github.com/symfony/symfony-docs/pull/6867>`_ Add a class specificity for SplFileInfo text (rendler-denis)
135+
* `#6872 <https://github.com/symfony/symfony-docs/pull/6872>`_ Remove redundant verb (julienfalque)
136+
* `#6866 <https://github.com/symfony/symfony-docs/pull/6866>`_ Deprecated message with "true" parameter (wazz42)
137+
* `#6862 <https://github.com/symfony/symfony-docs/pull/6862>`_ Remove unused JsonResponse dependency in example (Farskies)
138+
* `#6855 <https://github.com/symfony/symfony-docs/pull/6855>`_ [Form] Use composer require instead of modifying composer.json (wouterj)
139+
* `#6853 <https://github.com/symfony/symfony-docs/pull/6853>`_ Logrotate moved to GitHub (wouterj)
140+
* `#6851 <https://github.com/symfony/symfony-docs/pull/6851>`_ Update lazy_services.rst (takeit)
141+
* `#6794 <https://github.com/symfony/symfony-docs/pull/6794>`_ Added a new section to the page templating/global_vars using a EVListener (piet, Piet Bijl)
142+
* `#6850 <https://github.com/symfony/symfony-docs/pull/6850>`_ Remove outdated reference (hvt)
143+
* `#6824 <https://github.com/symfony/symfony-docs/pull/6824>`_ Service naming convension (orions)
144+
* `#6829 <https://github.com/symfony/symfony-docs/pull/6829>`_ Fix a typo in an HTTP Cache code example (aybbou)
145+
* `#6833 <https://github.com/symfony/symfony-docs/pull/6833>`_ Fixed a syntax issue in custom_constraint article (javiereguiluz)
146+
* `#6842 <https://github.com/symfony/symfony-docs/pull/6842>`_ Fixed service name (jeremyFreeAgent)
147+
* `#6803 <https://github.com/symfony/symfony-docs/pull/6803>`_ Remove complex speech pattern (micheal)
148+
* `#6805 <https://github.com/symfony/symfony-docs/pull/6805>`_ Remove colloquialism "hold on" (micheal)
149+
* `#6796 <https://github.com/symfony/symfony-docs/pull/6796>`_ Remove AcmeDemoBundle references (michaelcullum)
150+
* `#6786 <https://github.com/symfony/symfony-docs/pull/6786>`_ Subject-verb agreement (micheal)
151+
* `#6759 <https://github.com/symfony/symfony-docs/pull/6759>`_ Fix tense and sentence length (aalaap)
152+
* `#6820 <https://github.com/symfony/symfony-docs/pull/6820>`_ Fixed the main index page redirections (javiereguiluz)
153+
* `#6819 <https://github.com/symfony/symfony-docs/pull/6819>`_ Fixed the redirection for "upgrade" articles (javiereguiluz)
154+
* `#6812 <https://github.com/symfony/symfony-docs/pull/6812>`_ Fixed a Console article redirection (javiereguiluz)
155+
* `#6807 <https://github.com/symfony/symfony-docs/pull/6807>`_ Fixed the redirection of the cookbook/psr7 article (javiereguiluz)
156+
* `#6806 <https://github.com/symfony/symfony-docs/pull/6806>`_ Fixed the redirection of some cache articles (javiereguiluz)
157+
* `#6808 <https://github.com/symfony/symfony-docs/pull/6808>`_ Fixed a DI redirection (javiereguiluz)
158+
* `#6810 <https://github.com/symfony/symfony-docs/pull/6810>`_ Fixed the redirection of the previous "performance" book chapter (javiereguiluz)
159+
* `#6816 <https://github.com/symfony/symfony-docs/pull/6816>`_ Added all the missing "index pages" redirections (javiereguiluz)
160+
161+
16162
July, 2016
17163
----------
18164

components/serializer.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -671,11 +671,6 @@ you indicate that you're expecting an array instead of a single object.
671671
$data = ...; // The serialized data from the previous example
672672
$persons = $serializer->deserialize($data, 'Acme\Person[]', 'json');
673673
674-
.. seealso::
675-
676-
A popular alternative to the Symfony Serializer Component is the third-party
677-
library, `JMS serializer`_ (released under the Apache license, so incompatible with GPLv2 projects).
678-
679674
Learn more
680675
----------
681676

@@ -685,6 +680,11 @@ Learn more
685680

686681
/serializer
687682

683+
.. seealso::
684+
685+
A popular alternative to the Symfony Serializer Component is the third-party
686+
library, `JMS serializer`_ (released under the Apache license, so incompatible with GPLv2 projects).
687+
688688
.. _`JMS serializer`: https://github.com/schmittjoh/serializer
689689
.. _Packagist: https://packagist.org/packages/symfony/serializer
690690
.. _RFC3339: https://tools.ietf.org/html/rfc3339#section-5.8

console/commands_as_services.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ with ``console.command``:
3030
app.command.my_command:
3131
class: AppBundle\Command\MyCommand
3232
tags:
33-
- { name: console.command }
33+
- { name: console.command }
3434
3535
.. code-block:: xml
3636
@@ -137,7 +137,7 @@ inject the ``command.default_name`` parameter:
137137
class: AppBundle\Command\MyCommand
138138
arguments: ["%command.default_name%"]
139139
tags:
140-
- { name: console.command }
140+
- { name: console.command }
141141
142142
.. code-block:: xml
143143

debug/debugging.rst

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,35 @@ by removing the call to ``loadClassCache()``::
5656
session.
5757

5858
Some IDEs do not like the fact that some classes are stored in different
59-
locations. To avoid problems, you can tell your IDE to ignore the PHP cache
60-
file.
59+
locations. To avoid problems, you can either tell your IDE to ignore the PHP
60+
cache files, or you can change the extension used by Symfony for these files::
61+
62+
$kernel->loadClassCache('classes', '.php.cache');
63+
64+
Useful Debugging Commands
65+
-------------------------
66+
67+
When developing a large application, it can be hard to keep track of all the
68+
different services, routes and translations. Luckily, Symfony has some commands
69+
that can help you visualize and find the information.
70+
71+
``debug:container``
72+
Displays information about the contents of the Symfony container for all public
73+
services. To find only those matching a name, append the name as an argument.
74+
75+
``debug:config``
76+
Shows all configured bundles, their class and their alias.
77+
78+
``debug:router``
79+
Displays information about all configured routes in the application as a
80+
table with the name, method, scheme, host and path for each route.
81+
82+
``debug:translation <locale>``
83+
Shows a table of the translation key, the domain, the translation and the
84+
fallback translation for all known messages, if translations exist for
85+
the given locale.
86+
87+
.. tip::
88+
89+
When in doubt how to use a console command, open the help section by
90+
appending the ``--help`` option.

doctrine/common_extensions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ To do this, you have two options:
2323
with Symfony: `Install Gedmo Doctrine2 extensions in Symfony2`_
2424

2525
.. _`DoctrineExtensions`: https://github.com/Atlantic18/DoctrineExtensions
26-
.. _`StofDoctrineExtensionsBundle`: https://github.com/stof/StofDoctrineExtensionsBundle
26+
.. _`StofDoctrineExtensionsBundle`: http://symfony.com/doc/master/bundles/StofDoctrineExtensionsBundle/index.html
2727
.. _`Sluggable`: https://github.com/Atlantic18/DoctrineExtensions/blob/master/doc/sluggable.md
2828
.. _`Translatable`: https://github.com/Atlantic18/DoctrineExtensions/blob/master/doc/translatable.md
2929
.. _`Timestampable`: https://github.com/Atlantic18/DoctrineExtensions/blob/master/doc/timestampable.md

forms.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ the documentation for each type.
474474
:ref:`disable HTML5 validation <forms-html5-validation-disable>`
475475
or set the ``required`` option on your field to ``false``::
476476

477-
->add('dueDate', 'date', array(
477+
->add('dueDate', DateType::class, array(
478478
'widget' => 'single_text',
479479
'required' => false
480480
))

reference/twig_reference.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,10 @@ Returns the relative URL (without the scheme and host) for the given route.
324324
If ``relative`` is enabled, it'll create a path relative to the current
325325
path. More information in :ref:`templating-pages`.
326326

327+
.. seealso::
328+
329+
Read :doc:`/routing` to learn more about the Routing component.
330+
327331
url
328332
~~~
329333

@@ -342,6 +346,10 @@ Returns the absolute URL (with scheme and host) for the given route. If
342346
``schemeRelative`` is enabled, it'll create a scheme-relative URL. More
343347
information in :ref:`templating-pages`.
344348

349+
.. seealso::
350+
351+
Read :doc:`/routing` to learn more about the Routing component.
352+
345353
absolute_url
346354
~~~~~~~~~~~~
347355

security/remember_me.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ your controller using annotations:
259259
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
260260
261261
/**
262-
* @Security("has_role('IS_AUTHENTICATED_FULLY')")
262+
* @Security("is_granted('IS_AUTHENTICATED_FULLY')")
263263
*/
264264
public function editAction($name)
265265
{

security/securing_services.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ the :ref:`sidebar <securing-services-annotations-sidebar>` below):
157157
newsletter_manager:
158158
class: AppBundle\Newsletter\NewsletterManager
159159
tags:
160-
- { name: security.secure_service }
160+
- { name: security.secure_service }
161161
162162
.. code-block:: xml
163163

0 commit comments

Comments
 (0)