Skip to content

Commit

Permalink
Merge branch '6.3' into 6.4
Browse files Browse the repository at this point in the history
* 6.3:
  Remove "--unpack" option from setup.rst
  [HttpClient] Symfony HTTP Client documentation
  Update license.rst
  add links label in service container page
  • Loading branch information
javiereguiluz committed Nov 23, 2023
2 parents 4574455 + 4e3a968 commit 31d958c
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 14 deletions.
2 changes: 1 addition & 1 deletion contributing/code/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Symfony Code License

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

Copyright (c) 2004-2021 Fabien Potencier
Copyright (c) 2004-present Fabien Potencier

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
7 changes: 6 additions & 1 deletion http_client.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1054,7 +1054,12 @@ If the server does respond with a gzipped response, it's decoded transparently.
To disable HTTP compression, send an ``Accept-Encoding: identity`` HTTP header.

Chunked transfer encoding is enabled automatically if both your PHP runtime and
the remote server supports it.
the remote server support it.

.. caution::

If you set ``Accept-Encoding`` to e.g. ``gzip``, you will need to handle the
decompression yourself.

HTTP/2 Support
~~~~~~~~~~~~~~
Expand Down
21 changes: 11 additions & 10 deletions service_container.rst
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ in the container.
There are actually *many* more services in the container, and each service has
a unique id in the container, like ``request_stack`` or ``router.default``. For a full
list, you can run ``php bin/console debug:container``. But most of the time,
you won't need to worry about this. See :ref:`services-wire-specific-service`.
See :doc:`/service_container/debug`.
you won't need to worry about this. See :ref:`how to choose a specific service
<services-wire-specific-service>`. See :doc:`/service_container/debug`.

.. _service-container-creating-service:

Expand Down Expand Up @@ -228,10 +228,11 @@ each time you ask for it.

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

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

.. _service-container_limiting-to-env:

Expand Down Expand Up @@ -927,8 +928,8 @@ argument for *any* service defined in this file! You can bind arguments by name
(e.g. ``$adminEmail``), by type (e.g. ``Psr\Log\LoggerInterface``) or both
(e.g. ``Psr\Log\LoggerInterface $requestLogger``).

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

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

You can also ``exclude`` certain paths. This is optional, but will slightly increase
performance in the ``dev`` environment: excluded paths are not tracked and so modifying
Expand Down
3 changes: 1 addition & 2 deletions setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,7 @@ which in turn installs several packages like ``symfony/debug-bundle``,
You won't see the ``symfony/debug-pack`` dependency in your ``composer.json``,
as Flex automatically unpacks the pack. This means that it only adds the real
packages as dependencies (e.g. you will see a new ``symfony/var-dumper`` in
``require-dev``). While it is not recommended, you can use the ``composer
require --no-unpack ...`` option to disable unpacking.
``require-dev``).

.. _security-checker:

Expand Down

0 comments on commit 31d958c

Please sign in to comment.