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

Commitd54ec53

Browse files
committed
Merge remote-tracking branch 'origin/5.4' into 6.2
* origin/5.4: Move Notifier bridges doc to the code repo README files Add note about custom port configuration being ignored by specific mailer transport DSN [Notifier] Add link to readme bridges Tweak [Validator] Fix a valid Date and Time constraint format fix plural rules Update event_dispatcher.rst Update upload_file.rst Update upload_file.rst Update upload_file.rst Update access_control.rst smaller example for env(resolve:FOO) Minor tweak Update environment processor page [Uid] Fix Uid config example [Workflow] MarkingStore: remove "arguments" and add "property" [SecurityBundle] Add doc for stateless firewall [Messenger] add `WorkerMessageRetriedEvent` Add Form is_empty_callback option
2 parents0837e79 +7322465 commitd54ec53

File tree

20 files changed

+220
-526
lines changed

20 files changed

+220
-526
lines changed

‎_build/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
"php":">=8.1",
1818
"symfony/console":"^6.2",
1919
"symfony/process":"^6.2",
20-
"symfony-tools/docs-builder":"^0.18"
20+
"symfony-tools/docs-builder":"^0.20"
2121
}
2222
}

‎_build/composer.lock‎

Lines changed: 8 additions & 7 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎components/uid.rst‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ configure the behavior of the factory using configuration files::
100100
uid:
101101
default_uuid_version:6
102102
name_based_uuid_version:5
103-
name_based_uuid_namespace:~
103+
name_based_uuid_namespace:6ba7b810-9dad-11d1-80b4-00c04fd430c8
104104
time_based_uuid_version:6
105-
time_based_uuid_node:~
105+
time_based_uuid_node:121212121212
106106
107107
..code-block::xml
108108
@@ -119,9 +119,9 @@ configure the behavior of the factory using configuration files::
119119
<framework:uid
120120
default_uuid_version="6"
121121
name_based_uuid_version="5"
122-
name_based_uuid_namespace=""
122+
name_based_uuid_namespace="6ba7b810-9dad-11d1-80b4-00c04fd430c8"
123123
time_based_uuid_version="6"
124-
time_based_uuid_node=""
124+
time_based_uuid_node="121212121212"
125125
/>
126126
</framework:config>
127127
</container>
@@ -141,9 +141,9 @@ configure the behavior of the factory using configuration files::
141141
'uid' => [
142142
'default_uuid_version' => 6,
143143
'name_based_uuid_version' => 5,
144-
'name_based_uuid_namespace' => '',
144+
'name_based_uuid_namespace' => '6ba7b810-9dad-11d1-80b4-00c04fd430c8',
145145
'time_based_uuid_version' => 6,
146-
'time_based_uuid_node' =>'',
146+
'time_based_uuid_node' =>121212121212,
147147
],
148148
]);
149149
};

‎configuration/env_var_processors.rst‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,7 @@ Symfony provides the following env var processors:
300300
301301
# config/packages/sentry.yaml
302302
parameters:
303-
env(HOST):'10.0.0.1'
304-
sentry_host:'%env(HOST)%'
303+
sentry_host:'10.0.0.1'
305304
env(SENTRY_DSN):'http://%sentry_host%/project'
306305
sentry:
307306
dsn:'%env(resolve:SENTRY_DSN)%'
@@ -316,8 +315,7 @@ Symfony provides the following env var processors:
316315
https://symfony.com/schema/dic/services/services-1.0.xsd">
317316
318317
<parameters>
319-
<parameterkey="env(HOST)">10.0.0.1</parameter>
320-
<parameterkey="sentry_host">%env(HOST)%</parameter>
318+
<parameterkey="sentry_host">10.0.0.1</parameter>
321319
<parameterkey="env(SENTRY_DSN)">http://%sentry_host%/project</parameter>
322320
</parameters>
323321
@@ -327,8 +325,7 @@ Symfony provides the following env var processors:
327325
..code-block::php
328326
329327
// config/packages/sentry.php
330-
$container->setParameter('env(HOST)', '10.0.0.1');
331-
$container->setParameter('sentry_host', '%env(HOST)%');
328+
$container->setParameter('sentry_host', '10.0.0.1');
332329
$container->setParameter('env(SENTRY_DSN)', 'http://%sentry_host%/project');
333330
$container->loadFromExtension('sentry', [
334331
'dsn' => '%env(resolve:SENTRY_DSN)%',
@@ -441,7 +438,7 @@ Symfony provides the following env var processors:
441438
442439
# config/packages/framework.yaml
443440
parameters:
444-
env(AUTH_FILE):'../config/auth.json'
441+
env(AUTH_FILE):'%kernel.project_dir%/config/auth.json'
445442
google:
446443
auth:'%env(file:AUTH_FILE)%'
447444
@@ -482,7 +479,7 @@ Symfony provides the following env var processors:
482479
483480
# config/packages/framework.yaml
484481
parameters:
485-
env(PHP_FILE):'../config/.runtime-evaluated.php'
482+
env(PHP_FILE):'%kernel.project_dir%/config/.runtime-evaluated.php'
486483
app:
487484
auth:'%env(require:PHP_FILE)%'
488485
@@ -524,7 +521,7 @@ Symfony provides the following env var processors:
524521
525522
# config/packages/framework.yaml
526523
parameters:
527-
env(AUTH_FILE):'../config/auth.json'
524+
env(AUTH_FILE):'%kernel.project_dir%/config/auth.json'
528525
google:
529526
auth:'%env(trim:file:AUTH_FILE)%'
530527

‎controller/upload_file.rst‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ add a PDF brochure for each product. To do so, add a new property called
2727
#[ORM\Column(type: 'string')]
2828
private $brochureFilename;
2929

30-
public function getBrochureFilename()
30+
public function getBrochureFilename(): string
3131
{
3232
return $this->brochureFilename;
3333
}
3434

35-
public function setBrochureFilename($brochureFilename)
35+
public function setBrochureFilename(string$brochureFilename)
3636
{
3737
$this->brochureFilename = $brochureFilename;
3838

@@ -126,13 +126,14 @@ Finally, you need to update the code of the controller that handles the form::
126126
use Symfony\Component\HttpFoundation\File\Exception\FileException;
127127
use Symfony\Component\HttpFoundation\File\UploadedFile;
128128
use Symfony\Component\HttpFoundation\Request;
129+
use Symfony\Component\HttpFoundation\Response;
129130
use Symfony\Component\Routing\Annotation\Route;
130131
use Symfony\Component\String\Slugger\SluggerInterface;
131132

132133
class ProductController extends AbstractController
133134
{
134135
#[Route('/product/new', name: 'app_product_new')]
135-
public function new(Request $request, SluggerInterface $slugger)
136+
public function new(Request $request, SluggerInterface $slugger): Response
136137
{
137138
$product = new Product();
138139
$form = $this->createForm(ProductType::class, $product);
@@ -245,7 +246,7 @@ logic to a separate service::
245246
) {
246247
}
247248

248-
public function upload(UploadedFile $file)
249+
public function upload(UploadedFile $file): string
249250
{
250251
$originalFilename = pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME);
251252
$safeFilename = $this->slugger->slug($originalFilename);
@@ -260,7 +261,7 @@ logic to a separate service::
260261
return $fileName;
261262
}
262263

263-
public function getTargetDirectory()
264+
public function getTargetDirectory(): string
264265
{
265266
return $this->targetDirectory;
266267
}

‎event_dispatcher.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ listen to the same ``kernel.exception`` event::
255255

256256
class ExceptionSubscriber implements EventSubscriberInterface
257257
{
258-
public static function getSubscribedEvents()
258+
public static function getSubscribedEvents(): array
259259
{
260260
// return the subscribed events, their methods and priorities
261261
return [

‎mailer.rst‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,17 @@ Infobip infobip+smtp://KEY@default n/a
218218
219219
Note that the protocol is *always* HTTPs and cannot be changed.
220220

221+
..note::
222+
223+
The specific transports, e.g. ``mailgun+smtp`` are designed to work without any manual configuration.
224+
Changing the port by appending it to your DSN is not supported for any of these ``<provider>+smtp` transports.
225+
If you need to change the port, use the ``smtp`` transport instead, like so:
226+
227+
..code-block::env
228+
229+
# .env
230+
MAILER_DSN=smtp://KEY:DOMAIN@smtp.eu.mailgun.org.com:25
231+
221232
High Availability
222233
~~~~~~~~~~~~~~~~~
223234

‎messenger.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2475,12 +2475,13 @@ In addition to middleware, Messenger also dispatches several events. You can
24752475
:doc:`create an event listener</event_dispatcher>` to hook into various parts
24762476
of the process. For each, the event class is the event name:
24772477

2478-
*:class:`Symfony\\Component\\Messenger\\Event\\WorkerStartedEvent`
2479-
*:class:`Symfony\\Component\\Messenger\\Event\\WorkerMessageReceivedEvent`
24802478
*:class:`Symfony\\Component\\Messenger\\Event\\SendMessageToTransportsEvent`
24812479
*:class:`Symfony\\Component\\Messenger\\Event\\WorkerMessageFailedEvent`
24822480
*:class:`Symfony\\Component\\Messenger\\Event\\WorkerMessageHandledEvent`
2481+
*:class:`Symfony\\Component\\Messenger\\Event\\WorkerMessageReceivedEvent`
2482+
*:class:`Symfony\\Component\\Messenger\\Event\\WorkerMessageRetriedEvent`
24832483
*:class:`Symfony\\Component\\Messenger\\Event\\WorkerRunningEvent`
2484+
*:class:`Symfony\\Component\\Messenger\\Event\\WorkerStartedEvent`
24842485
*:class:`Symfony\\Component\\Messenger\\Event\\WorkerStoppedEvent`
24852486

24862487
Multiple Buses, Command & Event Buses

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp