Skip to content

Commit 3f6a403

Browse files
committed
minor #21614 Fix syntax errors/warnings in 6.4 (wouterj)
This PR was merged into the 6.4 branch. Discussion ---------- Fix syntax errors/warnings in 6.4 Some syntax warnings found by the phpDocument parser that were introduced in the past year. I'll see if I can maybe add a new CI job with the new parser, which is a lot more detailed about syntax mistakes. That'll help us prepare for the migration. Commits ------- bdaebd6 Fix syntax errors/warnings in 6.4
2 parents 624f0f1 + bdaebd6 commit 3f6a403

File tree

3 files changed

+31
-22
lines changed

3 files changed

+31
-22
lines changed

components/index.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
The Components
2+
==============
3+
4+
.. toctree::
5+
:maxdepth: 1
6+
:glob:
7+
8+
using_components
9+
*

configuration/env_var_processors.rst

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -675,20 +675,20 @@ Symfony provides the following env var processors:
675675
676676
.. code-block:: php
677677
678-
// config/services.php
679-
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
678+
// config/services.php
679+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
680680
681-
return function(ContainerConfigurator $container): void {
682-
// ...
681+
return function(ContainerConfigurator $container): void {
682+
// ...
683683
684-
$services->set(SomeService::class)
685-
->arg('$host', '%env(string:key:host:url:DATABASE_URL)%')
686-
->arg('$port', '%env(int:key:port:url:DATABASE_URL)%')
687-
->arg('$username', '%env(string:key:user:url:DATABASE_URL)%')
688-
->arg('$password', '%env(string:key:pass:url:DATABASE_URL)%')
689-
->arg('$database_name', '%env(key:path:url:DATABASE_URL)%')
690-
;
691-
};
684+
$services->set(SomeService::class)
685+
->arg('$host', '%env(string:key:host:url:DATABASE_URL)%')
686+
->arg('$port', '%env(int:key:port:url:DATABASE_URL)%')
687+
->arg('$username', '%env(string:key:user:url:DATABASE_URL)%')
688+
->arg('$password', '%env(string:key:pass:url:DATABASE_URL)%')
689+
->arg('$database_name', '%env(key:path:url:DATABASE_URL)%')
690+
;
691+
};
692692
693693
.. warning::
694694

@@ -738,17 +738,17 @@ Symfony provides the following env var processors:
738738
739739
.. code-block:: php
740740
741-
// config/services.php
742-
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
741+
// config/services.php
742+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
743743
744-
return function(ContainerConfigurator $container): void {
745-
// ...
744+
return function(ContainerConfigurator $container): void {
745+
// ...
746746
747-
$services->set(SomeService::class)
748-
->arg('$serverVersion', '%env(string:key:serverVersion:query_string:DATABASE_URL)%')
749-
->arg('$charset', '%env(int:string:charset:query_string:DATABASE_URL)%')
750-
;
751-
};
747+
$services->set(SomeService::class)
748+
->arg('$serverVersion', '%env(string:key:serverVersion:query_string:DATABASE_URL)%')
749+
->arg('$charset', '%env(int:string:charset:query_string:DATABASE_URL)%')
750+
;
751+
};
752752
753753
``env(enum:FooEnum:BAR)``
754754
Tries to convert an environment variable to an actual ``\BackedEnum`` value.

contributing/core_team.rst

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

0 commit comments

Comments
 (0)