Skip to content

Commit 171625f

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: Remove "--unpack" option from setup.rst [HttpClient] Symfony HTTP Client documentation Update license.rst add links label in service container page
2 parents a4035a8 + 0d1c702 commit 171625f

File tree

4 files changed

+19
-14
lines changed

4 files changed

+19
-14
lines changed

contributing/code/license.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Symfony Code License
55

66
Symfony code is released under `the MIT license`_:
77

8-
Copyright (c) 2004-2021 Fabien Potencier
8+
Copyright (c) 2004-present Fabien Potencier
99

1010
Permission is hereby granted, free of charge, to any person obtaining a copy
1111
of this software and associated documentation files (the "Software"), to deal

http_client.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1034,7 +1034,12 @@ If the server does respond with a gzipped response, it's decoded transparently.
10341034
To disable HTTP compression, send an ``Accept-Encoding: identity`` HTTP header.
10351035

10361036
Chunked transfer encoding is enabled automatically if both your PHP runtime and
1037-
the remote server supports it.
1037+
the remote server support it.
1038+
1039+
.. caution::
1040+
1041+
If you set ``Accept-Encoding`` to e.g. ``gzip``, you will need to handle the
1042+
decompression yourself.
10381043

10391044
HTTP/2 Support
10401045
~~~~~~~~~~~~~~

service_container.rst

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ in the container.
8080
There are actually *many* more services in the container, and each service has
8181
a unique id in the container, like ``request_stack`` or ``router.default``. For a full
8282
list, you can run ``php bin/console debug:container``. But most of the time,
83-
you won't need to worry about this. See :ref:`services-wire-specific-service`.
84-
See :doc:`/service_container/debug`.
83+
you won't need to worry about this. See :ref:`how to choose a specific service
84+
<services-wire-specific-service>`. See :doc:`/service_container/debug`.
8585

8686
.. _service-container-creating-service:
8787

@@ -228,10 +228,11 @@ each time you ask for it.
228228

229229
Thanks to this configuration, you can automatically use any classes from the
230230
``src/`` directory as a service, without needing to manually configure
231-
it. Later, you'll learn more about this in :ref:`service-psr4-loader`.
231+
it. Later, you'll learn how to :ref:`import many services at once
232+
<service-psr4-loader>` with resource.
232233

233-
If you'd prefer to manually wire your service, that's totally possible: see
234-
:ref:`services-explicitly-configure-wire-services`.
234+
If you'd prefer to manually wire your service, you can
235+
:ref:`use explicit configuration <services-explicitly-configure-wire-services>`.
235236

236237
.. _service-container_limiting-to-env:
237238

@@ -923,8 +924,8 @@ argument for *any* service defined in this file! You can bind arguments by name
923924
(e.g. ``$adminEmail``), by type (e.g. ``Psr\Log\LoggerInterface``) or both
924925
(e.g. ``Psr\Log\LoggerInterface $requestLogger``).
925926

926-
The ``bind`` config can also be applied to specific services or when loading many
927-
services at once (i.e. :ref:`service-psr4-loader`).
927+
The ``bind`` config can also be applied to specific services or when
928+
:ref:`loading many services at once <service-psr4-loader>`).
928929

929930
Abstract Service Arguments
930931
--------------------------
@@ -1167,9 +1168,9 @@ key. For example, the default Symfony configuration contains this:
11671168
This can be used to quickly make many classes available as services and apply some
11681169
default configuration. The ``id`` of each service is its fully-qualified class name.
11691170
You can override any service that's imported by using its id (class name) below
1170-
(e.g. see :ref:`services-manually-wire-args`). If you override a service, none of
1171-
the options (e.g. ``public``) are inherited from the import (but the overridden
1172-
service *does* still inherit from ``_defaults``).
1171+
(e.g. see :ref:`how to manually wire arguments <services-manually-wire-args>`).
1172+
If you override a service, none of the options (e.g. ``public``) are inherited
1173+
from the import (but the overridden service *does* still inherit from ``_defaults``).
11731174

11741175
You can also ``exclude`` certain paths. This is optional, but will slightly increase
11751176
performance in the ``dev`` environment: excluded paths are not tracked and so modifying

setup.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,7 @@ which in turn installs several packages like ``symfony/debug-bundle``,
219219
You won't see the ``symfony/debug-pack`` dependency in your ``composer.json``,
220220
as Flex automatically unpacks the pack. This means that it only adds the real
221221
packages as dependencies (e.g. you will see a new ``symfony/var-dumper`` in
222-
``require-dev``). While it is not recommended, you can use the ``composer
223-
require --no-unpack ...`` option to disable unpacking.
222+
``require-dev``).
224223

225224
.. _security-checker:
226225

0 commit comments

Comments
 (0)