Skip to content

Commit 89959ca

Browse files
javiereguiluzjaviereguiluz
committed
Merge remote-tracking branch 'upstream/2.7' into 2.7
2 parents f04468a + 069707a commit 89959ca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+336
-354
lines changed

‎_build/redirection_map

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,20 @@
7676
/book/configuration /configuration
7777
/book/propel /propel/propel
7878
/book/performance /performance
79-
/cookbook/assetic/apply_to_option /assetic/apply_to_option
80-
/cookbook/assetic/asset_management /assetic/asset_management
81-
/cookbook/assetic/index /assetic
82-
/cookbook/assetic/jpeg_optimize /assetic/jpeg_optimize
83-
/cookbook/assetic/php /assetic/php
84-
/cookbook/assetic/uglifyjs /assetic/uglifyjs
85-
/cookbook/assetic/yuicompressor /assetic/yuicompressor
79+
/cookbook/assetic/apply_to_option /frontend/assetic/apply_to_option
80+
/cookbook/assetic/asset_management /frontend/assetic/asset_management
81+
/cookbook/assetic/index /frontend/assetic
82+
/cookbook/assetic/jpeg_optimize /frontend/assetic/jpeg_optimize
83+
/cookbook/assetic/php /frontend/assetic/php
84+
/cookbook/assetic/uglifyjs /frontend/assetic/uglifyjs
85+
/cookbook/assetic/yuicompressor /frontend/assetic/yuicompressor
86+
/assetic /frontend/assetic
87+
/assetic/apply_to_option /frontend/assetic/apply_to_option
88+
/assetic/asset_management /frontend/assetic/asset_management
89+
/assetic/jpeg_optimize /frontend/assetic/jpeg_optimize
90+
/assetic/php /frontend/assetic/php
91+
/assetic/uglifyjs /frontend/assetic/uglifyjs
92+
/assetic/yuicompressor /frontend/assetic/yuicompressor
8693
/cookbook/bundles/best_practices /bundles/best_practices
8794
/cookbook/bundles/configuration /bundles/configuration
8895
/cookbook/bundles/extension /bundles/extension
@@ -150,7 +157,8 @@
150157
/cookbook/event_dispatcher/event_listener /event_dispatcher
151158
/cookbook/event_dispatcher/index /event_dispatcher
152159
/cookbook/event_dispatcher/method_behavior /event_dispatcher/method_behavior
153-
/cookbook/expressions /expressions/expressions
160+
/cookbook/expressions /security/expressions
161+
/expressions /security/expressions
154162
/cookbook/form/create_custom_field_type /form/create_custom_field_type
155163
/cookbook/form/create_form_type_extension /form/create_form_type_extension
156164
/cookbook/form/data_transformers /form/data_transformers
@@ -181,10 +189,10 @@
181189
/cookbook/profiler/matchers /profiler/matchers
182190
/cookbook/profiler/profiling_data /profiler/profiling_data
183191
/cookbook/profiler/storage /profiler/storage
184-
/cookbook/psr7 /request/psr7
192+
/cookbook/psr7 /components/psr7
185193
/cookbook/request/index /request
186-
/cookbook/request/load_balancer_reverse_proxy /request/load_balancer_reverse_proxy
187-
/cookbook/request/mime_type /request/mime_type
194+
/cookbook/request/load_balancer_reverse_proxy /deployment/proxies
195+
/cookbook/request/mime_type /reference/configuration/framework#formats
188196
/cookbook/routing/conditions /routing/conditions
189197
/cookbook/routing/custom_route_loader /routing/custom_route_loader
190198
/cookbook/routing/debug /routing/debug
@@ -303,6 +311,7 @@
303311
/components/form/type_guesser /form/type_guesser
304312
/components/http_foundation/index /components/http_foundation
305313
/components/http_foundation/introduction /components/http_foundation
314+
/components/http_foundation/trusting_proxies /deployment/proxies
306315
/components/http_kernel/introduction /components/http_kernel
307316
/components/http_kernel/index /components/http_kernel
308317
/components/property_access/introduction /components/property_access
@@ -327,3 +336,4 @@
327336
/form /forms
328337
/testing/simulating_authentication /testing/http_authentication
329338
/validation/group_service_resolver /form/validation_group_service_resolver
339+
/request/load_balancer_reverse_proxy /deployment/proxies

‎_images/form/simple-form.png

-5.47 KB
Loading

‎best_practices/web-assets.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ tools like GruntJS.
4949
Use Assetic to compile, combine and minimize web assets, unless you're
5050
comfortable with frontend tools like GruntJS.
5151

52-
:doc:`Assetic </assetic/asset_management>` is an asset manager capable
52+
:doc:`Assetic </frontend/assetic/asset_management>` is an asset manager capable
5353
of compiling assets developed with a lot of different frontend technologies
5454
like LESS, Sass and CoffeeScript. Combining all your assets with Assetic is a
5555
matter of wrapping all the assets with a single Twig tag:
@@ -87,8 +87,8 @@ Learn More about Assetic
8787
------------------------
8888

8989
Assetic can also minimize CSS and JavaScript assets
90-
:doc:`using UglifyCSS/UglifyJS </assetic/uglifyjs>` to speed up your
91-
websites. You can even :doc:`compress images </assetic/jpeg_optimize>`
90+
:doc:`using UglifyCSS/UglifyJS </frontend/assetic/uglifyjs>` to speed up your
91+
websites. You can even :doc:`compress images </frontend/assetic/jpeg_optimize>`
9292
with Assetic to reduce their size before serving them to the user. Check out
9393
the `official Assetic documentation`_ to learn more about all the available
9494
features.

‎bundles/best_practices.rst

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -115,23 +115,23 @@ files are going to be part of the repository.
115115
The following classes and files have specific emplacements (some are mandatory
116116
and others are just conventions followed by most developers):
117117

118-
=============================== ============================= ================
119-
Type Directory Mandatory?
120-
=============================== ============================= ================
121-
Commands ``Command/`` Yes
122-
Controllers ``Controller/`` No
123-
Service Container Extensions ``DependencyInjection/`` Yes
124-
Event Listeners ``EventListener/`` No
125-
Model classes [1] ``Model/`` No
126-
Configuration ``Resources/config/`` No
127-
Web Resources (CSS, JS, images) ``Resources/public/`` Yes
128-
Translation files ``Resources/translations/`` Yes
129-
Templates ``Resources/views/`` Yes
130-
Unit and Functional Tests ``Tests/`` No
131-
=============================== ============================= ================
132-
133-
[1] See :doc:`/doctrine/mapping_model_classes` for how to handle the
134-
mapping with a compiler pass.
118+
=================================================== ========================================
119+
Type Directory
120+
=================================================== ========================================
121+
Commands ``Command/``
122+
Controllers ``Controller/``
123+
Service Container Extensions ``DependencyInjection/``
124+
Doctrine ORM entities (when not using annotations) ``Entity/``
125+
Doctrine ODM documents (when not using annotations) ``Document/``
126+
Event Listeners ``EventListener/``
127+
Configuration ``Resources/config/``
128+
Web Resources (CSS, JS, images) ``Resources/public/``
129+
Translation files ``Resources/translations/``
130+
Validation (when not using annotations) ``Resources/config/validation/``
131+
Serialization (when not using annotations) ``Resources/config/serialization/``
132+
Templates ``Resources/views/``
133+
Unit and Functional Tests ``Tests/``
134+
=================================================== ========================================
135135

136136
Classes
137137
-------

‎components/console/helpers/questionhelper.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ will be autocompleted as the user types::
173173
public function execute(InputInterface $input, OutputInterface $output)
174174
{
175175
// ...
176+
$helper = $this->getHelper('question');
177+
176178
$bundles = array('AcmeDemoBundle', 'AcmeBlogBundle', 'AcmeStoreBundle');
177179
$question = new Question('Please enter the name of a bundle', 'FooBundle');
178180
$question->setAutocompleterValues($bundles);
@@ -192,6 +194,8 @@ convenient for passwords::
192194
public function execute(InputInterface $input, OutputInterface $output)
193195
{
194196
// ...
197+
$helper = $this->getHelper('question');
198+
195199
$question = new Question('What is the database password?');
196200
$question->setHidden(true);
197201
$question->setHiddenFallback(false);
@@ -225,6 +229,8 @@ method::
225229
public function execute(InputInterface $input, OutputInterface $output)
226230
{
227231
// ...
232+
$helper = $this->getHelper('question');
233+
228234
$question = new Question('Please enter the name of the bundle', 'AppBundle');
229235
$question->setNormalizer(function ($value) {
230236
// $value can be null here
@@ -256,6 +262,8 @@ method::
256262
public function execute(InputInterface $input, OutputInterface $output)
257263
{
258264
// ...
265+
$helper = $this->getHelper('question');
266+
259267
$question = new Question('Please enter the name of the bundle', 'AcmeDemoBundle');
260268
$question->setValidator(function ($answer) {
261269
if (!is_string($answer) || 'Bundle' !== substr($answer, -6)) {

‎components/expression_language.rst

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

122-
/expressions
123122
/components/expression_language/*
124123
/service_container/expression_language
125124
/reference/constraints/Expression

‎components/http_foundation.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,6 @@ Learn More
611611
/components/http_foundation/*
612612
/controller
613613
/controller/*
614-
/request/*
615614
/session/*
616615
/http_cache/*
617616

‎components/http_foundation/trusting_proxies.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Trusting Proxies
77
.. tip::
88

99
If you're using the Symfony Framework, start by reading
10-
:doc:`/request/load_balancer_reverse_proxy`.
10+
:doc:`/deployment/proxies`.
1111

1212
If you find yourself behind some sort of proxy - like a load balancer - then
1313
certain header information may be sent to you using special ``X-Forwarded-*``

‎request/psr7.rst renamed to ‎components/psr7.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Installation
1313

1414
You can install the component in 2 different ways:
1515

16-
* :doc:`Install it via Composer </components/using_components>` (`symfony/psr-http-message-bridge on Packagist <https://packagist.org/packages/symfony/psr-http-message-bridge>`_);
16+
* :doc:`Install it via Composer </components/using_components>` (`symfony/psr-http-message-bridge on Packagist`_);
1717
* Use the official Git repository (https://github.com/symfony/psr-http-message-bridge).
1818

1919
The bridge also needs a PSR-7 implementation to allow converting HttpFoundation
@@ -87,3 +87,4 @@ to a :class:`Symfony\\Component\\HttpFoundation\\Response` instance::
8787

8888
.. _`PSR-7`: http://www.php-fig.org/psr/psr-7/
8989
.. _`Zend Diactoros`: https://github.com/zendframework/zend-diactoros
90+
.. _`symfony/psr-http-message-bridge on Packagist`: https://packagist.org/packages/symfony/psr-http-message-bridge

‎contributing/code/bc.rst

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ Symfony's classes:
181181
Type of Change Change Allowed
182182
================================================== ==============
183183
Remove entirely No
184-
Make final No
184+
Make final No [6]_
185185
Make abstract No
186186
Change name or namespace No
187187
Change parent class Yes [4]_
@@ -194,8 +194,8 @@ Reduce visibility No
194194
Move to parent class Yes
195195
**Protected Properties**
196196
Add protected property Yes
197-
Remove protected property No
198-
Reduce visibility No
197+
Remove protected property No [7]_
198+
Reduce visibility No [7]_
199199
Move to parent class Yes
200200
**Private Properties**
201201
Add private property Yes
@@ -204,7 +204,7 @@ Remove private property Yes
204204
Add constructor without mandatory arguments Yes [1]_
205205
Remove constructor No
206206
Reduce visibility of a public constructor No
207-
Reduce visibility of a protected constructor No
207+
Reduce visibility of a protected constructor No [7]_
208208
Move to parent class Yes
209209
**Public Methods**
210210
Add public method Yes
@@ -213,29 +213,29 @@ Change name No
213213
Reduce visibility No
214214
Move to parent class Yes
215215
Add argument without a default value No
216-
Add argument with a default value No
216+
Add argument with a default value No [7]_ [8]_
217217
Remove argument Yes [3]_
218-
Add default value to an argument No
218+
Add default value to an argument No [7]_ [8]_
219219
Remove default value of an argument No
220-
Add type hint to an argument No
221-
Remove type hint of an argument No
222-
Change argument type No
223-
Change return type No
220+
Add type hint to an argument No [7]_ [8]_
221+
Remove type hint of an argument No [7]_ [8]_
222+
Change argument type No [7]_ [8]_
223+
Change return type No [7]_ [8]_
224224
**Protected Methods**
225225
Add protected method Yes
226-
Remove protected method No
227-
Change name No
228-
Reduce visibility No
226+
Remove protected method No [7]_
227+
Change name No [7]_
228+
Reduce visibility No [7]_
229229
Move to parent class Yes
230-
Add argument without a default value No
231-
Add argument with a default value No
230+
Add argument without a default value No [7]_
231+
Add argument with a default value No [7]_ [8]_
232232
Remove argument Yes [3]_
233-
Add default value to an argument No
234-
Remove default value of an argument No
235-
Add type hint to an argument No
236-
Remove type hint of an argument No
237-
Change argument type No
238-
Change return type No
233+
Add default value to an argument No [7]_ [8]_
234+
Remove default value of an argument No [7]_
235+
Add type hint to an argument No [7]_ [8]_
236+
Remove type hint of an argument No [7]_ [8]_
237+
Change argument type No [7]_ [8]_
238+
Change return type No [7]_ [8]_
239239
**Private Methods**
240240
Add private method Yes
241241
Remove private method Yes
@@ -250,7 +250,7 @@ Remove type hint of an argument Yes
250250
Change argument type Yes
251251
Change return type Yes
252252
**Static Methods**
253-
Turn non static into static No
253+
Turn non static into static No [7]_ [8]_
254254
Turn static into non static No
255255
**Constants**
256256
Add constant Yes
@@ -277,6 +277,20 @@ Change value of a constant Yes [1]_ [5]_
277277
Additionally, if a constant will likely be used in objects that are
278278
serialized, the value of a constant should not be changed.
279279
280+
.. [6] Allowed using the ``@final`` annotation.
281+
282+
.. [7] Allowed if the class is final. Classes that received the ``@final``
283+
annotation after their first release are considered final in their
284+
next major version.
285+
Changing an argument type is only possible with a parent type.
286+
Changing a return type is only possible with a child type.
287+
288+
.. [8] Allowed if the method is final. Methods that received the ``@final``
289+
annotation after their first release are considered final in their
290+
next major version.
291+
Changing an argument type is only possible with a parent type.
292+
Changing a return type is only possible with a child type.
293+
280294
.. _Semantic Versioning: http://semver.org/
281295
.. _scalar type: http://php.net/manual/en/function.is-scalar.php
282296
.. _boolean values: http://php.net/manual/en/function.boolval.php

0 commit comments

Comments
 (0)