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 75ce70a

Browse filesBrowse files
javiereguiluzjaviereguiluz
committed
Merge branch '4.1' into 4.2
* 4.1: Fixing another typo for .env.local file Fixing typo for .env.local file Update service_decoration.rst Update optional_dependencies.rst Update injection_types.rst Update alias_private.rst
2 parents b5e0a70 + a425cc3 commit 75ce70a
Copy full SHA for 75ce70a

File tree

6 files changed

+11
-16
lines changed
Filter options

6 files changed

+11
-16
lines changed

‎best_practices/configuration.rst

Copy file name to clipboardExpand all lines: best_practices/configuration.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ application doesn't care about the location of your database or the credentials
4444
to access to it, as long as the database is correctly configured.
4545

4646
To override these variables with machine-specific or sensitive values, create a
47-
``env.local`` file. This file should not be added to version control.
47+
``.env.local`` file. This file should not be added to version control.
4848

4949
.. caution::
5050

‎configuration.rst

Copy file name to clipboardExpand all lines: configuration.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ sensible, non-secret *default* values for all of your environment variables and
256256
*should* be commited to your repository.
257257

258258
To override these variables with machine-specific or sensitive values, create a
259-
``env.local`` file. This file is **not committed to the shared repository** and
259+
``.env.local`` file. This file is **not committed to the shared repository** and
260260
is only stored on your machine. In fact, the ``.gitignore`` file that comes with
261261
Symfony prevents it from being committed.
262262

‎service_container/alias_private.rst

Copy file name to clipboardExpand all lines: service_container/alias_private.rst
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ The following example shows how to inject an anonymous service into another serv
168168

169169
.. code-block:: yaml
170170
171-
# app/config/services.yaml
171+
# config/services.yaml
172172
services:
173173
App\Foo:
174174
arguments:
@@ -177,7 +177,7 @@ The following example shows how to inject an anonymous service into another serv
177177
178178
.. code-block:: xml
179179
180-
<!-- app/config/services.xml -->
180+
<!-- config/services.xml -->
181181
<?xml version="1.0" encoding="UTF-8" ?>
182182
<container xmlns="http://symfony.com/schema/dic/services"
183183
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -199,14 +199,14 @@ Using an anonymous service as a factory looks like this:
199199

200200
.. code-block:: yaml
201201
202-
# app/config/services.yaml
202+
# config/services.yaml
203203
services:
204204
App\Foo:
205205
factory: [ !service { class: App\FooFactory }, 'constructFoo' ]
206206
207207
.. code-block:: xml
208208
209-
<!-- app/config/services.xml -->
209+
<!-- config/services.xml -->
210210
<?xml version="1.0" encoding="UTF-8" ?>
211211
<container xmlns="http://symfony.com/schema/dic/services"
212212
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

‎service_container/injection_types.rst

Copy file name to clipboardExpand all lines: service_container/injection_types.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ service container configuration:
6060
<services>
6161
<!-- ... -->
6262
63-
<service id="app.newsletter_manager" class="App\Mail\NewsletterManager">
63+
<service id="App\Mail\NewsletterManager">
6464
<argument type="service" id="mailer"/>
6565
</service>
6666
</services>
@@ -73,7 +73,7 @@ service container configuration:
7373
use Symfony\Component\DependencyInjection\Reference;
7474
7575
// ...
76-
$container->register('app.newsletter_manager', NewsletterManager::class)
76+
$container->register(NewsletterManager::class)
7777
->addArgument(new Reference('mailer'));
7878
7979
.. tip::

‎service_container/optional_dependencies.rst

Copy file name to clipboardExpand all lines: service_container/optional_dependencies.rst
+1-6Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ call if the service exists and remove the method call if it does not:
6666
6767
# config/services.yaml
6868
services:
69-
app.newsletter_manager:
70-
class: App\Newsletter\NewsletterManager
69+
App\Newsletter\NewsletterManager:
7170
calls:
7271
- [setLogger, ['@?logger']]
7372
@@ -81,10 +80,6 @@ call if the service exists and remove the method call if it does not:
8180
http://symfony.com/schema/dic/services/services-1.0.xsd">
8281
8382
<services>
84-
<service id="app.mailer">
85-
<!-- ... -->
86-
</service>
87-
8883
<service id="App\Newsletter\NewsletterManager">
8984
<call method="setLogger">
9085
<argument type="service" id="logger" on-invalid="ignore"/>

‎service_container/service_decoration.rst

Copy file name to clipboardExpand all lines: service_container/service_decoration.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,12 @@ the ``decoration_priority`` option. Its value is an integer that defaults to
271271
$container->register(Foo:class)
272272
273273
$container->register(Bar:class)
274-
->addArgument(new Reference(Bar:class.'inner'))
274+
->addArgument(new Reference(Bar:class.'.inner'))
275275
->setPublic(false)
276276
->setDecoratedService(Foo:class, null, 5);
277277
278278
$container->register(Baz:class)
279-
->addArgument(new Reference(Baz:class.'inner'))
279+
->addArgument(new Reference(Baz:class.'.inner'))
280280
->setPublic(false)
281281
->setDecoratedService(Foo:class, null, 1);
282282

0 commit comments

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