Skip to content

Commit 543b184

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '3.4' into 4.2
* 3.4: fix indention
2 parents 3fc7d5f + dcda8ce commit 543b184

17 files changed

+83
-83
lines changed

‎cache.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,11 @@ You can also create more customized pools:
230230
231231
<framework:config>
232232
<framework:cache default_memcached_provider="memcached://localhost">
233-
<framework:pool name="custom_thing.cache" adapter="cache.app"/>
234-
<framework:pool name="my_cache_pool" adapter="cache.adapter.array"/>
235-
<framework:pool name="acme.cache" adapter="cache.adapter.memcached"/>
236-
<framework:pool name="foobar.cache" adapter="cache.adapter.memcached" provider="memcached://user:password@example.com"/>
237-
<framework:pool name="short_cache" adapter="foobar.cache" default_lifetime="60"/>
233+
<framework:pool name="custom_thing.cache" adapter="cache.app"/>
234+
<framework:pool name="my_cache_pool" adapter="cache.adapter.array"/>
235+
<framework:pool name="acme.cache" adapter="cache.adapter.memcached"/>
236+
<framework:pool name="foobar.cache" adapter="cache.adapter.memcached" provider="memcached://user:password@example.com"/>
237+
<framework:pool name="short_cache" adapter="foobar.cache" default_lifetime="60"/>
238238
</framework:cache>
239239
</framework:config>
240240
</container>
@@ -335,7 +335,7 @@ and use that when configuring the pool.
335335
336336
<framework:config>
337337
<framework:cache>
338-
<framework:pool name="cache.my_redis" adapter="cache.adapter.redis" provider="app.my_custom_redis_provider"/>
338+
<framework:pool name="cache.my_redis" adapter="cache.adapter.redis" provider="app.my_custom_redis_provider"/>
339339
</framework:cache>
340340
</framework:config>
341341
@@ -413,8 +413,8 @@ case the value needs to be recalculated.
413413
414414
<framework:config>
415415
<framework:cache>
416-
<framework:pool name="my_cache_pool" adapter="app.my_cache_chain_adapter"/>
417-
<framework:pool name="cache.my_redis" adapter="cache.adapter.redis" provider="redis://user:password@example.com"/>
416+
<framework:pool name="my_cache_pool" adapter="app.my_cache_chain_adapter"/>
417+
<framework:pool name="cache.my_redis" adapter="cache.adapter.redis" provider="redis://user:password@example.com"/>
418418
</framework:cache>
419419
</framework:config>
420420

‎components/cache/adapters/proxy_adapter.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ and optionally a namespace and default cache lifetime as its second and third pa
1818
use Psr\Cache\CacheItemPoolInterface;
1919
use Symfony\Component\Cache\Adapter\ProxyAdapter;
2020

21-
\\ create your own cache pool instance that implements the PSR-6
22-
\\ interface `CacheItemPoolInterface`
21+
// create your own cache pool instance that implements
22+
// the PSR-6 CacheItemPoolInterface
2323
$psr6CachePool = ...
2424

2525
$cache = new ProxyAdapter(

‎components/dom_crawler.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -333,31 +333,31 @@ This behavior is best illustrated with examples::
333333

334334
$crawler->filterXPath('//span[contains(@id, "article-")]')->evaluate('substring-after(@id, "-")');
335335
/* array:3 [
336-
0 => "100",
337-
1 => "101",
338-
2 => "102",
336+
0 => "100"
337+
1 => "101"
338+
2 => "102"
339339
]
340-
*/
340+
*/
341341

342342
$crawler->evaluate('substring-after(//span[contains(@id, "article-")]/@id, "-")');
343343
/* array:1 [
344-
0 => "100",
344+
0 => "100"
345345
]
346-
*/
346+
*/
347347

348348
$crawler->filterXPath('//span[@class="article"]')->evaluate('count(@id)');
349349
/* array:3 [
350-
0 => 1.0,
351-
1 => 1.0,
352-
2 => 1.0,
350+
0 => 1.0
351+
1 => 1.0
352+
2 => 1.0
353353
]
354-
*/
354+
*/
355355

356356
$crawler->evaluate('count(//span[@class="article"])');
357357
/* array:1 [
358-
0 => 3.0,
358+
0 => 3.0
359359
]
360-
*/
360+
*/
361361

362362
$crawler->evaluate('//span[1]');
363363
// A Symfony\Component\DomCrawler\Crawler instance

‎components/translation/usage.rst

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -434,19 +434,19 @@ loaded/dumped when using this component inside a Symfony application:
434434
<?xml version="1.0" encoding="UTF-8"?>
435435
<xliff xmlns="urn:oasis:names:tc:xliff:document:2.0" version="2.0"
436436
srcLang="fr-FR" trgLang="en-US">
437-
<file id="messages.en_US">
438-
<unit id="LCa0a2j" name="original-content">
439-
<notes>
440-
<note category="state">new</note>
441-
<note category="approved">true</note>
442-
<note category="section" priority="1">user login</note>
443-
</notes>
444-
<segment>
445-
<source>original-content</source>
446-
<target>translated-content</target>
447-
</segment>
448-
</unit>
449-
</file>
437+
<file id="messages.en_US">
438+
<unit id="LCa0a2j" name="original-content">
439+
<notes>
440+
<note category="state">new</note>
441+
<note category="approved">true</note>
442+
<note category="section" priority="1">user login</note>
443+
</notes>
444+
<segment>
445+
<source>original-content</source>
446+
<target>translated-content</target>
447+
</segment>
448+
</unit>
449+
</file>
450450
</xliff>
451451
452452
When using the standalone Translation component, call the ``setMetadata()``

‎console/command_in_controller.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ Run this command from inside your controller via::
4242
$application->setAutoExit(false);
4343

4444
$input = new ArrayInput([
45-
'command' => 'swiftmailer:spool:send',
46-
// (optional) define the value of command arguments
47-
'fooArgument' => 'barValue',
48-
// (optional) pass options to the command
49-
'--message-limit' => $messages,
45+
'command' => 'swiftmailer:spool:send',
46+
// (optional) define the value of command arguments
47+
'fooArgument' => 'barValue',
48+
// (optional) pass options to the command
49+
'--message-limit' => $messages,
5050
]);
5151

5252
// You can use NullOutput() if you don't need the output

‎event_dispatcher.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,11 @@ listen to the same ``kernel.exception`` event::
160160
{
161161
// return the subscribed events, their methods and priorities
162162
return [
163-
KernelEvents::EXCEPTION => [
164-
['processException', 10],
165-
['logException', 0],
166-
['notifyException', -10],
167-
]
163+
KernelEvents::EXCEPTION => [
164+
['processException', 10],
165+
['logException', 0],
166+
['notifyException', -10],
167+
],
168168
];
169169
}
170170

‎form/dynamic_form_modification.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ how to customize your form based on three common use-cases:
1010
1) :ref:`form-events-underlying-data`
1111

1212
Example: you have a "Product" form and need to modify/add/remove a field
13-
based on the data on the underlying Product being edited.
13+
based on the data on the underlying Product being edited.
1414

1515
2) :ref:`form-events-user-data`
1616

‎form/without_class.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ but here's a short example::
8787
public function buildForm(FormBuilderInterface $builder, array $options)
8888
{
8989
$builder
90-
->add('firstName', TextType::class, [
91-
'constraints' => new Length(['min' => 3]),
92-
])
93-
->add('lastName', TextType::class, [
94-
'constraints' => [
95-
new NotBlank(),
96-
new Length(['min' => 3]),
97-
],
98-
])
90+
->add('firstName', TextType::class, [
91+
'constraints' => new Length(['min' => 3]),
92+
])
93+
->add('lastName', TextType::class, [
94+
'constraints' => [
95+
new NotBlank(),
96+
new Length(['min' => 3]),
97+
],
98+
])
9999
;
100100
}
101101

‎introduction/http_fundamentals.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ like this:
121121
Content-Type: text/html
122122
123123
<html>
124-
<!-- ... HTML for the xkcd comic -->
124+
<!-- ... HTML for the xkcd comic -->
125125
</html>
126126
127127
The HTTP response contains the requested resource (the HTML content in this

‎security/custom_authentication_provider.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -547,10 +547,10 @@ the ``addConfiguration()`` method::
547547

548548
public function addConfiguration(NodeDefinition $node)
549549
{
550-
$node
551-
->children()
552-
->scalarNode('lifetime')->defaultValue(300)
553-
->end();
550+
$node
551+
->children()
552+
->scalarNode('lifetime')->defaultValue(300)
553+
->end();
554554
}
555555
}
556556

‎security/multiple_guard_authenticators.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This is how your security configuration can look in action:
2424
2525
# config/packages/security.yaml
2626
security:
27-
# ...
27+
# ...
2828
firewalls:
2929
default:
3030
anonymous: ~

‎service_container/3.3-di-changes.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -629,10 +629,10 @@ Now you're ready to default all services to be private:
629629
# ...
630630
631631
services:
632-
_defaults:
633-
autowire: true
634-
autoconfigure: true
635-
+ public: false
632+
_defaults:
633+
autowire: true
634+
autoconfigure: true
635+
+ public: false
636636
637637
Thanks to this, any services created in this file cannot be fetched directly from
638638
the container. But, since the old service id's are aliases in a separate file (``legacy_aliases.yaml``),

‎service_container/autowiring.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ Now that you have an interface, you should use this as your type-hint::
279279
{
280280
public function __construct(TransformerInterface $transformer)
281281
{
282-
// ...
282+
// ...
283283
}
284284

285285
// ...

‎service_container/injection_types.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ that accepts the dependency::
124124
.. code-block:: yaml
125125
126126
# config/services.yaml
127-
services:
127+
services:
128128
# ...
129129
130130
app.newsletter_manager:
@@ -199,7 +199,7 @@ Another possibility is setting public fields of the class directly::
199199
.. code-block:: yaml
200200
201201
# config/services.yaml
202-
services:
202+
services:
203203
# ...
204204
205205
app.newsletter_manager:

‎templating/PHP.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,9 +448,9 @@ form is rendered.
448448
'App:Form',
449449
],
450450
],
451-
],
451+
],
452452
453-
// ...
453+
// ...
454454
]);
455455
456456
By default, the PHP engine uses a *div* layout when rendering forms. Some people,

‎templating/global_variables.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ This is possible inside your ``config/packages/twig.yaml`` file:
3939
4040
// config/packages/twig.php
4141
$container->loadFromExtension('twig', [
42-
// ...
43-
'globals' => [
44-
'ga_tracking' => 'UA-xxxxx-x',
45-
],
42+
// ...
43+
'globals' => [
44+
'ga_tracking' => 'UA-xxxxx-x',
45+
],
4646
]);
4747
4848
Now, the variable ``ga_tracking`` is available in all Twig templates:
@@ -95,9 +95,9 @@ system, which lets you isolate or reuse the value:
9595
9696
// config/packages/twig.php
9797
$container->loadFromExtension('twig', [
98-
'globals' => [
99-
'ga_tracking' => '%ga_tracking%',
100-
],
98+
'globals' => [
99+
'ga_tracking' => '%ga_tracking%',
100+
],
101101
]);
102102
103103
The same variable is available exactly as before.
@@ -151,8 +151,8 @@ This should feel familiar, as it's the same syntax you use in service configurat
151151
152152
// config/packages/twig.php
153153
$container->loadFromExtension('twig', [
154-
// ...
155-
'globals' => [
156-
'user_management' => '@App\Service\UserManagement',
157-
],
154+
// ...
155+
'globals' => [
156+
'user_management' => '@App\Service\UserManagement',
157+
],
158158
]);

‎testing/http_authentication.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ firewall, but only in the configuration file used by tests:
4040
<security:config>
4141
<!-- replace 'main' by the name of your own firewall -->
4242
<security:firewall name="main">
43-
<security:http-basic/>
44-
</security:firewall>
43+
<security:http-basic/>
44+
</security:firewall>
4545
</security:config>
4646
4747
.. code-block:: php

0 commit comments

Comments
 (0)