Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 56e30d2

Browse filesBrowse files
committed
minor #11508 fix indention (OskarStark)
This PR was merged into the 3.4 branch. Discussion ---------- fix indention <!-- If your pull request fixes a BUG, use the oldest maintained branch that contains the bug (see https://symfony.com/roadmap for the list of maintained branches). If your pull request documents a NEW FEATURE, use the same Symfony branch where the feature was introduced (and `master` for features of unreleased versions). --> Commits ------- cbe6e45 fix indention
2 parents 3e0d51a + cbe6e45 commit 56e30d2
Copy full SHA for 56e30d2

File tree

26 files changed

+111
-110
lines changed
Filter options

26 files changed

+111
-110
lines changed

‎bundles/extension.rst

Copy file name to clipboardExpand all lines: bundles/extension.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ I/O operations and increases the application performance.
141141

142142
.. versionadded:: 3.2
143143

144-
The ``addAnnotatedClassesToCompile()`` method was introduced in Symfony 3.2.
144+
The ``addAnnotatedClassesToCompile()`` method was introduced in Symfony 3.2.
145145

146146
Your bundles can also add their own classes into this file thanks to the
147147
``addClassesToCompile()`` and ``addAnnotatedClassesToCompile()`` methods (both
@@ -178,7 +178,7 @@ class names::
178178

179179
.. versionadded:: 3.2
180180

181-
The option to add classes to compile using patterns was introduced in Symfony 3.2.
181+
The option to add classes to compile using patterns was introduced in Symfony 3.2.
182182

183183
The classes to compile can also be added using file path patterns::
184184

‎components/cache.rst

Copy file name to clipboardExpand all lines: components/cache.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ Cache (PSR-6) Versus Simple Cache (PSR-16)
3333
This component includes *two* different approaches to caching:
3434

3535
:ref:`PSR-6 Caching <cache-component-psr6-caching>`:
36-
A fully-featured cache system, which includes cache "pools", more advanced
37-
cache "items", and :ref:`cache tagging for invalidation <cache-component-tags>`.
36+
A fully-featured cache system, which includes cache "pools", more advanced
37+
cache "items", and :ref:`cache tagging for invalidation <cache-component-tags>`.
3838

3939
:ref:`PSR-16 Simple Caching <cache-component-psr16-caching>`:
4040
A simple way to store, fetch and remove items from a cache.

‎components/console/single_command_tool.rst

Copy file name to clipboardExpand all lines: components/console/single_command_tool.rst
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ it is possible to remove this need by declaring a single command application::
1919
use Symfony\Component\Console\Output\OutputInterface;
2020

2121
(new Application('echo', '1.0.0'))
22-
->register('echo')
23-
->addArgument('foo', InputArgument::OPTIONAL, 'The directory')
24-
->addOption('bar', null, InputOption::VALUE_REQUIRED)
25-
->setCode(function(InputInterface $input, OutputInterface $output) {
26-
// output arguments and options
27-
})
28-
->getApplication()
29-
->setDefaultCommand('echo', true) // Single command application
30-
->run();
22+
->register('echo')
23+
->addArgument('foo', InputArgument::OPTIONAL, 'The directory')
24+
->addOption('bar', null, InputOption::VALUE_REQUIRED)
25+
->setCode(function(InputInterface $input, OutputInterface $output) {
26+
// output arguments and options
27+
})
28+
->getApplication()
29+
->setDefaultCommand('echo', true) // Single command application
30+
->run();
3131

3232
The method :method:`Symfony\\Component\\Console\\Application::setDefaultCommand`
3333
accepts a boolean as second parameter. If true, the command ``echo`` will then

‎components/phpunit_bridge.rst

Copy file name to clipboardExpand all lines: components/phpunit_bridge.rst
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ to register a new `test listener`_ called ``SymfonyTestsListener``:
4848
4949
<!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
5050
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
51-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
51+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
5252
>
5353
5454
<!-- ... -->
@@ -172,7 +172,7 @@ message, enclosed with ``/``. For example, with:
172172
173173
<!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
174174
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
175-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
175+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
176176
>
177177
178178
<!-- ... -->
@@ -501,7 +501,7 @@ namespaces in the ``phpunit.xml`` file, as done for example in the
501501
502502
<!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
503503
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
504-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.1/phpunit.xsd"
504+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.1/phpunit.xsd"
505505
>
506506
507507
<!-- ... -->
@@ -645,7 +645,7 @@ Add the following configuration to the ``phpunit.xml.dist`` file:
645645
646646
<!-- http://phpunit.de/manual/6.0/en/appendixes.configuration.html -->
647647
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
648-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
648+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
649649
>
650650
651651
<!-- ... -->

‎components/translation/usage.rst

Copy file name to clipboardExpand all lines: components/translation/usage.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ loaded/dumped when using this component inside a Symfony application:
452452
453453
<?xml version="1.0" encoding="UTF-8"?>
454454
<xliff xmlns="urn:oasis:names:tc:xliff:document:2.0" version="2.0"
455-
srcLang="fr-FR" trgLang="en-US">
455+
srcLang="fr-FR" trgLang="en-US">
456456
<file id="messages.en_US">
457457
<unit id="LCa0a2j">
458458
<notes>

‎components/var_dumper/advanced.rst

Copy file name to clipboardExpand all lines: components/var_dumper/advanced.rst
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ you can configure these limits:
5959
items. Specifying ``-1`` removes the limit.
6060

6161
:method:`Symfony\\Component\\VarDumper\\Cloner\\VarCloner::setMinDepth`
62-
.. versionadded:: 3.4
63-
64-
The ``setMinDepth()`` method was introduced in Symfony 3.4.
65-
6662
Configures the minimum tree depth where we are guaranteed to clone
6763
all the items. After this depth is reached, only ``setMaxItems``
6864
items will be cloned. The default value is ``1``, which is consistent
6965
with older Symfony versions.
7066

67+
.. versionadded:: 3.4
68+
69+
The ``setMinDepth()`` method was introduced in Symfony 3.4.
70+
7171
:method:`Symfony\\Component\\VarDumper\\Cloner\\VarCloner::setMaxString`
7272
Configures the maximum number of characters that will be cloned before
7373
cutting overlong strings. Specifying ``-1`` removes the limit.
@@ -85,12 +85,12 @@ Before dumping it, you can further limit the resulting
8585
Removes internal objects' handles for sparser output (useful for tests).
8686

8787
:method:`Symfony\\Component\\VarDumper\\Cloner\\Data::seek`
88+
Selects only subparts of already cloned arrays, objects or resources.
89+
8890
.. versionadded:: 3.2
8991

9092
The ``seek()`` method was introduced in Symfony 3.2.
9193

92-
Selects only subparts of already cloned arrays, objects or resources.
93-
9494
Unlike the previous limits on cloners that remove data on purpose, these can
9595
be changed back and forth before dumping since they do not affect the
9696
intermediate representation internally.

‎components/web_link.rst

Copy file name to clipboardExpand all lines: components/web_link.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
The WebLink Component
66
======================
77

8-
The WebLink component provides tools to manage the ``Link`` HTTP header needed
9-
for `Web Linking`_ when using `HTTP/2 Server Push`_ as well as `Resource Hints`_.
8+
The WebLink component provides tools to manage the ``Link`` HTTP header needed
9+
for `Web Linking`_ when using `HTTP/2 Server Push`_ as well as `Resource Hints`_.
1010

1111
Installation
1212
------------

‎console/input.rst

Copy file name to clipboardExpand all lines: console/input.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ flag:
166166
167167
.. tip::
168168

169-
You can also declare a one-letter shortcut that you can call with a single
170-
dash, like ``-i``::
169+
You can also declare a one-letter shortcut that you can call with a single
170+
dash, like ``-i``::
171171

172172
$this
173173
// ...

‎contributing/documentation/index.rst

Copy file name to clipboardExpand all lines: contributing/documentation/index.rst
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ These short articles explain everything you need to contribute to the Symfony
55
documentation:
66

77
:doc:`The Contribution Process </contributing/documentation/overview>`
8-
Explains the steps to follow to contribute fixes and new contents. It's the
9-
same contribution process followed by most open source projects, so you may
10-
already know everything that is needed.
8+
Explains the steps to follow to contribute fixes and new contents. It's the
9+
same contribution process followed by most open source projects, so you may
10+
already know everything that is needed.
1111

1212
:doc:`Documentation Formats </contributing/documentation/format>`
13-
Explains the technical details of the reStructuredText format that is used to
14-
write the docs. Skip it if you are already familiar with this format.
13+
Explains the technical details of the reStructuredText format that is used to
14+
write the docs. Skip it if you are already familiar with this format.
1515

1616
:doc:`Documentation Standards </contributing/documentation/standards>`
17-
Explains how to write docs and code examples to match the style and tone of
18-
the rest of the existing documentation.
17+
Explains how to write docs and code examples to match the style and tone of
18+
the rest of the existing documentation.
1919

2020
:doc:`License </contributing/documentation/license>`
21-
Explains the details of the Creative Commons BY-SA 3.0 license used for the
22-
Symfony Documentation.
21+
Explains the details of the Creative Commons BY-SA 3.0 license used for the
22+
Symfony Documentation.
2323

2424
.. toctree::
2525
:hidden:

‎create_framework/routing.rst

Copy file name to clipboardExpand all lines: create_framework/routing.rst
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,23 +93,23 @@ The ``match()`` method takes a request path and returns an array of attributes
9393
(notice that the matched route is automatically stored under the special
9494
``_route`` attribute)::
9595

96-
print_r($matcher->match('/bye'));
97-
/* Gives:
96+
$matcher->match('/bye');
97+
/* Result:
9898
[
9999
'_route' => 'bye',
100100
];
101101
*/
102102

103-
print_r($matcher->match('/hello/Fabien'));
104-
/* Gives:
103+
$matcher->match('/hello/Fabien');
104+
/* Result:
105105
[
106106
'name' => 'Fabien',
107107
'_route' => 'hello',
108108
];
109109
*/
110110

111-
print_r($matcher->match('/hello'));
112-
/* Gives:
111+
$matcher->match('/hello');
112+
/* Result:
113113
[
114114
'name' => 'World',
115115
'_route' => 'hello',

‎deployment/azure-website.rst

Copy file name to clipboardExpand all lines: deployment/azure-website.rst
+26-26Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -404,32 +404,32 @@ application, configure it with the following content:
404404
.. code-block:: xml
405405
406406
<configuration>
407-
<system.webServer>
408-
<rewrite>
409-
<rules>
410-
<clear/>
411-
<rule name="BlockAccessToPublic" patternSyntax="Wildcard" stopProcessing="true">
412-
<match url="*"/>
413-
<conditions logicalGrouping="MatchAll" trackAllCaptures="false">
414-
<add input="{URL}" pattern="/web/*"/>
415-
</conditions>
416-
<action type="CustomResponse" statusCode="403" statusReason="Forbidden: Access is denied." statusDescription="You do not have permission to view this directory or page using the credentials that you supplied."/>
417-
</rule>
418-
<rule name="RewriteAssetsToPublic" stopProcessing="true">
419-
<match url="^(.*)(\.css|\.js|\.jpg|\.png|\.gif|\.ico)$"/>
420-
<conditions logicalGrouping="MatchAll" trackAllCaptures="false">
421-
</conditions>
422-
<action type="Rewrite" url="web/{R:0}"/>
423-
</rule>
424-
<rule name="RewriteRequestsToPublic" stopProcessing="true">
425-
<match url="^(.*)$"/>
426-
<conditions logicalGrouping="MatchAll" trackAllCaptures="false">
427-
</conditions>
428-
<action type="Rewrite" url="web/app.php/{R:0}"/>
429-
</rule>
430-
</rules>
431-
</rewrite>
432-
</system.webServer>
407+
<system.webServer>
408+
<rewrite>
409+
<rules>
410+
<clear/>
411+
<rule name="BlockAccessToPublic" patternSyntax="Wildcard" stopProcessing="true">
412+
<match url="*"/>
413+
<conditions logicalGrouping="MatchAll" trackAllCaptures="false">
414+
<add input="{URL}" pattern="/web/*"/>
415+
</conditions>
416+
<action type="CustomResponse" statusCode="403" statusReason="Forbidden: Access is denied." statusDescription="You do not have permission to view this directory or page using the credentials that you supplied."/>
417+
</rule>
418+
<rule name="RewriteAssetsToPublic" stopProcessing="true">
419+
<match url="^(.*)(\.css|\.js|\.jpg|\.png|\.gif|\.ico)$"/>
420+
<conditions logicalGrouping="MatchAll" trackAllCaptures="false">
421+
</conditions>
422+
<action type="Rewrite" url="web/{R:0}"/>
423+
</rule>
424+
<rule name="RewriteRequestsToPublic" stopProcessing="true">
425+
<match url="^(.*)$"/>
426+
<conditions logicalGrouping="MatchAll" trackAllCaptures="false">
427+
</conditions>
428+
<action type="Rewrite" url="web/app.php/{R:0}"/>
429+
</rule>
430+
</rules>
431+
</rewrite>
432+
</system.webServer>
433433
</configuration>
434434
435435
As you can see, the latest rule ``RewriteRequestsToPublic`` is responsible for

‎deployment/fortrabbit.rst

Copy file name to clipboardExpand all lines: deployment/fortrabbit.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,8 @@ Commit and push
270270
271271
.. note::
272272

273-
The first ``git push`` takes much longer as all composer dependencies get
274-
downloaded. All subsequent deploys are done within seconds.
273+
The first ``git push`` takes much longer as all composer dependencies get
274+
downloaded. All subsequent deploys are done within seconds.
275275

276276
That's it! Your application is being deployed on fortrabbit. More information
277277
about `database migrations and tunneling`_ can be found in the fortrabbit

‎deployment/platformsh.rst

Copy file name to clipboardExpand all lines: deployment/platformsh.rst
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Platform.sh how to deploy your application (read more about
4040
# The type of the application to build.
4141
type: php:5.6
4242
build:
43-
flavor: composer
43+
flavor: composer
4444
4545
# The relationships of the application with services or other applications.
4646
# The left-hand side is the name of the relationship as it will be exposed
@@ -68,10 +68,10 @@ Platform.sh how to deploy your application (read more about
6868
# The hooks that will be performed when the package is deployed.
6969
hooks:
7070
build: |
71-
rm web/app_dev.php
72-
php bin/console --env=prod assetic:dump --no-debug
71+
rm web/app_dev.php
72+
php bin/console --env=prod assetic:dump --no-debug
7373
deploy: |
74-
php bin/console --env=prod cache:clear
74+
php bin/console --env=prod cache:clear
7575
7676
For best practices, you should also add a ``.platform`` folder at the root of
7777
your Git repository which contains the following files:
@@ -111,7 +111,7 @@ following file (it's your role to add this file to your code base)::
111111

112112
foreach ($relationships['database'] as $endpoint) {
113113
if (empty($endpoint['query']['is_master'])) {
114-
continue;
114+
continue;
115115
}
116116

117117
$container->setParameter('database_driver', 'pdo_' . $endpoint['scheme']);

‎doctrine/reverse_engineering.rst

Copy file name to clipboardExpand all lines: doctrine/reverse_engineering.rst
+12-9Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,18 @@ The generated ``BlogPost.orm.xml`` metadata file looks as follows:
7474
.. code-block:: xml
7575
7676
<?xml version="1.0" encoding="UTF-8"?>
77-
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
78-
<entity name="AppBundle\Entity\BlogPost" table="blog_post">
79-
<id name="id" type="bigint" column="id">
80-
<generator strategy="IDENTITY"/>
81-
</id>
82-
<field name="title" type="string" column="title" length="100" nullable="false"/>
83-
<field name="content" type="text" column="content" nullable="false"/>
84-
<field name="createdAt" type="datetime" column="created_at" nullable="false"/>
85-
</entity>
77+
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
78+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
79+
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
80+
https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
81+
<entity name="AppBundle\Entity\BlogPost" table="blog_post">
82+
<id name="id" type="bigint" column="id">
83+
<generator strategy="IDENTITY"/>
84+
</id>
85+
<field name="title" type="string" column="title" length="100" nullable="false"/>
86+
<field name="content" type="text" column="content" nullable="false"/>
87+
<field name="createdAt" type="datetime" column="created_at" nullable="false"/>
88+
</entity>
8689
</doctrine-mapping>
8790
8891
Once the metadata files are generated, you can ask Doctrine to build related

‎forms.rst

Copy file name to clipboardExpand all lines: forms.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,8 @@ the correct values of a number of field options.
557557

558558
.. caution::
559559

560-
These field options are *only* guessed if you're using Symfony to guess
561-
the field type (i.e. omit or pass ``null`` as the second argument to ``add()``).
560+
These field options are *only* guessed if you're using Symfony to guess
561+
the field type (i.e. omit or pass ``null`` as the second argument to ``add()``).
562562

563563
If you'd like to change one of the guessed values, you can override it by
564564
passing the option in the options field array::

‎frontend/assetic/php.rst

Copy file name to clipboardExpand all lines: frontend/assetic/php.rst
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ First, configure a new ``scssphp`` Assetic filter:
108108
// app/config/config.php
109109
$container->loadFromExtension('assetic', [
110110
'filters' => [
111-
'scssphp' => [
112-
'formatter' => 'Leafo\ScssPhp\Formatter\Compressed',
113-
],
114-
// ...
111+
'scssphp' => [
112+
'formatter' => 'Leafo\ScssPhp\Formatter\Compressed',
113+
],
114+
// ...
115115
],
116116
]);
117117
@@ -181,8 +181,8 @@ First, configure a new ``jsqueeze`` Assetic filter as follows:
181181
// app/config/config.php
182182
$container->loadFromExtension('assetic', [
183183
'filters' => [
184-
'jsqueeze' => null,
185-
// ...
184+
'jsqueeze' => null,
185+
// ...
186186
],
187187
]);
188188

‎reference/configuration/debug.rst

Copy file name to clipboardExpand all lines: reference/configuration/debug.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ destination for dumps. Typically, you would set this to ``php://stderr``:
7979
8080
# app/config/config.yml
8181
debug:
82-
dump_destination: php://stderr
82+
dump_destination: php://stderr
8383
8484
.. code-block:: xml
8585
@@ -99,5 +99,5 @@ destination for dumps. Typically, you would set this to ``php://stderr``:
9999
100100
// app/config/config.php
101101
$container->loadFromExtension('debug', [
102-
'dump_destination' => 'php://stderr',
102+
'dump_destination' => 'php://stderr',
103103
]);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.