Merge branch '6.4' into 7.3

* 6.4:
  Fix syntax errors/warnings in 6.4
This commit is contained in:
Oskar Stark
2025-11-29 22:38:14 +01:00
3 changed files with 31 additions and 22 deletions

9
components/index.rst Normal file
View File

@@ -0,0 +1,9 @@
The Components
==============
.. toctree::
:maxdepth: 1
:glob:
using_components
*

View File

@@ -671,20 +671,20 @@ Symfony provides the following env var processors:
.. code-block:: php
// config/services.php
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
// config/services.php
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
return function(ContainerConfigurator $container): void {
// ...
return function(ContainerConfigurator $container): void {
// ...
$services->set(SomeService::class)
->arg('$host', '%env(string:key:host:url:DATABASE_URL)%')
->arg('$port', '%env(int:key:port:url:DATABASE_URL)%')
->arg('$username', '%env(string:key:user:url:DATABASE_URL)%')
->arg('$password', '%env(string:key:pass:url:DATABASE_URL)%')
->arg('$database_name', '%env(key:path:url:DATABASE_URL)%')
;
};
$services->set(SomeService::class)
->arg('$host', '%env(string:key:host:url:DATABASE_URL)%')
->arg('$port', '%env(int:key:port:url:DATABASE_URL)%')
->arg('$username', '%env(string:key:user:url:DATABASE_URL)%')
->arg('$password', '%env(string:key:pass:url:DATABASE_URL)%')
->arg('$database_name', '%env(key:path:url:DATABASE_URL)%')
;
};
.. warning::
@@ -734,17 +734,17 @@ Symfony provides the following env var processors:
.. code-block:: php
// config/services.php
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
// config/services.php
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
return function(ContainerConfigurator $container): void {
// ...
return function(ContainerConfigurator $container): void {
// ...
$services->set(SomeService::class)
->arg('$serverVersion', '%env(string:key:serverVersion:query_string:DATABASE_URL)%')
->arg('$charset', '%env(int:string:charset:query_string:DATABASE_URL)%')
;
};
$services->set(SomeService::class)
->arg('$serverVersion', '%env(string:key:serverVersion:query_string:DATABASE_URL)%')
->arg('$charset', '%env(int:string:charset:query_string:DATABASE_URL)%')
;
};
``env(enum:FooEnum:BAR)``
Tries to convert an environment variable to an actual ``\BackedEnum`` value.

View File

@@ -231,7 +231,7 @@ following these rules:
* **Feature**: For new features and deprecations; Pull requests must be merged
in the development branch.
* **Bug**: Only for bug fixes; We are very conservative when it comes to
merging older, but still maintained, branches. Read the :doc:`maintenance`
merging older, but still maintained, branches. Read the :doc:`/contributing/code/maintenance`
document for more information.
* **Minor**: For everything that does not change the code or when they don't
need to be listed in the CHANGELOG files: typos, Markdown files, test files,