Skip to content

Commit 8ef95c2

Browse files
weaverryanweaverryan
committed
Merge branch '2.2' into 2.3
Conflicts: components/dom_crawler.rst components/locale.rst
2 parents 5870a86 + 7a24037 commit 8ef95c2

33 files changed

+96
-74
lines changed

‎book/http_cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ example).
535535
The 304 status code means "Not Modified". It's important because with
536536
this status code the response does *not* contain the actual content being
537537
requested. Instead, the response is simply a light-weight set of directions that
538-
tell cache that it should use its stored version.
538+
tells the cache that it should use its stored version.
539539

540540
Like with expiration, there are two different HTTP headers that can be used
541541
to implement the validation model: ``ETag`` and ``Last-Modified``.

‎book/internals.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,10 @@ and set a new ``Exception`` object, or do nothing::
421421
array('X-Status-Code' => 200)
422422
);
423423

424+
.. seealso::
425+
426+
Read more on the :ref:`kernel.exception event <component-http-kernel-kernel-exception>`.
427+
424428
.. index::
425429
single: Event Dispatcher
426430

@@ -431,10 +435,6 @@ The event dispatcher is a standalone component that is responsible for much
431435
of the underlying logic and flow behind a Symfony request. For more information,
432436
see the :doc:`Event Dispatcher Component Documentation </components/event_dispatcher/introduction>`.
433437

434-
.. seealso::
435-
436-
Read more on the :ref:`kernel.exception event <component-http-kernel-kernel-exception>`.
437-
438438
.. index::
439439
single: Profiler
440440

@@ -589,20 +589,20 @@ the configuration for the development environment:
589589
590590
// load the profiler
591591
$container->loadFromExtension('framework', array(
592-
'profiler' => array('only-exceptions' => false),
592+
'profiler' => array('only_exceptions' => false),
593593
));
594594
595595
// enable the web profiler
596596
$container->loadFromExtension('web_profiler', array(
597597
'toolbar' => true,
598-
'intercept-redirects' => true,
598+
'intercept_redirects' => true,
599599
'verbose' => true,
600600
));
601601
602-
When ``only-exceptions`` is set to ``true``, the profiler only collects data
602+
When ``only_exceptions`` is set to ``true``, the profiler only collects data
603603
when an exception is thrown by the application.
604604

605-
When ``intercept-redirects`` is set to ``true``, the web profiler intercepts
605+
When ``intercept_redirects`` is set to ``true``, the web profiler intercepts
606606
the redirects and gives you the opportunity to look at the collected data
607607
before following the redirect.
608608

@@ -640,7 +640,7 @@ If you enable the web profiler, you also need to mount the profiler routes:
640640
);
641641
642642
As the profiler adds some overhead, you might want to enable it only under
643-
certain circumstances in the production environment. The ``only-exceptions``
643+
certain circumstances in the production environment. The ``only_exceptions``
644644
settings limits profiling to 500 pages, but what if you want to get
645645
information when the client IP comes from a specific address, or for a limited
646646
portion of the website? You can use a Profiler Matcher, learn more about that

‎book/security.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,10 +373,10 @@ submission (i.e. ``/login_check``):
373373
374374
# app/config/routing.yml
375375
login:
376-
pattern: /login
376+
path: /login
377377
defaults: { _controller: AcmeSecurityBundle:Security:login }
378378
login_check:
379-
pattern: /login_check
379+
path: /login_check
380380
381381
.. code-block:: xml
382382
@@ -387,11 +387,11 @@ submission (i.e. ``/login_check``):
387387
xsi:schemaLocation="http://symfony.com/schema/routing
388388
http://symfony.com/schema/routing/routing-1.0.xsd">
389389
390-
<route id="login" pattern="/login">
390+
<route id="login" path="/login">
391391
<default key="_controller">AcmeSecurityBundle:Security:login</default>
392392
</route>
393393
394-
<route id="login_check" pattern="/login_check" />
394+
<route id="login_check" path="/login_check" />
395395
</routes>
396396
397397
.. code-block:: php

‎book/translation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ locale via routing.
534534
Fallback and Default Locale
535535
~~~~~~~~~~~~~~~~~~~~~~~~~~~
536536

537-
If the locale hasn't been set explicitly in the session, the ``fallback_locale``
537+
If the locale hasn't been set explicitly in the session, the ``fallback``
538538
configuration parameter will be used by the ``Translator``. The parameter
539539
defaults to ``en`` (see `Configuration`_).
540540

‎components/class_loader/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ Installation
3232

3333
You can install the component in 2 different ways:
3434

35-
* Use the official Git repository (https://github.com/symfony/ClassLoader);
3635
* :doc:`Install it via Composer </components/using_components>` (``symfony/class-loader``
37-
on `Packagist`_).
36+
on `Packagist`_);
37+
* Use the official Git repository (https://github.com/symfony/ClassLoader).
3838

3939
.. _`autoloading mechanism`: http://php.net/manual/en/language.oop5.autoload.php
4040
.. _Packagist: https://packagist.org/packages/symfony/class-loader

‎components/config/definition.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -568,8 +568,8 @@ Otherwise the result is a clean array of configuration values::
568568
$configs = array($config1, $config2);
569569

570570
$processor = new Processor();
571-
$configuration = new DatabaseConfiguration;
571+
$configuration = new DatabaseConfiguration();
572572
$processedConfiguration = $processor->processConfiguration(
573573
$configuration,
574-
$configs)
575-
;
574+
$configs
575+
);

‎components/config/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Installation
1717

1818
You can install the component in 2 different ways:
1919

20-
* Use the official Git repository (https://github.com/symfony/Config);
21-
* :doc:`Install it via Composer </components/using_components>` (``symfony/config`` on `Packagist`_).
20+
* :doc:`Install it via Composer </components/using_components>` (``symfony/config`` on `Packagist`_);
21+
* Use the official Git repository (https://github.com/symfony/Config).
2222

2323
Sections
2424
--------

‎components/console/helpers/dialoghelper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ You can also ask and validate a hidden response::
159159

160160
$password = $dialog->askHiddenResponseAndValidate(
161161
$output,
162-
'Please enter the name of the widget',
162+
'Please enter your password',
163163
$validator,
164164
20,
165165
false

‎components/console/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Installation
1717

1818
You can install the component in 2 different ways:
1919

20-
* Use the official Git repository (https://github.com/symfony/Console);
21-
* :doc:`Install it via Composer </components/using_components>` (``symfony/console`` on `Packagist`_).
20+
* :doc:`Install it via Composer </components/using_components>` (``symfony/console`` on `Packagist`_);
21+
* Use the official Git repository (https://github.com/symfony/Console).
2222

2323
.. note::
2424

‎components/css_selector.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ Installation
1212

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

15-
* Use the official Git repository (https://github.com/symfony/CssSelector);
16-
* :doc:`Install it via Composer </components/using_components>` (``symfony/css-selector`` on `Packagist`_).
15+
* :doc:`Install it via Composer </components/using_components>` (``symfony/css-selector`` on `Packagist`_);
16+
* Use the official Git repository (https://github.com/symfony/CssSelector).
1717

1818
Usage
1919
-----

‎components/dependency_injection/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Installation
1616

1717
You can install the component in 2 different ways:
1818

19-
* Use the official Git repository (https://github.com/symfony/DependencyInjection);
20-
* :doc:`Install it via Composer </components/using_components>` (``symfony/dependency-injection`` on `Packagist`_).
19+
* :doc:`Install it via Composer </components/using_components>` (``symfony/dependency-injection`` on `Packagist`_);
20+
* Use the official Git repository (https://github.com/symfony/DependencyInjection).
2121

2222
Basic Usage
2323
-----------

‎components/dom_crawler.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Installation
1717

1818
You can install the component in 2 different ways:
1919

20-
* Use the official Git repository (https://github.com/symfony/DomCrawler);
21-
* :doc:`Install it via Composer </components/using_components>` (``symfony/dom-crawler`` on `Packagist`_).
20+
* :doc:`Install it via Composer </components/using_components>` (``symfony/dom-crawler`` on `Packagist`_);
21+
* Use the official Git repository (https://github.com/symfony/DomCrawler).
2222

2323
Usage
2424
-----
@@ -162,7 +162,7 @@ Call an anonymous function on each node of the list::
162162
are passed a ``Crawler`` as the first argument. Previously, that argument
163163
was a :phpclass:`DOMNode`.
164164

165-
The anonymous function receives the position and the node (as a Crawler) as arguments.
165+
The anonymous function receives the node (as a Crawler) and the position as arguments.
166166
The result is an array of values returned by the anonymous function calls.
167167

168168
Adding the Content

‎components/event_dispatcher/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ Installation
4949

5050
You can install the component in 2 different ways:
5151

52-
* Use the official Git repository (https://github.com/symfony/EventDispatcher);
53-
* :doc:`Install it via Composer </components/using_components>` (``symfony/event-dispatcher`` on `Packagist`_).
52+
* :doc:`Install it via Composer </components/using_components>` (``symfony/event-dispatcher`` on `Packagist`_);
53+
* Use the official Git repository (https://github.com/symfony/EventDispatcher).
5454

5555
Usage
5656
-----

‎components/filesystem.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Installation
1111

1212
You can install the component in 2 different ways:
1313

14-
* Use the official Git repository (https://github.com/symfony/Filesystem);
15-
* :doc:`Install it via Composer </components/using_components>` (``symfony/filesystem`` on `Packagist`_).
14+
* :doc:`Install it via Composer </components/using_components>` (``symfony/filesystem`` on `Packagist`_);
15+
* Use the official Git repository (https://github.com/symfony/Filesystem).
1616

1717
Usage
1818
-----

‎components/finder.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Installation
1313

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

16-
* Use the official Git repository (https://github.com/symfony/Finder);
17-
* :doc:`Install it via Composer </components/using_components>` (``symfony/finder`` on `Packagist`_).
16+
* :doc:`Install it via Composer </components/using_components>` (``symfony/finder`` on `Packagist`_);
17+
* Use the official Git repository (https://github.com/symfony/Finder).
1818

1919
Usage
2020
-----

‎components/form/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Installation
1919

2020
You can install the component in 2 different ways:
2121

22-
* Use the official Git repository (https://github.com/symfony/Form);
23-
* :doc:`Install it via Composer </components/using_components>` (``symfony/form`` on `Packagist`_).
22+
* :doc:`Install it via Composer </components/using_components>` (``symfony/form`` on `Packagist`_);
23+
* Use the official Git repository (https://github.com/symfony/Form).
2424

2525
Configuration
2626
-------------

‎components/http_foundation/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ Installation
2121

2222
You can install the component in 2 different ways:
2323

24-
* Use the official Git repository (https://github.com/symfony/HttpFoundation);
25-
* :doc:`Install it via Composer </components/using_components>` (``symfony/http-foundation`` on `Packagist`_).
24+
* :doc:`Install it via Composer </components/using_components>` (``symfony/http-foundation`` on `Packagist`_);
25+
* Use the official Git repository (https://github.com/symfony/HttpFoundation).
2626

2727
.. _component-http-foundation-request:
2828

‎components/http_kernel/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Installation
1616

1717
You can install the component in 2 different ways:
1818

19-
* Use the official Git repository (https://github.com/symfony/HttpKernel);
20-
* :doc:`Install it via Composer </components/using_components>` (``symfony/http-kernel`` on Packagist_).
19+
* :doc:`Install it via Composer </components/using_components>` (``symfony/http-kernel`` on Packagist_);
20+
* Use the official Git repository (https://github.com/symfony/HttpKernel).
2121

2222
The Workflow of a Request
2323
-------------------------

‎components/options_resolver.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Installation
1313

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

16-
* Use the official Git repository (https://github.com/symfony/OptionsResolver
17-
* :doc:`Install it via Composer </components/using_components>` (``symfony/options-resolver`` on `Packagist`_)
16+
* :doc:`Install it via Composer </components/using_components>` (``symfony/options-resolver`` on `Packagist`_);
17+
* Use the official Git repository (https://github.com/symfony/OptionsResolver).
1818

1919
Usage
2020
-----

‎components/process.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ Installation
1212

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

15-
* Use the official Git repository (https://github.com/symfony/Process);
16-
* :doc:`Install it via Composer </components/using_components>` (``symfony/process`` on `Packagist`_).
15+
* :doc:`Install it via Composer </components/using_components>` (``symfony/process`` on `Packagist`_);
16+
* Use the official Git repository (https://github.com/symfony/Process).
1717

1818
Usage
1919
-----

‎components/property_access/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Installation
1717

1818
You can install the component in two different ways:
1919

20-
* Use the official Git repository (https://github.com/symfony/PropertyAccess);
21-
* :doc:`Install it via Composer</components/using_components>` (``symfony/property-access`` on `Packagist`_).
20+
* :doc:`Install it via Composer</components/using_components>` (``symfony/property-access`` on `Packagist`_);
21+
* Use the official Git repository (https://github.com/symfony/PropertyAccess).
2222

2323
Usage
2424
-----

‎components/routing/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Installation
1313

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

16-
* Use the official Git repository (https://github.com/symfony/Routing);
17-
* :doc:`Install it via Composer </components/using_components>` (``symfony/routing`` on `Packagist`_).
16+
* :doc:`Install it via Composer </components/using_components>` (``symfony/routing`` on `Packagist`_);
17+
* Use the official Git repository (https://github.com/symfony/Routing).
1818

1919
Usage
2020
-----

‎components/security/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Installation
1919

2020
You can install the component in 2 different ways:
2121

22-
* Use the official Git repository (https://github.com/symfony/Security);
23-
* :doc:`Install it via Composer </components/using_components>` (``symfony/security`` on Packagist_).
22+
* :doc:`Install it via Composer </components/using_components>` (``symfony/security`` on Packagist_);
23+
* Use the official Git repository (https://github.com/symfony/Security).
2424

2525
Sections
2626
--------

‎components/serializer.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Installation
3030

3131
You can install the component in 2 different ways:
3232

33-
* Use the official Git repository (https://github.com/symfony/Serializer);
34-
* :doc:`Install it via Composer </components/using_components>` (``symfony/serializer`` on `Packagist`_).
33+
* :doc:`Install it via Composer </components/using_components>` (``symfony/serializer`` on `Packagist`_);
34+
* Use the official Git repository (https://github.com/symfony/Serializer).
3535

3636
Usage
3737
-----

‎components/stopwatch.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Installation
1616

1717
You can install the component in two different ways:
1818

19-
* Use the official Git repository (https://github.com/symfony/Stopwatch);
20-
* :doc:`Install it via Composer</components/using_components>` (``symfony/stopwatch`` on `Packagist`_).
19+
* :doc:`Install it via Composer</components/using_components>` (``symfony/stopwatch`` on `Packagist`_);
20+
* Use the official Git repository (https://github.com/symfony/Stopwatch).
2121

2222
Usage
2323
-----

‎components/templating/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Installation
1818

1919
You can install the component in 2 different ways:
2020

21-
* Use the official Git repository (https://github.com/symfony/Templating);
22-
* :doc:`Install it via Composer </components/using_components>` (``symfony/templating`` on `Packagist`_).
21+
* :doc:`Install it via Composer </components/using_components>` (``symfony/templating`` on `Packagist`_);
22+
* Use the official Git repository (https://github.com/symfony/Templating).
2323

2424
Usage
2525
-----

‎components/yaml/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ Installation
3131

3232
You can install the component in 2 different ways:
3333

34-
* Use the official Git repository (https://github.com/symfony/Yaml);
35-
* :doc:`Install it via Composer </components/using_components>` (``symfony/yaml`` on `Packagist`_).
34+
* :doc:`Install it via Composer </components/using_components>` (``symfony/yaml`` on `Packagist`_);
35+
* Use the official Git repository (https://github.com/symfony/Yaml).
3636

3737
Why?
3838
----

‎contributing/code/standards.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ example containing most features described below:
5858
private function transformText($dummy, array $options = array())
5959
{
6060
$mergedOptions = array_merge(
61-
$options,
6261
array(
6362
'some_default' => 'values',
6463
'another_default' => 'more values',
65-
)
64+
),
65+
$options
6666
);
6767
6868
if (true === $dummy) {

‎reference/constraints/Ip.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Basic Usage
2727
Acme\BlogBundle\Entity\Author:
2828
properties:
2929
ipAddress:
30-
- Ip:
30+
- Ip: ~
3131
3232
.. code-block:: php-annotations
3333

‎reference/constraints/Language.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Basic Usage
2424
Acme\UserBundle\Entity\User:
2525
properties:
2626
preferredLanguage:
27-
- Language:
27+
- Language: ~
2828
2929
.. code-block:: php-annotations
3030

0 commit comments

Comments
 (0)