Skip to content

Commit 6878140

Browse files
weaverryanweaverryan
committed
Merge branch '2.0' into 2.1
2 parents 2c2d4ff + 414d3aa commit 6878140

File tree

8 files changed

+58
-43
lines changed

8 files changed

+58
-43
lines changed

‎contributing/code/security.rst

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,23 @@ confirmed, the core-team works on a solution following these steps:
2121

2222
1. Send an acknowledgement to the reporter;
2323
2. Work on a patch;
24-
3. Write a security announcement for the official Symfony `blog`_ about the
24+
3. Get a CVE identifier from mitre.org;
25+
4. Write a security announcement for the official Symfony `blog`_ about the
2526
vulnerability. This post should contain the following information:
2627

2728
* a title that always include the "Security release" string;
2829
* a description of the vulnerability;
2930
* the affected versions;
3031
* the possible exploits;
3132
* how to patch/upgrade/workaround affected applications;
33+
* the CVE identifier;
3234
* credits.
33-
4. Send the patch and the announcement to the reporter for review;
34-
5. Apply the patch to all maintained versions of Symfony;
35-
6. Package new versions for all affected versions;
36-
7. Publish the post on the official Symfony `blog`_ (it must also be added to
35+
5. Send the patch and the announcement to the reporter for review;
36+
6. Apply the patch to all maintained versions of Symfony;
37+
7. Package new versions for all affected versions;
38+
8. Publish the post on the official Symfony `blog`_ (it must also be added to
3739
the "`Security Advisories`_" category);
38-
8. Update the security advisory list (see below).
40+
9. Update the security advisory list (see below).
3941

4042
.. note::
4143

@@ -52,6 +54,7 @@ Security Advisories
5254
This section indexes security vulnerabilities that were fixed in Symfony
5355
releases, starting from Symfony 1.0.0:
5456

57+
* December 20, 2012: `Security release: Symfony 2.0.20 and 2.1.5 <http://symfony.com/blog/security-release-symfony-2-0-20-and-2-1-5-released>`_ (`CVE-2012-6431 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-6431>`_ and `CVE-2012-6432 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-6432>`_)
5558
* November 29, 2012: `Security release: Symfony 2.0.19 and 2.1.4 <http://symfony.com/blog/security-release-symfony-2-0-19-and-2-1-4>`_
5659
* November 25, 2012: `Security release: symfony 1.4.20 released <http://symfony.com/blog/security-release-symfony-1-4-20-released>`_ (`CVE-2012-5574 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5574>`_)
5760
* August 28, 2012: `Security Release: Symfony 2.0.17 released <http://symfony.com/blog/security-release-symfony-2-0-17-released>`_

‎cookbook/bundles/best_practices.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ The end user can provide values in any configuration file:
263263
264264
.. code-block:: ini
265265
266-
; app/config/config.ini
266+
; app/config/parameters.ini
267267
[parameters]
268268
acme_hello.email.from = fabien@example.com
269269

‎cookbook/configuration/external_parameters.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,18 @@ The container also has support for setting PHP constants as parameters. To
9999
take advantage of this feature, map the name of your constant to a parameter
100100
key, and define the type as ``constant``.
101101

102-
.. code-block:: xml
102+
.. code-block:: xml
103103
104-
<?xml version="1.0" encoding="UTF-8"?>
104+
<?xml version="1.0" encoding="UTF-8"?>
105105
106-
<container xmlns="http://symfony.com/schema/dic/services"
107-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
106+
<container xmlns="http://symfony.com/schema/dic/services"
107+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
108108
109-
<parameters>
110-
<parameter key="global.constant.value" type="constant">GLOBAL_CONSTANT</parameter>
111-
<parameter key="my_class.constant.value" type="constant">My_Class::CONSTANT_NAME</parameter>
112-
</parameters>
113-
</container>
109+
<parameters>
110+
<parameter key="global.constant.value" type="constant">GLOBAL_CONSTANT</parameter>
111+
<parameter key="my_class.constant.value" type="constant">My_Class::CONSTANT_NAME</parameter>
112+
</parameters>
113+
</container>
114114
115115
.. note::
116116

‎cookbook/form/form_collections.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,8 @@ into new ``Tag`` objects and added to the ``tags`` property of the ``Task`` obje
425425
and call ``$em->persist($tag)`` on each, you'll receive an error from
426426
Doctrine:
427427

428-
A new entity was found through the relationship 'Acme\TaskBundle\Entity\Task#tags' that was not configured to cascade persist operations for entity...
428+
A new entity was found through the relationship `Acme\TaskBundle\Entity\Task#tags`
429+
that was not configured to cascade persist operations for entity...
429430

430431
To fix this, you may choose to "cascade" the persist operation automatically
431432
from the ``Task`` object to any related tags. To do this, add the ``cascade``

‎cookbook/security/entity_provider.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,9 @@ For more details on each of these, see :class:`Symfony\\Component\\Security\\Cor
200200
Below is an export of my ``User`` table from MySQL. For details on how to
201201
create user records and encode their password, see :ref:`book-security-encoding-user-password`.
202202

203-
.. code-block:: text
203+
.. code-block:: bash
204204
205-
mysql> select * from user;
205+
$ mysql> select * from user;
206206
+----+----------+----------------------------------+------------------------------------------+--------------------+-----------+
207207
| id | username | salt | password | email | is_active |
208208
+----+----------+----------------------------------+------------------------------------------+--------------------+-----------+

‎cookbook/symfony1.rst

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,11 @@ a bundle. With the help of a console command, the ``Resources/public/``
9090
directory of each bundle is copied or symbolically-linked to the ``web/bundles/``
9191
directory. This allows you to keep assets organized inside your bundle, but
9292
still make them available to the public. To make sure that all bundles are
93-
available, run the following command::
93+
available, run the following command:
9494

95-
php app/console assets:install web
95+
.. code-block:: bash
96+
97+
$ php app/console assets:install web
9698
9799
.. note::
98100

@@ -174,16 +176,16 @@ Using the Console
174176
In symfony1, the console is in the root directory of your project and is
175177
called ``symfony``:
176178

177-
.. code-block:: text
179+
.. code-block:: bash
178180
179-
php symfony
181+
$ php symfony
180182
181183
In Symfony2, the console is now in the app sub-directory and is called
182184
``console``:
183185

184-
.. code-block:: text
186+
.. code-block:: bash
185187
186-
php app/console
188+
$ php app/console
187189
188190
Applications
189191
------------
@@ -251,7 +253,9 @@ In symfony1, the ``routing.yml`` and ``app.yml`` configuration files were
251253
automatically loaded inside any plugin. In Symfony2, routing and application
252254
configuration inside a bundle must be included manually. For example, to
253255
include a routing resource from a bundle called ``AcmeDemoBundle``, you can
254-
do the following::
256+
do the following:
257+
258+
.. code-block:: yaml
255259
256260
# app/config/routing.yml
257261
_hello:
@@ -301,4 +305,4 @@ primarily to configure objects that you can use. For more information, see
301305
the chapter titled ":doc:`/book/service_container`".
302306

303307
.. _`Symfony2 Standard`: https://github.com/symfony/symfony-standard
304-
.. _`Composer`: http://getcomposer.org
308+
.. _`Composer`: http://getcomposer.org

‎cookbook/testing/bootstrap.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ with ``tests.bootstrap.php``:
2525
.. code-block:: xml
2626
2727
<!-- app/phpunit.xml.dist -->
28-
bootstrap = "tests.bootstrap.php"
28+
29+
<!-- ... -->
30+
<phpunit
31+
...
32+
bootstrap = "tests.bootstrap.php"
33+
>
2934
3035
Now, you can define in your ``phpunit.xml.dist`` file which environment you want the
3136
cache to be cleared:

‎reference/dic_tags.rst

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -641,26 +641,28 @@ Your custom loader's ``load`` method is responsible for returning a
641641

642642
Now, register your loader as a service and tag it with ``translation.loader``:
643643

644-
.. code-block:: yaml
644+
.. configuration-block::
645+
646+
.. code-block:: yaml
645647
646-
services:
647-
main.translation.my_custom_loader:
648-
class: Acme\MainBundle\Translation\MyCustomLoader
649-
tags:
650-
- { name: translation.loader, alias: bin }
648+
services:
649+
main.translation.my_custom_loader:
650+
class: Acme\MainBundle\Translation\MyCustomLoader
651+
tags:
652+
- { name: translation.loader, alias: bin }
651653
652-
.. code-block:: xml
654+
.. code-block:: xml
653655
654-
<service id="main.translation.my_custom_loader" class="Acme\MainBundle\Translation\MyCustomLoader">
655-
<tag name="translation.loader" alias="bin" />
656-
</service>
656+
<service id="main.translation.my_custom_loader" class="Acme\MainBundle\Translation\MyCustomLoader">
657+
<tag name="translation.loader" alias="bin" />
658+
</service>
657659
658-
.. code-block:: php
660+
.. code-block:: php
659661
660-
$container
661-
->register('main.translation.my_custom_loader', 'Acme\MainBundle\Translation\MyCustomLoader')
662-
->addTag('translation.loader', array('alias' => 'bin'))
663-
;
662+
$container
663+
->register('main.translation.my_custom_loader', 'Acme\MainBundle\Translation\MyCustomLoader')
664+
->addTag('translation.loader', array('alias' => 'bin'))
665+
;
664666
665667
The ``alias`` option is required and very important: it defines the file
666668
"suffix" that will be used for the resource files that use this loader. For

0 commit comments

Comments
 (0)