Skip to content

Commit 6bd7ba2

Browse files
committed
minor #8947 Clean up (carusogabriel)
This PR was squashed before being merged into the 3.3 branch (closes #8947). Discussion ---------- Clean up Following #8945, suggested by @wouterj Commits ------- 29f2d40 Clean up
2 parents aab5c94 + 29f2d40 commit 6bd7ba2

28 files changed

+33
-41
lines changed

components/asset.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ any versioning::
6666
// Absolute path
6767
echo $package->getUrl('/image.png');
6868
// result: /image.png
69-
69+
7070
// Relative path
7171
echo $package->getUrl('image.png');
7272
// result: image.png
@@ -113,7 +113,7 @@ suffix to any asset path::
113113
// Absolute path
114114
echo $package->getUrl('/image.png');
115115
// result: /image.png?v1
116-
116+
117117
// Relative path
118118
echo $package->getUrl('image.png');
119119
// result: image.png?v1
@@ -132,7 +132,7 @@ string as the second argument of the ``StaticVersionStrategy`` constructor::
132132

133133
echo $package->getUrl('/image.png');
134134
// result: /v1/image.png
135-
135+
136136
echo $package->getUrl('image.png');
137137
// result: v1/image.png
138138

@@ -183,7 +183,7 @@ that path over and over again::
183183

184184
echo $package->getUrl('logo.png');
185185
// result: /static/images/logo.png?v1
186-
186+
187187
// Base path is ignored when using absolute paths
188188
echo $package->getUrl('/logo.png');
189189
// result: /logo.png?v1

components/cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Now you can create, retrieve, update and delete items using this object::
7878

7979
// remove the cache key
8080
$cache->delete('stats.num_products');
81-
81+
8282
// clear *all* cache keys
8383
$cache->clear();
8484

components/cache/adapters/pdo_doctrine_dbal_adapter.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ PDO & Doctrine DBAL Cache Adapter
1111

1212
The PDO & Doctrine DBAL adapter was introduced in Symfony 3.2.
1313

14-
1514
This adapter stores the cache items in an SQL database. It requires a `PDO`_,
1615
`Doctrine DBAL Connection`_, or `Data Source Name (DSN)`_ as its first parameter, and
1716
optionally a namespace, default cache lifetime, and options array as its second,

components/cache/cache_pools.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ when all items are successfully deleted)::
130130
.. code-block:: terminal
131131
132132
$ php bin/console cache:pool:clear <cache-pool-name>
133-
133+
134134
# clears the "cache.app" pool
135135
$ php bin/console cache:pool:clear cache.app
136136

components/cache/psr6_psr16_adapters.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ this use-case::
4444

4545
// a PSR-6 cache that uses your cache internally!
4646
$psr6Cache = new SimpleCacheAdapter($psr16Cache);
47-
47+
4848
// now use this wherever you want
4949
$githubApiClient = new GitHubApiClient($psr6Cache);
5050

@@ -81,6 +81,6 @@ this use-case::
8181

8282
// a PSR-16 cache that uses your cache internally!
8383
$psr16Cache = new Psr6Cache($psr6Cache);
84-
84+
8585
// now use this wherever you want
8686
$githubApiClient = new GitHubApiClient($psr16Cache);

components/filesystem.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ The Filesystem Component
66

77
The Filesystem component provides basic utilities for the filesystem.
88

9-
109
Installation
1110
------------
1211

components/phpunit_bridge.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ Modified PHPUnit script
415415
-----------------------
416416

417417
.. versionadded:: 3.2
418-
This modified PHPUnit script was introduced in the 3.2 version of
418+
This modified PHPUnit script was introduced in the 3.2 version of
419419
this component.
420420

421421
This bridge provides a modified version of PHPUnit that you can call by using
@@ -448,7 +448,7 @@ If you have installed the bridge through Composer, you can run it by calling e.g
448448

449449
.. tip::
450450

451-
If you still need to use ``prophecy`` (but not ``symfony/yaml``),
451+
If you still need to use ``prophecy`` (but not ``symfony/yaml``),
452452
then set the ``SYMFONY_PHPUNIT_REMOVE`` env var to ``symfony/yaml``.
453453

454454
.. _PHPUnit: https://phpunit.de

components/routing.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,6 @@ routes with UTF-8 characters:
425425
426426
return $collection;
427427
428-
429428
In this route, the ``utf8`` option set to ``true`` makes Symfony consider the
430429
``.`` requirement to match any UTF-8 characters instead of just a single
431430
byte character. This means that so the following URLs would match:
@@ -508,7 +507,7 @@ You can also include UTF-8 strings as routing requirements:
508507
// ...
509508
510509
return $collection;
511-
510+
512511
.. tip::
513512

514513
In addition to UTF-8 characters, the Routing component also supports all

components/serializer.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ an exception when additional attributes are passed::
170170
'allow_extra_attributes' => false,
171171
));
172172

173-
174173
Deserializing in an Existing Object
175174
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
176175

components/var_dumper/advanced.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,9 @@ method::
202202
Support for passing display options to the ``dump()`` method was introduced
203203
in Symfony 3.2.
204204

205-
The output format of a dumper can be fine tuned by the two flags
205+
The output format of a dumper can be fine tuned by the two flags
206206
``DUMP_STRING_LENGTH`` and ``DUMP_LIGHT_ARRAY`` which are passed as a bitmap
207-
in the third constructor argument. They can also be set via environment
207+
in the third constructor argument. They can also be set via environment
208208
variables when using
209209
:method:`assertDumpEquals($dump, $data, $message) <Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait::assertDumpEquals>`
210210
during unit testing.

controller.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ controller's service config:
324324
325325
// app/config/services.php
326326
use AppBundle\Controller\LuckyController;
327-
327+
328328
$container->register(LuckyController::class)
329329
->setPublic(true)
330330
->addTag('controller.service_arguments', [

controller/service.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ syntax:
2828
2929
// src/AppBundle/Controller/HelloController.php
3030
// ...
31-
31+
3232
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
3333
3434
/**

create_framework/event_dispatcher.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ the registration of a listener for the ``response`` event::
138138

139139
$response->setContent($response->getContent().'GA CODE');
140140
});
141-
141+
142142
$controllerResolver = new ControllerResolver();
143143
$argumentResolver = new ArgumentResolver();
144144

form/create_form_type_extension.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ type (``FileType``) is built. Let's see an example next.
115115

116116
.. tip::
117117

118-
There is an optional tag attribute called ``priority``, which
119-
defaults to ``0`` and controls the order in which the form
120-
type extensions are loaded (the higher the priority, the earlier
121-
an extension is loaded). This is useful when you need to guarantee
118+
There is an optional tag attribute called ``priority``, which
119+
defaults to ``0`` and controls the order in which the form
120+
type extensions are loaded (the higher the priority, the earlier
121+
an extension is loaded). This is useful when you need to guarantee
122122
that one extension is loaded before or after another extension.
123123

124124
.. versionadded:: 3.2

frontend/encore/babel.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Need to extend the Babel configuration further? The easiest way is via
1515
1616
Encore
1717
// ...
18-
18+
1919
// first, install any presets you want to use (e.g. yarn add babel-preset-es2017)
2020
// then, modify the default Babel configuration
2121
.configureBabel(function(babelConfig) {

frontend/encore/custom-loaders-plugins.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ to use the `IgnorePlugin`_ (see `moment/moment#2373`_):
5252
5353
// webpack.config.js
5454
+ var webpack = require('webpack');
55-
55+
5656
Encore
5757
// ...
5858

quick_tour/the_controller.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ And you can display the flash message in the template like this:
335335
{% endfor %}
336336

337337
.. versionadded:: 3.3
338-
The ``app.flashes()`` Twig function was introduced in Symfony 3.3. Prior,
338+
The ``app.flashes()`` Twig function was introduced in Symfony 3.3. Prior,
339339
you had to use ``app.session.flashBag()``.
340340

341341
Final Thoughts

reference/configuration/doctrine.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ Full Default Configuration
272272
</doctrine:config>
273273
</container>
274274
275-
276275
.. index::
277276
single: Configuration; Doctrine DBAL
278277
single: Doctrine; DBAL configuration

reference/forms/types/choice.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ would replace the ``choices`` option.
188188
The :class:`Symfony\\Component\\Form\\ChoiceList\\Loader\\CallbackChoiceLoader`
189189
was introduced in Symfony 3.2.
190190

191-
You can use an instance of :class:`Symfony\\Component\\Form\\ChoiceList\\Loader\\CallbackChoiceLoader`
191+
You can use an instance of :class:`Symfony\\Component\\Form\\ChoiceList\\Loader\\CallbackChoiceLoader`
192192
if you want to take advantage of lazy loading::
193193

194194
use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader;

security/custom_authentication_provider.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,13 +255,13 @@ the ``PasswordDigest`` header value matches with the user's password::
255255

256256
// Try to fetch the cache item from pool
257257
$cacheItem = $this->cachePool->getItem(md5($nonce));
258-
258+
259259
// Validate that the nonce is *not* in cache
260260
// if it is, this could be a replay attack
261261
if ($cacheItem->isHit()) {
262262
throw new NonceExpiredException('Previously used nonce detected');
263263
}
264-
264+
265265
// Store the item in cache for 5 minutes
266266
$cacheItem->set(null)->expiresAfter(300);
267267
$this->cachePool->save($cacheItem);

security/guard_authentication.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,11 +503,11 @@ and add the following logic::
503503
public function getCredentials(Request $request)
504504
{
505505
$csrfToken = $request->request->get('_csrf_token');
506-
506+
507507
if (false === $this->csrfTokenManager->isTokenValid(new CsrfToken('authenticate', $csrfToken))) {
508508
throw new InvalidCsrfTokenException('Invalid CSRF token.');
509509
}
510-
510+
511511
// ... all your normal logic
512512
}
513513

serializer/custom_encoders.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Registering it in your app
5353

5454
If you use the Symfony Framework. then you probably want to register this encoder
5555
as a service in your app. If you're using the :ref:`default services.yml configuration <service-container-services-load-example>`,
56-
that's done automatically!
56+
that's done automatically!
5757

5858
.. tip::
5959

service_container.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,6 @@ But, you can control this and pass in a different logger:
668668
</services>
669669
</container>
670670
671-
672671
.. code-block:: php
673672
674673
// app/config/services.php

service_container/3.3-di-changes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ The third big change is that, in a new Symfony 3.3 project, your controllers are
373373
// app/config/services.php
374374
375375
// ...
376-
376+
377377
$definition->addTag('controller.service_arguments');
378378
$this->registerClasses($definition, 'AppBundle\\Controller\\', '../../src/AppBundle/Controller/*');
379379

service_container/configurators.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ all the classes are already loaded as services. All you need to do is specify th
184184
$container->getDefinition(GreetingCardManager::class)
185185
->setConfigurator(array(new Reference(EmailConfigurator::class), 'configure'));
186186
187-
188187
.. versionadded:: 3.2
189188
The ``service_id:method_name`` syntax for the YAML configuration format
190189
was introduced in Symfony 3.2.

service_container/factories.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Configuration of the service container then looks like this:
153153
# app/config/services.yml
154154
155155
app.newsletter_manager:
156-
class: AppBundle\Email\NewsletterManager
156+
class: AppBundle\Email\NewsletterManager
157157
# new syntax
158158
factory: 'AppBundle\Email\NewsletterManagerFactory:createNewsletterManager'
159159
# old syntax

session/avoid_session_start.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ access the flash messages:
3838
{% endif %}
3939

4040
.. versionadded:: 3.3
41-
The ``app.flashes()`` Twig function was introduced in Symfony 3.3. Prior,
41+
The ``app.flashes()`` Twig function was introduced in Symfony 3.3. Prior,
4242
you had to use ``app.session.flashBag()``.

workflow/usage.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ order:
233233
``workflow.entered``
234234

235235
Similar to ``workflow.enter``, except the marking store is updated before this
236-
event (making it a good place to flush data in Doctrine).
236+
event (making it a good place to flush data in Doctrine).
237237

238238
The three events being dispatched are:
239239

@@ -325,7 +325,6 @@ See example to make sure no blog post without title is moved to "review"::
325325
}
326326
}
327327

328-
329328
Event Methods
330329
~~~~~~~~~~~~~
331330

0 commit comments

Comments
 (0)