Skip to content

Commit 50f7268

Browse files
committed
Merge branch '3.4' into 4.0
* 3.4: Clean up Clean up
2 parents 967ee2a + 936d239 commit 50f7268

File tree

14 files changed

+10
-18
lines changed

14 files changed

+10
-18
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/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/lock.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ Locks are created and managed in ``Stores``, which are classes that implement
143143
:class:`Symfony\\Component\\Lock\\StoreInterface`. The component includes the
144144
following built-in store types:
145145

146-
147146
============================================ ====== ======== ========
148147
Store Scope Blocking Expiring
149148
============================================ ====== ======== ========

components/phpunit_bridge.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,6 @@ Consider the following example::
493493
}
494494
}
495495

496-
497496
The ``FooTest::test`` method executes every single line of code of both ``Foo``
498497
and ``Bar`` classes, but ``Bar`` is not truly tested. The ``CoverageListener``
499498
aims to fix this behavior by adding the appropriate `@covers`_ annotation on

components/routing.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,6 @@ routes with UTF-8 characters:
417417
418418
return $collection;
419419
420-
421420
In this route, the ``utf8`` option set to ``true`` makes Symfony consider the
422421
``.`` requirement to match any UTF-8 characters instead of just a single
423422
byte character. This means that so the following URLs would match:

components/serializer.rst

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

169-
170169
Deserializing in an Existing Object
171170
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
172171

console.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ as a service, you can use normal dependency injection. Imagine you have a
186186
public function __construct(UserManager $userManager)
187187
{
188188
$this->userManager = $userManager;
189-
189+
190190
parent::__construct();
191191
}
192192

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

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

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

service_container.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,6 @@ But, you can control this and pass in a different logger:
592592
</services>
593593
</container>
594594
595-
596595
.. code-block:: php
597596
598597
// config/services.php

workflow/usage.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,6 @@ See example to make sure no blog post without title is moved to "review"::
359359
}
360360
}
361361

362-
363362
Event Methods
364363
~~~~~~~~~~~~~
365364

0 commit comments

Comments
 (0)