Skip to content

Commit bb97656

Browse files
committed
Merge branch '2.2' into 2.3
Conflicts: cookbook/security/entity_provider.rst reference/forms/types/options/disabled.rst.inc
2 parents b4938a8 + d42274b commit bb97656

Some content is hidden

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

61 files changed

+137
-133
lines changed

README.markdown

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Contributing
88

99
>**Note**
1010
>Unless you're documenting a feature that's new to a specific version of Symfony
11-
>(e.g. Symfony 2.3), all pull requests must be based off of the **2.2** branch,
11+
>(e.g. Symfony 2.3), all pull requests must be based off of the **2.2** branch,
1212
>**not** the master or 2.3 branch.
1313
1414
We love contributors! For more information on how you can contribute to the
15-
Symfony documentation, please read
16-
[Contributing to the Documentation](http://symfony.com/doc/current/contributing/documentation/overview.html)
15+
Symfony documentation, please read
16+
[Contributing to the Documentation](http://symfony.com/doc/current/contributing/documentation/overview.html)

book/forms.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1360,7 +1360,7 @@ form with many ``Product`` sub-forms). This is done by using the ``collection``
13601360
field type.
13611361
13621362
For more information see the ":doc:`/cookbook/form/form_collections`" cookbook
1363-
entry and the :doc:`collection </reference/forms/types/collection>` field type reference.
1363+
entry and the :doc:`collection </reference/forms/types/collection>` field type reference.
13641364
13651365
.. index::
13661366
single: Forms; Theming

book/installation.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Updating Vendors
135135

136136
At this point, you've downloaded a fully-functional Symfony project in which
137137
you'll start to develop your own application. A Symfony project depends on
138-
a number of external libraries. These are downloaded into the `vendor/` directory
138+
a number of external libraries. These are downloaded into the ``vendor/`` directory
139139
of your project via a library called `Composer`_.
140140

141141
Depending on how you downloaded Symfony, you may or may not need to update

book/page_creation.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ also load specific bundles based on the selected environment. For example,
4242
Symfony2 comes with the WebProfilerBundle (described below), enabled only
4343
in the ``dev`` and ``test`` environments.
4444

45-
Symfony2 comes with two web-accessible front controllers: ``app_dev.php``
45+
Symfony2 comes with two web-accessible front controllers: ``app_dev.php``
4646
provides the ``dev`` environment, and ``app.php`` provides the ``prod`` environment.
4747
All web accesses to Symfony2 normally go through one of these front controllers.
48-
(The ``test`` environment is normally only used when running unit tests, and so
48+
(The ``test`` environment is normally only used when running unit tests, and so
4949
doesn't have a dedicated front controller. The console tool also provides a
5050
front controller that can be used with any environment.)
5151

@@ -555,7 +555,7 @@ You'll learn more about each of these directories in later chapters.
555555

556556
When Symfony is loading, a special file - ``vendor/autoload.php`` - is
557557
included. This file is created by Composer and will autoload all
558-
application files living in the `src/` folder as well as all
558+
application files living in the ``src/`` folder as well as all
559559
third-party libraries mentioned in the ``composer.json`` file.
560560

561561
Because of the autoloader, you never need to worry about using ``include``
@@ -864,7 +864,7 @@ Default Configuration Dump
864864
~~~~~~~~~~~~~~~~~~~~~~~~~~
865865

866866
You can dump the default configuration for a bundle in YAML to the console using
867-
the ``config:dump-reference`` command. Here is an example of dumping the default
867+
the ``config:dump-reference`` command. Here is an example of dumping the default
868868
FrameworkBundle configuration:
869869

870870
.. code-block:: bash

book/propel.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Creating the Database Tables/Schema
134134
Now you have a usable ``Product`` class and all you need to persist it. Of
135135
course, you don't yet have the corresponding ``product`` table in your
136136
database. Fortunately, Propel can automatically create all the database tables
137-
needed for every known model in your application. To do this, run:
137+
needed for every known model in your application. To do this, run:
138138

139139
.. code-block:: bash
140140
@@ -153,7 +153,7 @@ Persisting Objects to the Database
153153
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
154154

155155
Now that you have a ``Product`` object and corresponding ``product`` table,
156-
you're ready to persist data to the database. From inside a controller, this
156+
you're ready to persist data to the database. From inside a controller, this
157157
is pretty easy. Add the following method to the ``DefaultController`` of the
158158
bundle::
159159

@@ -406,7 +406,7 @@ Fetching Related Objects
406406
~~~~~~~~~~~~~~~~~~~~~~~~
407407

408408
When you need to fetch associated objects, your workflow looks just like it did
409-
before. First, fetch a ``$product`` object and then access its related
409+
before. First, fetch a ``$product`` object and then access its related
410410
``Category``::
411411

412412
// ...
@@ -435,7 +435,7 @@ Lifecycle Callbacks
435435
-------------------
436436

437437
Sometimes, you need to perform an action right before or after an object is
438-
inserted, updated, or deleted. These types of actions are known as "lifecycle"
438+
inserted, updated, or deleted. These types of actions are known as "lifecycle"
439439
callbacks or "hooks", as they're callback methods that you need to execute
440440
during different stages of the lifecycle of an object (e.g. the object is
441441
inserted, updated, deleted, etc).

book/templating.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,7 @@ Global Template Variables
10911091
-------------------------
10921092

10931093
During each request, Symfony2 will set a global template variable ``app``
1094-
in both Twig and PHP template engines by default. The ``app`` variable
1094+
in both Twig and PHP template engines by default. The ``app`` variable
10951095
is a :class:`Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables`
10961096
instance which will give you access to some application specific variables
10971097
automatically:

book/testing.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ Redirecting
478478

479479
When a request returns a redirect response, the client does not follow
480480
it automatically. You can examine the response and force a redirection
481-
afterwards with the ``followRedirect()`` method::
481+
afterwards with the ``followRedirect()`` method::
482482

483483
$crawler = $client->followRedirect();
484484

book/validation.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ You could also pass the collection of errors into a template.
169169
return $this->render('AcmeBlogBundle:Author:validate.html.twig', array(
170170
'errors' => $errors,
171171
));
172-
}
172+
}
173173
174174
Inside the template, you can output the list of errors exactly as needed:
175175

components/class_loader/cache_class_loader.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ for a class.
2020

2121
.. note::
2222

23-
Both the ``ApcClassLoader`` and the ``XcacheClassLoader`` can be used
24-
to cache Composer's `autoloader`_.
23+
Both the ``ApcClassLoader`` and the ``XcacheClassLoader`` can be used
24+
to cache Composer's `autoloader`_.
2525

2626
ApcClassLoader
2727
--------------

components/class_loader/class_loader.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@ or one of its children, the autoloader will first look for the class under the
8181
of the prefix registrations is significant in this case.
8282

8383
.. _PEAR: http://pear.php.net/manual/en/standards.naming.php
84-
.. _PSR-0: http://symfony.com/PSR0
84+
.. _PSR-0: http://www.php-fig.org/psr/psr-0/

components/class_loader/map_class_loader.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ an instance of the ``MapClassLoader`` class::
3636
3737
$loader->register();
3838

39-
.. _PSR-0: http://symfony.com/PSR0
39+
.. _PSR-0: http://www.php-fig.org/psr/psr-0/

components/dependency_injection/parameters.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ Constants as Parameters
250250
-----------------------
251251

252252
The container also has support for setting PHP constants as parameters. To
253-
take advantage of this feature, map the name of your constant to a parameter
253+
take advantage of this feature, map the name of your constant to a parameter
254254
key, and define the type as ``constant``.
255255

256256
.. configuration-block::

components/event_dispatcher/introduction.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ EventDispatcher aware Events and Listeners
442442
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
443443

444444
The ``EventDispatcher`` always injects a reference to itself in the passed event
445-
object. This means that all listeners have direct access to the
445+
object. This means that all listeners have direct access to the
446446
``EventDispatcher`` object that notified the listener via the passed ``Event``
447447
object's :method:`Symfony\\Component\\EventDispatcher\\Event::getDispatcher`
448448
method.
@@ -489,7 +489,7 @@ Dispatching another event from within a listener::
489489

490490
While this above is sufficient for most uses, if your application uses multiple
491491
``EventDispatcher`` instances, you might need to specifically inject a known
492-
instance of the ``EventDispatcher`` into your listeners. This could be done
492+
instance of the ``EventDispatcher`` into your listeners. This could be done
493493
using constructor or setter injection as follows:
494494

495495
Constructor injection::

components/filesystem.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Exists
6565
~~~~~~
6666

6767
:method:`Symfony\\Component\\Filesystem\\Filesystem::exists` checks for the
68-
presence of all files or directories and returns false if a file is missing::
68+
presence of all files or directories and returns ``false`` if a file is missing::
6969

7070
// this directory exists, return true
7171
$fs->exists('/tmp/photos');
@@ -222,7 +222,7 @@ isAbsolutePath
222222
~~~~~~~~~~~~~~
223223

224224
:method:`Symfony\\Component\\Filesystem\\Filesystem::isAbsolutePath` returns
225-
``true`` if the given path is absolute, false otherwise::
225+
``true`` if the given path is absolute, ``false`` otherwise::
226226

227227
// return true
228228
$fs->isAbsolutePath('/tmp');

components/finder.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ Restrict files by last modified dates with the
260260

261261
$finder->date('since yesterday');
262262

263-
The comparison operator can be any of the following: ``>``, ``>=``, ``<``, '<=',
264-
'=='. You can also use ``since`` or ``after`` as an alias for ``>``, and
263+
The comparison operator can be any of the following: ``>``, ``>=``, ``<``, ``<=``,
264+
``==``. You can also use ``since`` or ``after`` as an alias for ``>``, and
265265
``until`` or ``before`` as an alias for ``<``.
266266

267267
The target value can be any date supported by the `strtotime`_ function.

components/http_foundation/session_configuration.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ store and retrieve session data, and configuring session behaviour.
1212
Save Handlers
1313
~~~~~~~~~~~~~
1414

15-
The PHP session workflow has 6 possible operations that may occur. The normal
15+
The PHP session workflow has 6 possible operations that may occur. The normal
1616
session follows `open`, `read`, `write` and `close`, with the possibility of
1717
`destroy` and `gc` (garbage collection which will expire any old sessions: `gc`
1818
is called randomly according to PHP's configuration and if called, it is invoked
19-
after the `open` operation). You can read more about this at
19+
after the `open` operation). You can read more about this at
2020
`php.net/session.customhandler`_
2121

2222
Native PHP Save Handlers

components/http_foundation/sessions.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ has a simple API
254254
Adds a flash message to the stack of specified type;
255255

256256
* :method:`Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBagInterface::set`:
257-
Sets flashes by type; This method conveniently takes both singles messages as
257+
Sets flashes by type; This method conveniently takes both singles messages as
258258
a ``string`` or multiple messages in an ``array``.
259259

260260
* :method:`Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBagInterface::get`:

components/http_kernel/introduction.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ The only requirement is that it is a PHP callable - i.e. a function, method
193193
on an object, or a ``Closure``.
194194

195195
But *how* you determine the exact controller for a request is entirely up
196-
to your application. This is the job of the "controller resolver" - a class
196+
to your application. This is the job of the "controller resolver" - a class
197197
that implements :class:`Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface`
198198
and is one of the constructor arguments to ``HttpKernel``.
199199

components/routing/hostname_pattern.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ instance, if you want to match both ``m.example.com`` and
125125
mobile_homepage:
126126
path: /
127127
host: "{subdomain}.example.com"
128-
defaults:
128+
defaults:
129129
_controller: AcmeDemoBundle:Main:mobileHomepage
130130
subdomain: m
131131
requirements:

components/routing/introduction.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ placeholders as regular expressions.
8585
4. An array of options. These contain internal settings for the route and
8686
are the least commonly needed.
8787

88-
5. A host. This is matched against the host of the request. See
88+
5. A host. This is matched against the host of the request. See
8989
:doc:`/components/routing/hostname_pattern` for more details.
9090

9191
6. An array of schemes. These enforce a certain HTTP scheme (``http``, ``https``).

contributing/code/standards.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,6 @@ License
158158
* Symfony is released under the MIT license, and the license block has to be
159159
present at the top of every PHP file, before the namespace.
160160

161-
.. _`PSR-0`: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
162-
.. _`PSR-1`: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-1-basic-coding-standard.md
163-
.. _`PSR-2`: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md
161+
.. _`PSR-0`: http://www.php-fig.org/psr/psr-0/
162+
.. _`PSR-1`: http://www.php-fig.org/psr/psr-1/
163+
.. _`PSR-2`: http://www.php-fig.org/psr/psr-2/

contributing/community/releases.rst

-1
Original file line numberDiff line numberDiff line change
@@ -161,5 +161,4 @@ upgrade.
161161

162162
.. _Git repository: https://github.com/symfony/symfony
163163
.. _SensioLabs: http://sensiolabs.com/
164-
.. _roadmap: http://symfony.com/roadmap
165164
.. _`timeline calculator`: http://symfony.com/roadmap

cookbook/assetic/apply_to_option.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ An example configuration might look like this:
2828
2929
<!-- app/config/config.xml -->
3030
<assetic:config>
31-
<assetic:filter
31+
<assetic:filter
3232
name="coffee"
3333
bin="/usr/bin/coffee/"
3434
node="/usr/bin/node/">
@@ -72,7 +72,7 @@ templates:
7272
<script src="<?php echo $view->escape($url) ?>" type="text/javascript"></script>
7373
<?php endforeach; ?>
7474

75-
This is all that's needed to compile this CoffeeScript file and server it
75+
This is all that's needed to compile this CoffeeScript file and serve it
7676
as the compiled JavaScript.
7777

7878
Filter Multiple Files

cookbook/assetic/asset_management.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ In fact, Assetic has a long list of available filters.
255255

256256
Many of the filters do not do the work directly, but use existing third-party
257257
libraries to do the heavy-lifting. This means that you'll often need to install
258-
a third-party library to use a filter. The great advantage of using Assetic
258+
a third-party library to use a filter. The great advantage of using Assetic
259259
to invoke these libraries (as opposed to using them directly) is that instead
260260
of having to run them manually after you work on the files, Assetic will
261261
take care of this for you and remove this step altogether from your development

cookbook/bundles/best_practices.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -290,4 +290,4 @@ Learn more from the Cookbook
290290

291291
* :doc:`/cookbook/bundles/extension`
292292

293-
.. _standards: http://symfony.com/PSR0
293+
.. _standards: http://www.php-fig.org/psr/psr-0/

0 commit comments

Comments
 (0)