Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commite8c7fc0

Browse files
committed
Merge branch '7.4' into 8.0
* 7.4: Fix syntax errors/warnings in 6.4
2 parents0a3e2c1 +80e6bac commite8c7fc0

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
@@ -385,20 +385,20 @@ Symfony provides the following env var processors:
385385
386386
..code-block::php
387387
388-
// config/services.php
389-
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
388+
// config/services.php
389+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
390390
391-
return function(ContainerConfigurator $container): void {
392-
// ...
391+
return function(ContainerConfigurator $container): void {
392+
// ...
393393
394-
$services->set(SomeService::class)
395-
->arg('$host', '%env(string:key:host:url:DATABASE_URL)%')
396-
->arg('$port', '%env(int:key:port:url:DATABASE_URL)%')
397-
->arg('$username', '%env(string:key:user:url:DATABASE_URL)%')
398-
->arg('$password', '%env(string:key:pass:url:DATABASE_URL)%')
399-
->arg('$database_name', '%env(key:path:url:DATABASE_URL)%')
400-
;
401-
};
394+
$services->set(SomeService::class)
395+
->arg('$host', '%env(string:key:host:url:DATABASE_URL)%')
396+
->arg('$port', '%env(int:key:port:url:DATABASE_URL)%')
397+
->arg('$username', '%env(string:key:user:url:DATABASE_URL)%')
398+
->arg('$password', '%env(string:key:pass:url:DATABASE_URL)%')
399+
->arg('$database_name', '%env(key:path:url:DATABASE_URL)%')
400+
;
401+
};
402402
403403
..warning::
404404

@@ -429,17 +429,17 @@ Symfony provides the following env var processors:
429429
430430
..code-block::php
431431
432-
// config/services.php
433-
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
432+
// config/services.php
433+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
434434
435-
return function(ContainerConfigurator $container): void {
436-
// ...
435+
return function(ContainerConfigurator $container): void {
436+
// ...
437437
438-
$services->set(SomeService::class)
439-
->arg('$serverVersion', '%env(string:key:serverVersion:query_string:DATABASE_URL)%')
440-
->arg('$charset', '%env(int:string:charset:query_string:DATABASE_URL)%')
441-
;
442-
};
438+
$services->set(SomeService::class)
439+
->arg('$serverVersion', '%env(string:key:serverVersion:query_string:DATABASE_URL)%')
440+
->arg('$charset', '%env(int:string:charset:query_string:DATABASE_URL)%')
441+
;
442+
};
443443
444444
``env(enum:FooEnum:BAR)``
445445
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)
[8]ページ先頭
©2009-2025 Movatter.jp