Skip to content

Commit 6a15077

Browse files
committed
minor #4874 Remove trailing whitespace (WouterJ)
This PR was merged into the 2.3 branch. Discussion ---------- Remove trailing whitespace | Q | A | --- | --- | Doc fix? | yes | New docs? | no | Applies to | all | Fixed tickets | - Commits ------- 98bd7ba Remove trailing whitespace
2 parents 80bef5a + 98bd7ba commit 6a15077

25 files changed

+70
-70
lines changed

book/controller.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ Symfony will automatically return a 500 HTTP response code.
556556
throw new \Exception('Something went wrong!');
557557
558558
In every case, an error page is shown to the end user and a full debug
559-
error page is shown to the developer (i.e. when you're using ``app_dev.php`` -
559+
error page is shown to the developer (i.e. when you're using ``app_dev.php`` -
560560
see :ref:`page-creation-environments`).
561561

562562
You'll want to customize the error page your user sees. To do that, see the

book/from_flat_php_to_symfony2.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ the layout:
244244

245245
<?php include 'layout.php' ?>
246246

247-
You now have a setup that will allow you to reuse the layout.
247+
You now have a setup that will allow you to reuse the layout.
248248
Unfortunately, to accomplish this, you're forced to use a few ugly
249249
PHP functions (``ob_start()``, ``ob_get_clean()``) in the template. Symfony
250250
uses a Templating component that allows this to be accomplished cleanly

book/http_cache.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,8 @@ won't be asked to return the updated response until the cache finally becomes
538538
stale.
539539

540540
The validation model addresses this issue. Under this model, the cache continues
541-
to store responses. The difference is that, for each request, the cache asks the
542-
application if the cached response is still valid or if it needs to be regenerated.
541+
to store responses. The difference is that, for each request, the cache asks the
542+
application if the cached response is still valid or if it needs to be regenerated.
543543
If the cache *is* still valid, your application should return a 304 status code
544544
and no content. This tells the cache that it's ok to return the cached response.
545545

book/service_container.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ the service container gives you a much more appealing option:
611611
services:
612612
my_mailer:
613613
# ...
614-
614+
615615
newsletter_manager:
616616
class: Acme\HelloBundle\Newsletter\NewsletterManager
617617
arguments: ["@my_mailer"]
@@ -696,7 +696,7 @@ Injecting the dependency by the setter method just needs a change of syntax:
696696
services:
697697
my_mailer:
698698
# ...
699-
699+
700700
newsletter_manager:
701701
class: Acme\HelloBundle\Newsletter\NewsletterManager
702702
calls:
@@ -731,7 +731,7 @@ Injecting the dependency by the setter method just needs a change of syntax:
731731
use Symfony\Component\DependencyInjection\Reference;
732732
733733
$container->setDefinition('my_mailer', ...);
734-
734+
735735
$container->setDefinition('newsletter_manager', new Definition(
736736
'Acme\HelloBundle\Newsletter\NewsletterManager'
737737
))->addMethodCall('setMailer', array(
@@ -777,7 +777,7 @@ it exists and do nothing if it doesn't:
777777
<service id="my_mailer">
778778
<!-- ... -->
779779
</service>
780-
780+
781781
<service id="newsletter_manager" class="Acme\HelloBundle\Newsletter\NewsletterManager">
782782
<argument type="service" id="my_mailer" on-invalid="ignore" />
783783
</service>
@@ -792,7 +792,7 @@ it exists and do nothing if it doesn't:
792792
use Symfony\Component\DependencyInjection\ContainerInterface;
793793
794794
$container->setDefinition('my_mailer', ...);
795-
795+
796796
$container->setDefinition('newsletter_manager', new Definition(
797797
'Acme\HelloBundle\Newsletter\NewsletterManager',
798798
array(

components/class_loader/cache_class_loader.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
single: ClassLoader; Cache
55
single: ClassLoader; XcacheClassLoader
66
single: XCache; XcacheClassLoader
7-
7+
88
Cache a Class Loader
99
====================
1010

@@ -33,16 +33,16 @@ ApcClassLoader
3333
``findFile()`` method using `APC`_::
3434

3535
require_once '/path/to/src/Symfony/Component/ClassLoader/ApcClassLoader.php';
36-
36+
3737
// instance of a class that implements a findFile() method, like the ClassLoader
3838
$loader = ...;
39-
39+
4040
// sha1(__FILE__) generates an APC namespace prefix
4141
$cachedLoader = new ApcClassLoader(sha1(__FILE__), $loader);
42-
42+
4343
// register the cached class loader
4444
$cachedLoader->register();
45-
45+
4646
// deactivate the original, non-cached loader if it was registered previously
4747
$loader->unregister();
4848

@@ -56,16 +56,16 @@ XcacheClassLoader
5656
it is straightforward::
5757

5858
require_once '/path/to/src/Symfony/Component/ClassLoader/XcacheClassLoader.php';
59-
59+
6060
// instance of a class that implements a findFile() method, like the ClassLoader
6161
$loader = ...;
62-
62+
6363
// sha1(__FILE__) generates an XCache namespace prefix
6464
$cachedLoader = new XcacheClassLoader(sha1(__FILE__), $loader);
65-
65+
6666
// register the cached class loader
6767
$cachedLoader->register();
68-
68+
6969
// deactivate the original, non-cached loader if it was registered previously
7070
$loader->unregister();
7171

components/class_loader/debug_class_loader.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.. index::
22
single: ClassLoader; DebugClassLoader
3-
3+
44
Debugging a Class Loader
55
========================
66

@@ -16,5 +16,5 @@ Using the ``DebugClassLoader`` is as easy as calling its static
1616
:method:`Symfony\\Component\\ClassLoader\\DebugClassLoader::enable` method::
1717

1818
use Symfony\Component\ClassLoader\DebugClassLoader;
19-
19+
2020
DebugClassLoader::enable();

components/class_loader/map_class_loader.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.. index::
22
single: ClassLoader; MapClassLoader
3-
3+
44
MapClassLoader
55
==============
66

@@ -26,14 +26,14 @@ Using it is as easy as passing your mapping to its constructor when creating
2626
an instance of the ``MapClassLoader`` class::
2727

2828
require_once '/path/to/src/Symfony/Component/ClassLoader/MapClassLoader';
29-
29+
3030
$mapping = array(
3131
'Foo' => '/path/to/Foo',
3232
'Bar' => '/path/to/Bar',
3333
);
34-
34+
3535
$loader = new MapClassLoader($mapping);
36-
36+
3737
$loader->register();
3838

3939
.. _PSR-0: http://www.php-fig.org/psr/psr-0/

components/css_selector.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ web-browser.
7676

7777
* link-state selectors: ``:link``, ``:visited``, ``:target``
7878
* selectors based on user action: ``:hover``, ``:focus``, ``:active``
79-
* UI-state selectors: ``:invalid``, ``:indeterminate`` (however, ``:enabled``,
79+
* UI-state selectors: ``:invalid``, ``:indeterminate`` (however, ``:enabled``,
8080
``:disabled``, ``:checked`` and ``:unchecked`` are available)
8181

8282
Pseudo-elements (``:before``, ``:after``, ``:first-line``,

components/dependency_injection/advanced.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ using the ``get()`` method::
1717

1818
In some cases, a service *only* exists to be injected into another service
1919
and is *not* intended to be fetched directly from the container as shown
20-
above.
20+
above.
2121

2222
.. _inlined-private-services:
2323

components/security/authentication.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ in) is correct, you can use::
257257

258258
// fetch the Acme\Entity\LegacyUser
259259
$user = ...;
260-
260+
261261
// the submitted password, e.g. from the login form
262262
$plainPassword = ...;
263263

components/templating/helpers/assetshelper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Asset path generation is handled internally by packages. The component provides
7575
You can also use multiple packages::
7676

7777
use Symfony\Component\Templating\Asset\PathPackage;
78-
78+
7979
// ...
8080
$templateEngine->set(new AssetsHelper());
8181

components/templating/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ escaper using the
135135
Helpers
136136
-------
137137

138-
The Templating component can be easily extended via helpers. Helpers are PHP objects that
138+
The Templating component can be easily extended via helpers. Helpers are PHP objects that
139139
provide features useful in a template context. The component has
140140
2 built-in helpers:
141141

contributing/code/standards.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ example containing most features described below:
7979

8080
throw new \RuntimeException(sprintf('Unrecognized dummy option "%s"', $dummy));
8181
}
82-
82+
8383
private function reverseBoolean($value = null, $theSwitch = false)
8484
{
8585
if (!$theSwitch) {
@@ -95,7 +95,7 @@ Structure
9595

9696
* Add a single space after each comma delimiter;
9797

98-
* Add a single space around binary operators (``==``, ``&&``, ...), with
98+
* Add a single space around binary operators (``==``, ``&&``, ...), with
9999
the exception of the concatenation (``.``) operator;
100100

101101
* Place unary operators (``!``, ``--``, ...) adjacent to the affected variable;

cookbook/configuration/external_parameters.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ Environment Variables
1414
---------------------
1515

1616
Symfony will grab any environment variable prefixed with ``SYMFONY__`` and
17-
set it as a parameter in the service container. Some transformations are
17+
set it as a parameter in the service container. Some transformations are
1818
applied to the resulting parameter name:
1919

2020
* ``SYMFONY__`` prefix is removed;
2121
* Parameter name is lowercased;
22-
* Double underscores are replaced with a period, as a period is not
22+
* Double underscores are replaced with a period, as a period is not
2323
a valid character in an environment variable name.
2424

2525
For example, if you're using Apache, environment variables can be set using

cookbook/configuration/override_dir_structure.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ the ``extra.symfony-web-dir`` option in the ``composer.json`` file:
151151
work:
152152

153153
.. code-block:: bash
154-
154+
155155
$ php app/console cache:clear --env=prod
156156
$ php app/console assetic:dump --env=prod --no-debug
157157

cookbook/deployment/platformsh.rst

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
Deploying to Platform.sh
55
========================
66

7-
This step-by-step cookbook describes how to deploy a Symfony web application to
8-
`Platform.sh`_. You can read more about using Symfony with Platform.sh on the
7+
This step-by-step cookbook describes how to deploy a Symfony web application to
8+
`Platform.sh`_. You can read more about using Symfony with Platform.sh on the
99
official `Platform.sh documentation`_.
1010

1111
Deploy an Existing Site
@@ -15,23 +15,23 @@ In this guide, it is assumed your codebase is already versioned with Git.
1515

1616
Get a Project on Platform.sh
1717
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18-
18+
1919
You need to subscribe to a `Platform.sh project`_. Choose the development plan
20-
and go through the checkout process. Once your project is ready, give it a name
20+
and go through the checkout process. Once your project is ready, give it a name
2121
and choose: **Import an existing site**.
2222

2323
Prepare Your Application
2424
~~~~~~~~~~~~~~~~~~~~~~~~
2525

26-
To deploy your Symfony application on Platform.sh, you simply need to add a
26+
To deploy your Symfony application on Platform.sh, you simply need to add a
2727
``.platform.app.yaml`` at the root of your Git repository which will tell
28-
Platform.sh how to deploy your application (read more about
28+
Platform.sh how to deploy your application (read more about
2929
`Platform.sh configuration files`_).
3030

3131
.. code-block:: yaml
3232
3333
# .platform.app.yaml
34-
34+
3535
# This file describes an application. You can have multiple applications
3636
# in the same project.
3737
@@ -96,7 +96,7 @@ Configure Database Access
9696

9797
Platform.sh overrides your database specific configuration via importing the
9898
following file::
99-
99+
100100
// app/config/parameters_platform.php
101101
<?php
102102
$relationships = getenv("PLATFORM_RELATIONSHIPS");
@@ -134,7 +134,7 @@ Make sure this file is listed in your *imports*:
134134
Deploy your Application
135135
~~~~~~~~~~~~~~~~~~~~~~~
136136

137-
Now you need to add a remote to Platform.sh in your Git repository (copy the
137+
Now you need to add a remote to Platform.sh in your Git repository (copy the
138138
command that you see on the Platform.sh web UI):
139139

140140
.. code-block:: bash
@@ -150,7 +150,7 @@ Commit the Platform.sh specific files created in the previous section:
150150

151151
.. code-block:: bash
152152
153-
$ git add .platform.app.yaml .platform/*
153+
$ git add .platform.app.yaml .platform/*
154154
$ git add app/config/config.yml app/config/parameters_platform.php
155155
$ git commit -m "Adding Platform.sh configuration files."
156156
@@ -163,22 +163,22 @@ Push your code base to the newly added remote:
163163
That's it! Your application is being deployed on Platform.sh and you'll soon be
164164
able to access it in your browser.
165165

166-
Every code change that you do from now on will be pushed to Git in order to
166+
Every code change that you do from now on will be pushed to Git in order to
167167
redeploy your environment on Platform.sh.
168168

169-
More information about `migrating your database and files <migrate-existing-site>`_ can be found on the
169+
More information about `migrating your database and files <migrate-existing-site>`_ can be found on the
170170
Platform.sh documentation.
171171

172172
Deploy a new Site
173173
-----------------
174-
175-
You can start a new `Platform.sh project`_. Choose the development plan and go
174+
175+
You can start a new `Platform.sh project`_. Choose the development plan and go
176176
through the checkout process.
177177

178178
Once your project is ready, give it a name and choose: **Create a new site**.
179179
Choose the *Symfony* stack and a starting point such as *Standard*.
180180

181-
That's it! Your Symfony application will be bootstrapped and deployed. You'll
181+
That's it! Your Symfony application will be bootstrapped and deployed. You'll
182182
soon be able to see it in your browser.
183183

184184
.. _`Platform.sh`: https://platform.sh

cookbook/form/form_collections.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,8 @@ we talk about next!).
463463

464464
.. caution::
465465

466-
You have to create **both** ``addTag`` and ``removeTag`` methods,
467-
otherwise the form will still use ``setTag`` even if ``by_reference`` is ``false``.
466+
You have to create **both** ``addTag`` and ``removeTag`` methods,
467+
otherwise the form will still use ``setTag`` even if ``by_reference`` is ``false``.
468468
You'll learn more about the ``removeTag`` method later in this article.
469469

470470
.. sidebar:: Doctrine: Cascading Relations and saving the "Inverse" side

cookbook/form/unit_testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ on other extensions. You need add those extensions to the factory object::
184184
protected function setUp()
185185
{
186186
parent::setUp();
187-
187+
188188
$validator = $this->getMock('\Symfony\Component\Validator\ValidatorInterface');
189189
$validator->method('validate')->will($this->returnValue(new ConstraintViolationList()));
190190

cookbook/security/access_control.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ pattern so that it is only accessible by requests from the local server itself:
177177
security:
178178
# ...
179179
access_control:
180-
#
180+
#
181181
- { path: ^/internal, roles: IS_AUTHENTICATED_ANONYMOUSLY, ips: [127.0.0.1, ::1] }
182182
- { path: ^/internal, roles: ROLE_NO_ACCESS }
183183

cookbook/security/pre_authenticated.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ in the x509 firewall configuration respectively.
7171
An authentication provider will only inform the user provider of the username
7272
that made the request. You will need to create (or use) a "user provider" that
7373
is referenced by the ``provider`` configuration parameter (``your_user_provider``
74-
in the configuration example). This provider will turn the username into a User
75-
object of your choice. For more information on creating or configuring a user
74+
in the configuration example). This provider will turn the username into a User
75+
object of your choice. For more information on creating or configuring a user
7676
provider, see:
7777

7878
* :doc:`/cookbook/security/custom_provider`

0 commit comments

Comments
 (0)