Skip to content

Commit e12cade

Browse files
weaverryanweaverryan
committed
Merge branch '2.0' into 2.1
Conflicts: cookbook/configuration/pdo_session_storage.rst cookbook/symfony1.rst
2 parents 989073d + bc2291b commit e12cade

File tree

18 files changed

+52
-40
lines changed

18 files changed

+52
-40
lines changed

‎book/http_cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ header value::
621621
return $response;
622622
}
623623

624-
// ... do more work to populate the response will the full content
624+
// ... do more work to populate the response with the full content
625625

626626
return $response;
627627
}

‎book/security.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1895,7 +1895,7 @@ setting:
18951895
$container->loadFromExtension('security', array(
18961896
'firewalls' => array(
18971897
'main'=> array(
1898-
...,
1898+
// ...
18991899
'switch_user' => array('role' => 'ROLE_ADMIN', 'parameter' => '_want_to_be_this_user'),
19001900
),
19011901
),

‎book/service_container.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,8 @@ invokes the service container extension inside the ``FrameworkBundle``:
488488
'form' => array(),
489489
'csrf-protection' => array(),
490490
'router' => array('resource' => '%kernel.root_dir%/config/routing.php'),
491-
...,
491+
492+
// ...
492493
));
493494
494495
When the configuration is parsed, the container looks for an extension that

‎book/templating.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,8 @@ configuration file:
10781078
10791079
// app/config/config.php
10801080
$container->loadFromExtension('framework', array(
1081-
...,
1081+
// ...
1082+
10821083
'templating' => array(
10831084
'engines' => array('twig'),
10841085
),

‎components/http_foundation/introduction.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,19 +115,19 @@ methods to retrieve and update its data:
115115
The :class:`Symfony\\Component\\HttpFoundation\\ParameterBag` instance also
116116
has some methods to filter the input values:
117117

118-
* :method:`Symfony\\Component\\HttpFoundation\\Request::getAlpha`: Returns
118+
* :method:`Symfony\\Component\\HttpFoundation\\ParameterBag::getAlpha`: Returns
119119
the alphabetic characters of the parameter value;
120120

121-
* :method:`Symfony\\Component\\HttpFoundation\\Request::getAlnum`: Returns
121+
* :method:`Symfony\\Component\\HttpFoundation\\ParameterBag::getAlnum`: Returns
122122
the alphabetic characters and digits of the parameter value;
123123

124-
* :method:`Symfony\\Component\\HttpFoundation\\Request::getDigits`: Returns
124+
* :method:`Symfony\\Component\\HttpFoundation\\ParameterBag::getDigits`: Returns
125125
the digits of the parameter value;
126126

127-
* :method:`Symfony\\Component\\HttpFoundation\\Request::getInt`: Returns the
127+
* :method:`Symfony\\Component\\HttpFoundation\\ParameterBag::getInt`: Returns the
128128
parameter value converted to integer;
129129

130-
* :method:`Symfony\\Component\\HttpFoundation\\Request::filter`: Filters the
130+
* :method:`Symfony\\Component\\HttpFoundation\\ParameterBag::filter`: Filters the
131131
parameter by using the PHP ``filter_var()`` function.
132132

133133
All getters takes up to three arguments: the first one is the parameter name

‎components/security/authentication.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ receives an array of encoders::
180180
$encoders = array(
181181
'Symfony\\Component\\Security\\Core\\User\\User' => $defaultEncoder,
182182
'Acme\\Entity\\LegacyUser' => $weakEncoder,
183-
...,
183+
184+
// ...
184185
);
185186

186187
$encoderFactory = new EncoderFactory($encoders);

‎components/serializer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ which Encoders and Normalizer are going to be available::
4242
use Symfony\Component\Serializer\Encoder\JsonEncoder;
4343
use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer;
4444

45-
$encoders = array(new XmlEncoder(), new JsonEncoder());
45+
$encoders = array('xml' => new XmlEncoder(), 'json' => new JsonEncoder());
4646
$normalizers = array(new GetSetMethodNormalizer());
4747

4848
$serializer = new Serializer($normalizers, $encoders);

‎contributing/documentation/overview.rst

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,17 +188,10 @@ An example::
188188
}
189189
}
190190

191-
.. note::
192-
193-
* In Yaml you should put a space after ``{`` and before ``}`` (e.g. ``{ _controller: ... }``),
194-
but this should not be done in Twig (e.g. ``{'hello' : 'value'}``).
195-
* An array item is a part of a line, not a complete line. So you should
196-
not use ``// ...`` but ``...,`` (the comma because of the Coding Standards)::
191+
.. caution::
197192

198-
array(
199-
'some value',
200-
...,
201-
)
193+
In Yaml you should put a space after ``{`` and before ``}`` (e.g. ``{ _controller: ... }``),
194+
but this should not be done in Twig (e.g. ``{'hello' : 'value'}``).
202195

203196
Reporting an Issue
204197
------------------

‎cookbook/configuration/environments.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ activated by modifying the default value in the ``dev`` configuration file:
115115
116116
$container->loadFromExtension('web_profiler', array(
117117
'toolbar' => true,
118-
...,
118+
119+
// ...
119120
));
120121
121122
.. index::
@@ -205,9 +206,10 @@ environment by using this code and changing the environment string.
205206
$container->loadFromExtension('doctrine', array(
206207
'dbal' => array(
207208
'logging' => '%kernel.debug%',
208-
...,
209+
210+
// ...
209211
),
210-
...
212+
// ...
211213
));
212214
213215
.. index::

‎cookbook/configuration/pdo_session_storage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ configuration format of your choice):
8888
$container->loadFromExtension('framework', array(
8989
// ...
9090
'session' => array(
91-
...,
91+
// ...,
9292
'handler_id' => 'session.handler.pdo',
9393
),
9494
));

‎cookbook/doctrine/custom_dql_functions.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@ In Symfony, you can register your custom DQL functions as follows:
5959
// app/config/config.php
6060
$container->loadFromExtension('doctrine', array(
6161
'orm' => array(
62-
...,
62+
// ...
63+
6364
'entity_managers' => array(
6465
'default' => array(
65-
...,
66+
// ...
67+
6668
'dql' => array(
6769
'string_functions' => array(
6870
'test_string' => 'Acme\HelloBundle\DQL\StringFunction',

‎cookbook/email/email.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ the power of the `Swiftmailer`_ library.
1616
public function registerBundles()
1717
{
1818
$bundles = array(
19-
...,
19+
// ...
20+
2021
new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
2122
);
2223

‎cookbook/email/spool.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ In order to use the spool with a file, use the following configuration:
8888
8989
// app/config/config.php
9090
$container->loadFromExtension('swiftmailer', array(
91-
...,
91+
// ...
92+
9293
'spool' => array(
9394
'type' => 'file',
9495
'path' => '/path/to/spool',

‎cookbook/form/create_custom_field_type.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ the ``genders`` parameter value as the first argument to its to-be-created
227227
Be sure that the ``alias`` attribute of the tag corresponds with the value
228228
returned by the ``getName`` method defined earlier. You'll see the importance
229229
of this in a moment when you use the custom field type. But first, add a ``__construct``
230-
argument to ``GenderType``, which receives the gender configuration::
230+
method to ``GenderType``, which receives the gender configuration::
231231

232232
// src/Acme/DemoBundle/Form/Type/GenderType.php
233233
namespace Acme\DemoBundle\Form\Type;

‎cookbook/form/form_customization.rst

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,8 @@ form is rendered.
436436
'form' => array('resources' => array(
437437
'AcmeDemoBundle:Form:fields.html.twig',
438438
)),
439-
...,
439+
440+
// ...
440441
));
441442
442443
By default, Twig uses a *div* layout when rendering forms. Some people, however,
@@ -470,7 +471,8 @@ resource to use such a layout:
470471
'form' => array('resources' => array(
471472
'form_table_layout.html.twig',
472473
)),
473-
...,
474+
475+
// ...
474476
));
475477
476478
If you only want to make the change in one template, add the following line to
@@ -525,7 +527,8 @@ form is rendered.
525527
array('resources' => array(
526528
'AcmeDemoBundle:Form',
527529
))),
528-
...,
530+
531+
// ...
529532
));
530533
531534
By default, the PHP engine uses a *div* layout when rendering forms. Some people,
@@ -563,7 +566,8 @@ resource to use such a layout:
563566
array('resources' => array(
564567
'FrameworkBundle:FormTable',
565568
))),
566-
...,
569+
570+
// ...
567571
));
568572
569573
If you only want to make the change in one template, add the following line to

‎cookbook/security/form_login.rst

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ the following config:
7575
$container->loadFromExtension('security', array(
7676
'firewalls' => array(
7777
'main' => array('form_login' => array(
78-
...,
78+
// ...
79+
7980
'default_target_path' => '/admin',
8081
)),
8182
),
@@ -119,7 +120,8 @@ of what URL they had requested previously by setting the
119120
$container->loadFromExtension('security', array(
120121
'firewalls' => array(
121122
'main' => array('form_login' => array(
122-
...,
123+
// ...
124+
123125
'always_use_default_target_path' => true,
124126
)),
125127
),
@@ -161,7 +163,8 @@ this by setting ``use_referer`` to true (it defaults to false):
161163
$container->loadFromExtension('security', array(
162164
'firewalls' => array(
163165
'main' => array('form_login' => array(
164-
...,
166+
// ...
167+
165168
'use_referer' => true,
166169
)),
167170
),
@@ -294,7 +297,8 @@ following config:
294297
$container->loadFromExtension('security', array(
295298
'firewalls' => array(
296299
'main' => array('form_login' => array(
297-
...,
300+
// ...
301+
298302
'failure_path' => login_failure,
299303
)),
300304
),

‎cookbook/security/securing_services.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,8 @@ documentation.
260260
261261
// app/config/config.php
262262
$container->loadFromExtension('jms_security_extra', array(
263-
...,
263+
// ...
264+
264265
'secure_all_services' => true,
265266
));
266267

‎cookbook/templating/PHP.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ your application configuration file:
3838
.. code-block:: php
3939
4040
$container->loadFromExtension('framework', array(
41-
...,
41+
// ...
42+
4243
'templating' => array(
4344
'engines' => array('twig', 'php'),
4445
),

0 commit comments

Comments
 (0)