Skip to content

Commit 0615928

Browse files
weaverryanweaverryan
committed
Merge branch '2.5' into 2.6
* 2.5: fix merge after removing @Security in 2.3 Reverting a commit on 2.5 branch, as it was only meant to be on 2.3 (so reverting after the merge) [#4735] Reverting what was left on the 2.5 branch after the merge conflict had already put back some of it Typo Fix: "allows to" should be "allows you to" move cautions to make them visible bump required PHPUnit version remove @Security annotation for Symfony 2.3 Revert #4651 for 2.3 branch Use AppBundle whenever it's possible Conflicts: components/console/helpers/map.rst.inc cookbook/form/create_custom_field_type.rst cookbook/form/dynamic_form_modification.rst cookbook/form/form_customization.rst cookbook/profiler/matchers.rst cookbook/security/custom_authentication_provider.rst cookbook/security/securing_services.rst
2 parents 48835de + 4143076 commit 0615928

Some content is hidden

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

56 files changed

+559
-549
lines changed

‎best_practices/security.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ Now you can reuse this method both in the template and in the security expressio
208208
{% endif %}
209209

210210
.. _best-practices-directly-isGranted:
211+
.. _checking-permissions-without-security:
212+
.. _manually-checking-permissions:
211213

212214
Checking Permissions without @Security
213215
--------------------------------------

‎book/testing.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ it has its own excellent `documentation`_.
1717

1818
.. note::
1919

20-
Symfony works with PHPUnit 3.5.11 or later, though version 3.6.4 is
21-
needed to test the Symfony core code itself.
20+
It's recommended to use the latest stable PHPUnit version (you will have
21+
to use version 4.2 or higher to test the Symfony core code itself).
2222

2323
Each test - whether it's a unit test or a functional test - is a PHP class
2424
that should live in the ``Tests/`` subdirectory of your bundles. If you follow

‎components/class_loader/debug_class_loader.rst‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
.. index::
22
single: ClassLoader; DebugClassLoader
3-
3+
44
Debugging a Class Loader
55
========================
66

7-
Since Symfony 2.4, the ``DebugClassLoader`` of the Class Loader component is
8-
deprecated. Use the
9-
:doc:`DebugClassLoader provided by the Debug component </components/debug/class_loader>`.
7+
.. caution::
8+
9+
The ``DebugClassLoader`` from the ClassLoader component was deprecated
10+
in Symfony 2.5 and will be removed in Symfony 3.0. Use the
11+
:doc:`DebugClassLoader provided by the Debug component </components/debug/class_loader>`.

‎components/console/helpers/map.rst.inc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
* :doc:`/components/console/helpers/dialoghelper`
1+
* :doc:`/components/console/helpers/dialoghelper` (deprecated as of 2.5)
22
* :doc:`/components/console/helpers/formatterhelper`
33
* :doc:`/components/console/helpers/processhelper`
44
* :doc:`/components/console/helpers/progressbar`
5-
* :doc:`/components/console/helpers/progresshelper`
5+
* :doc:`/components/console/helpers/progresshelper` (deprecated as of 2.5)
66
* :doc:`/components/console/helpers/questionhelper`
77
* :doc:`/components/console/helpers/table`
8-
* :doc:`/components/console/helpers/tablehelper`
8+
* :doc:`/components/console/helpers/tablehelper` (deprecated as of 2.5)
99
* :doc:`/components/console/helpers/debug_formatter` (new in 2.6)

‎components/console/introduction.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,9 @@ tools capable of helping you with different tasks:
402402

403403
* :doc:`/components/console/helpers/questionhelper`: interactively ask the user for information
404404
* :doc:`/components/console/helpers/formatterhelper`: customize the output colorization
405-
* :doc:`/components/console/helpers/progresshelper`: shows a progress bar
406-
* :doc:`/components/console/helpers/tablehelper`: displays tabular data as a table
407-
* :doc:`/components/console/helpers/dialoghelper`: (deprecated) interactively ask the user for information
405+
* :doc:`/components/console/helpers/progressbar`: shows a progress bar
406+
* :doc:`/components/console/helpers/table`: displays tabular data as a table
407+
* :doc:`/components/console/helpers/questionhelper`: interactively ask the user for information
408408

409409
.. _component-console-testing-commands:
410410

‎cookbook/assetic/apply_to_option.rst‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ templates:
5959

6060
.. code-block:: html+jinja
6161

62-
{% javascripts '@AcmeFooBundle/Resources/public/js/example.coffee' filter='coffee' %}
62+
{% javascripts '@AppBundle/Resources/public/js/example.coffee' filter='coffee' %}
6363
<script src="{{ asset_url }}" type="text/javascript"></script>
6464
{% endjavascripts %}
6565

6666
.. code-block:: html+php
6767

6868
<?php foreach ($view['assetic']->javascripts(
69-
array('@AcmeFooBundle/Resources/public/js/example.coffee'),
69+
array('@AppBundle/Resources/public/js/example.coffee'),
7070
array('coffee')
7171
) as $url): ?>
7272
<script src="<?php echo $view->escape($url) ?>" type="text/javascript"></script>
@@ -84,8 +84,8 @@ You can also combine multiple CoffeeScript files into a single output file:
8484

8585
.. code-block:: html+jinja
8686

87-
{% javascripts '@AcmeFooBundle/Resources/public/js/example.coffee'
88-
'@AcmeFooBundle/Resources/public/js/another.coffee'
87+
{% javascripts '@AppBundle/Resources/public/js/example.coffee'
88+
'@AppBundle/Resources/public/js/another.coffee'
8989
filter='coffee' %}
9090
<script src="{{ asset_url }}" type="text/javascript"></script>
9191
{% endjavascripts %}
@@ -94,8 +94,8 @@ You can also combine multiple CoffeeScript files into a single output file:
9494

9595
<?php foreach ($view['assetic']->javascripts(
9696
array(
97-
'@AcmeFooBundle/Resources/public/js/example.coffee',
98-
'@AcmeFooBundle/Resources/public/js/another.coffee',
97+
'@AppBundle/Resources/public/js/example.coffee',
98+
'@AppBundle/Resources/public/js/another.coffee',
9999
),
100100
array('coffee')
101101
) as $url): ?>
@@ -170,19 +170,19 @@ being run through the CoffeeScript filter):
170170

171171
.. code-block:: html+jinja
172172

173-
{% javascripts '@AcmeFooBundle/Resources/public/js/example.coffee'
174-
'@AcmeFooBundle/Resources/public/js/another.coffee'
175-
'@AcmeFooBundle/Resources/public/js/regular.js' %}
173+
{% javascripts '@AppBundle/Resources/public/js/example.coffee'
174+
'@AppBundle/Resources/public/js/another.coffee'
175+
'@AppBundle/Resources/public/js/regular.js' %}
176176
<script src="{{ asset_url }}" type="text/javascript"></script>
177177
{% endjavascripts %}
178178

179179
.. code-block:: html+php
180180

181181
<?php foreach ($view['assetic']->javascripts(
182182
array(
183-
'@AcmeFooBundle/Resources/public/js/example.coffee',
184-
'@AcmeFooBundle/Resources/public/js/another.coffee',
185-
'@AcmeFooBundle/Resources/public/js/regular.js',
183+
'@AppBundle/Resources/public/js/example.coffee',
184+
'@AppBundle/Resources/public/js/another.coffee',
185+
'@AppBundle/Resources/public/js/regular.js',
186186
)
187187
) as $url): ?>
188188
<script src="<?php echo $view->escape($url) ?>" type="text/javascript"></script>

‎cookbook/assetic/asset_management.rst‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ To include JavaScript files, use the ``javascripts`` tag in any template:
5959

6060
.. code-block:: html+jinja
6161

62-
{% javascripts '@AcmeFooBundle/Resources/public/js/*' %}
62+
{% javascripts '@AppBundle/Resources/public/js/*' %}
6363
<script type="text/javascript" src="{{ asset_url }}"></script>
6464
{% endjavascripts %}
6565
6666
.. code-block:: html+php
6767

6868
<?php foreach ($view['assetic']->javascripts(
69-
array('@AcmeFooBundle/Resources/public/js/*')
69+
array('@AppBundle/Resources/public/js/*')
7070
) as $url): ?>
7171
<script type="text/javascript" src="<?php echo $view->escape($url) ?>"></script>
7272
<?php endforeach ?>
@@ -81,7 +81,7 @@ To include JavaScript files, use the ``javascripts`` tag in any template:
8181

8282
{# ... #}
8383
{% block javascripts %}
84-
{% javascripts '@AcmeFooBundle/Resources/public/js/*' %}
84+
{% javascripts '@AppBundle/Resources/public/js/*' %}
8585
<script type="text/javascript" src="{{ asset_url }}"></script>
8686
{% endjavascripts %}
8787
{% endblock %}
@@ -92,7 +92,7 @@ To include JavaScript files, use the ``javascripts`` tag in any template:
9292
You can also include CSS Stylesheets: see :ref:`cookbook-assetic-including-css`.
9393

9494
In this example, all of the files in the ``Resources/public/js/`` directory
95-
of the ``AcmeFooBundle`` will be loaded and served from a different location.
95+
of the ``AppBundle`` will be loaded and served from a different location.
9696
The actual rendered tag might simply look like:
9797

9898
.. code-block:: html
@@ -115,14 +115,14 @@ above, except with the ``stylesheets`` tag:
115115

116116
.. code-block:: html+jinja
117117

118-
{% stylesheets 'bundles/acme_foo/css/*' filter='cssrewrite' %}
118+
{% stylesheets 'bundles/app/css/*' filter='cssrewrite' %}
119119
<link rel="stylesheet" href="{{ asset_url }}" />
120120
{% endstylesheets %}
121121
122122
.. code-block:: html+php
123123

124124
<?php foreach ($view['assetic']->stylesheets(
125-
array('bundles/acme_foo/css/*'),
125+
array('bundles/app/css/*'),
126126
array('cssrewrite')
127127
) as $url): ?>
128128
<link rel="stylesheet" href="<?php echo $view->escape($url) ?>" />
@@ -138,7 +138,7 @@ above, except with the ``stylesheets`` tag:
138138

139139
{# ... #}
140140
{% block stylesheets %}
141-
{% stylesheets 'bundles/acme_foo/css/*' filter='cssrewrite' %}
141+
{% stylesheets 'bundles/app/css/*' filter='cssrewrite' %}
142142
<link rel="stylesheet" href="{{ asset_url }}" />
143143
{% endstylesheets %}
144144
{% endblock %}
@@ -151,11 +151,11 @@ the :ref:`cssrewrite <cookbook-assetic-cssrewrite>` filter.
151151
.. note::
152152

153153
Notice that in the original example that included JavaScript files, you
154-
referred to the files using a path like ``@AcmeFooBundle/Resources/public/file.js``,
154+
referred to the files using a path like ``@AppBundle/Resources/public/file.js``,
155155
but that in this example, you referred to the CSS files using their actual,
156-
publicly-accessible path: ``bundles/acme_foo/css``. You can use either, except
156+
publicly-accessible path: ``bundles/app/css``. You can use either, except
157157
that there is a known issue that causes the ``cssrewrite`` filter to fail
158-
when using the ``@AcmeFooBundle`` syntax for CSS Stylesheets.
158+
when using the ``@AppBundle`` syntax for CSS Stylesheets.
159159

160160
.. _cookbook-assetic-including-image:
161161

@@ -168,14 +168,14 @@ To include an image you can use the ``image`` tag.
168168

169169
.. code-block:: html+jinja
170170

171-
{% image '@AcmeFooBundle/Resources/public/images/example.jpg' %}
171+
{% image '@AppBundle/Resources/public/images/example.jpg' %}
172172
<img src="{{ asset_url }}" alt="Example" />
173173
{% endimage %}
174174

175175
.. code-block:: html+php
176176

177177
<?php foreach ($view['assetic']->image(
178-
array('@AcmeFooBundle/Resources/public/images/example.jpg')
178+
array('@AppBundle/Resources/public/images/example.jpg')
179179
) as $url): ?>
180180
<img src="<?php echo $view->escape($url) ?>" alt="Example" />
181181
<?php endforeach ?>
@@ -198,7 +198,7 @@ You can see an example in the previous section.
198198
.. caution::
199199

200200
When using the ``cssrewrite`` filter, don't refer to your CSS files using
201-
the ``@AcmeFooBundle`` syntax. See the note in the above section for details.
201+
the ``@AppBundle`` syntax. See the note in the above section for details.
202202

203203
Combining Assets
204204
~~~~~~~~~~~~~~~~
@@ -215,7 +215,7 @@ but still serve them as a single file:
215215
.. code-block:: html+jinja
216216

217217
{% javascripts
218-
'@AcmeFooBundle/Resources/public/js/*'
218+
'@AppBundle/Resources/public/js/*'
219219
'@AcmeBarBundle/Resources/public/js/form.js'
220220
'@AcmeBarBundle/Resources/public/js/calendar.js' %}
221221
<script src="{{ asset_url }}"></script>
@@ -225,7 +225,7 @@ but still serve them as a single file:
225225

226226
<?php foreach ($view['assetic']->javascripts(
227227
array(
228-
'@AcmeFooBundle/Resources/public/js/*',
228+
'@AppBundle/Resources/public/js/*',
229229
'@AcmeBarBundle/Resources/public/js/form.js',
230230
'@AcmeBarBundle/Resources/public/js/calendar.js',
231231
)
@@ -254,17 +254,17 @@ combine third party assets, such as jQuery, with your own into a single file:
254254
.. code-block:: html+jinja
255255

256256
{% javascripts
257-
'@AcmeFooBundle/Resources/public/js/thirdparty/jquery.js'
258-
'@AcmeFooBundle/Resources/public/js/*' %}
257+
'@AppBundle/Resources/public/js/thirdparty/jquery.js'
258+
'@AppBundle/Resources/public/js/*' %}
259259
<script src="{{ asset_url }}"></script>
260260
{% endjavascripts %}
261261
262262
.. code-block:: html+php
263263

264264
<?php foreach ($view['assetic']->javascripts(
265265
array(
266-
'@AcmeFooBundle/Resources/public/js/thirdparty/jquery.js',
267-
'@AcmeFooBundle/Resources/public/js/*',
266+
'@AppBundle/Resources/public/js/thirdparty/jquery.js',
267+
'@AppBundle/Resources/public/js/*',
268268
)
269269
) as $url): ?>
270270
<script src="<?php echo $view->escape($url) ?>"></script>
@@ -287,8 +287,8 @@ configuration under the ``assetic`` section. Read more in the
287287
assets:
288288
jquery_and_ui:
289289
inputs:
290-
- '@AcmeFooBundle/Resources/public/js/thirdparty/jquery.js'
291-
- '@AcmeFooBundle/Resources/public/js/thirdparty/jquery.ui.js'
290+
- '@AppBundle/Resources/public/js/thirdparty/jquery.js'
291+
- '@AppBundle/Resources/public/js/thirdparty/jquery.ui.js'
292292
293293
.. code-block:: xml
294294
@@ -299,8 +299,8 @@ configuration under the ``assetic`` section. Read more in the
299299
300300
<assetic:config>
301301
<assetic:asset name="jquery_and_ui">
302-
<assetic:input>@AcmeFooBundle/Resources/public/js/thirdparty/jquery.js</assetic:input>
303-
<assetic:input>@AcmeFooBundle/Resources/public/js/thirdparty/jquery.ui.js</assetic:input>
302+
<assetic:input>@AppBundle/Resources/public/js/thirdparty/jquery.js</assetic:input>
303+
<assetic:input>@AppBundle/Resources/public/js/thirdparty/jquery.ui.js</assetic:input>
304304
</assetic:asset>
305305
</assetic:config>
306306
</container>
@@ -312,8 +312,8 @@ configuration under the ``assetic`` section. Read more in the
312312
'assets' => array(
313313
'jquery_and_ui' => array(
314314
'inputs' => array(
315-
'@AcmeFooBundle/Resources/public/js/thirdparty/jquery.js',
316-
'@AcmeFooBundle/Resources/public/js/thirdparty/jquery.ui.js',
315+
'@AppBundle/Resources/public/js/thirdparty/jquery.js',
316+
'@AppBundle/Resources/public/js/thirdparty/jquery.ui.js',
317317
),
318318
),
319319
),
@@ -328,7 +328,7 @@ with the ``@named_asset`` notation:
328328

329329
{% javascripts
330330
'@jquery_and_ui'
331-
'@AcmeFooBundle/Resources/public/js/*' %}
331+
'@AppBundle/Resources/public/js/*' %}
332332
<script src="{{ asset_url }}"></script>
333333
{% endjavascripts %}
334334
@@ -337,7 +337,7 @@ with the ``@named_asset`` notation:
337337
<?php foreach ($view['assetic']->javascripts(
338338
array(
339339
'@jquery_and_ui',
340-
'@AcmeFooBundle/Resources/public/js/*',
340+
'@AppBundle/Resources/public/js/*',
341341
)
342342
) as $url): ?>
343343
<script src="<?php echo $view->escape($url) ?>"></script>
@@ -406,14 +406,14 @@ into your template:
406406

407407
.. code-block:: html+jinja
408408

409-
{% javascripts '@AcmeFooBundle/Resources/public/js/*' filter='uglifyjs2' %}
409+
{% javascripts '@AppBundle/Resources/public/js/*' filter='uglifyjs2' %}
410410
<script src="{{ asset_url }}"></script>
411411
{% endjavascripts %}
412412
413413
.. code-block:: html+php
414414

415415
<?php foreach ($view['assetic']->javascripts(
416-
array('@AcmeFooBundle/Resources/public/js/*'),
416+
array('@AppBundle/Resources/public/js/*'),
417417
array('uglifyjs2')
418418
) as $url): ?>
419419
<script src="<?php echo $view->escape($url) ?>"></script>
@@ -432,14 +432,14 @@ done from the template and is relative to the public document root:
432432

433433
.. code-block:: html+jinja
434434

435-
{% javascripts '@AcmeFooBundle/Resources/public/js/*' output='js/compiled/main.js' %}
435+
{% javascripts '@AppBundle/Resources/public/js/*' output='js/compiled/main.js' %}
436436
<script src="{{ asset_url }}"></script>
437437
{% endjavascripts %}
438438
439439
.. code-block:: html+php
440440

441441
<?php foreach ($view['assetic']->javascripts(
442-
array('@AcmeFooBundle/Resources/public/js/*'),
442+
array('@AppBundle/Resources/public/js/*'),
443443
array(),
444444
array('output' => 'js/compiled/main.js')
445445
) as $url): ?>
@@ -555,14 +555,14 @@ some isolated directory (e.g. ``/js/compiled``), to keep things organized:
555555

556556
.. code-block:: html+jinja
557557

558-
{% javascripts '@AcmeFooBundle/Resources/public/js/*' output='js/compiled/main.js' %}
558+
{% javascripts '@AppBundle/Resources/public/js/*' output='js/compiled/main.js' %}
559559
<script src="{{ asset_url }}"></script>
560560
{% endjavascripts %}
561561
562562
.. code-block:: html+php
563563

564564
<?php foreach ($view['assetic']->javascripts(
565-
array('@AcmeFooBundle/Resources/public/js/*'),
565+
array('@AppBundle/Resources/public/js/*'),
566566
array(),
567567
array('output' => 'js/compiled/main.js')
568568
) as $url): ?>

‎cookbook/assetic/jpeg_optimize.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ It can now be used from a template:
5757

5858
.. code-block:: html+jinja
5959

60-
{% image '@AcmeFooBundle/Resources/public/images/example.jpg'
60+
{% image '@AppBundle/Resources/public/images/example.jpg'
6161
filter='jpegoptim' output='/images/example.jpg' %}
6262
<img src="{{ asset_url }}" alt="Example"/>
6363
{% endimage %}
6464

6565
.. code-block:: html+php
6666

6767
<?php foreach ($view['assetic']->image(
68-
array('@AcmeFooBundle/Resources/public/images/example.jpg'),
68+
array('@AppBundle/Resources/public/images/example.jpg'),
6969
array('jpegoptim')
7070
) as $url): ?>
7171
<img src="<?php echo $view->escape($url) ?>" alt="Example"/>
@@ -204,7 +204,7 @@ The Twig template can now be changed to the following:
204204

205205
.. code-block:: html+jinja
206206

207-
<img src="{{ jpegoptim('@AcmeFooBundle/Resources/public/images/example.jpg') }}" alt="Example"/>
207+
<img src="{{ jpegoptim('@AppBundle/Resources/public/images/example.jpg') }}" alt="Example"/>
208208

209209
You can specify the output directory in the config in the following way:
210210

0 commit comments

Comments
 (0)