8000 Merge branch '4.1' · symfony/symfony@68c869b · GitHub
[go: up one dir, main page]
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
Appearance settings

Commit 68c869b

Browse files
author
Robin Chalas
committed
Merge branch '4.1'
* 4.1: [FrameworkBundle] Don't register MessengerDataCollector if messenger is not enabled [Validator] Add Japanese translations [Console] Fix input values allowed types
2 parents 5b08019 + 3f1951a commit 68c869b

File tree

7 files changed

+34
-11
lines changed

7 files changed

+34
-11
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ class FrameworkExtension extends Extension
118118
private $sessionConfigEnabled = false;
119119
private $annotationsConfigEnabled = false;
120120
private $validatorConfigEnabled = false;
121+
private $messengerConfigEnabled = false;
121122

122123
/**
123124
* Responds to the app.config configuration parameter.
@@ -279,7 +280,7 @@ public function load(array $configs, ContainerBuilder $container)
279280
$this->registerLockConfiguration($config['lock'], $container, $loader);
280281
}
281282

282-
if ($this->isConfigEnabled($container, $config['messenger'])) {
283+
if ($this->messengerConfigEnabled = $this->isConfigEnabled($container, $config['messenger'])) {
283284
$this->registerMessengerConfiguration($config['messenger'], $container, $loader, $config['serializer'], $config['validation']);
284285
} else {
285286
$container->removeDefinition('console.command.messenger_consume_messages');
@@ -466,6 +467,10 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
466467
$container->getDefinition('translator.data_collector')->setDecoratedService('translator');
467468
}
468469

470+
if ($this->messengerConfigEnabled) {
471+
$loader->load('messenger_debug.xml');
472+
}
473+
469474
$container->setParameter('profiler_listener.only_exceptions', $config['only_exceptions']);
470475
$container->setParameter('profiler_listener.only_master_requests', $config['only_master_requests']);
471476

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,5 @@
5252
<tag name="kernel.event_listener" event="kernel.controller" method="onKernelController"/>
5353
<tag name="data_collector" template="@WebProfiler/Collector/router.html.twig" id="router" priority="285" />
5454
</service>
55-
56-
<service id="data_collector.messenger" class="Symfony\Component\Messenger\DataCollector\MessengerDataCollector">
57-
<tag name="data_collector" template="@WebProfiler/Collector/messenger.html.twig" id="messenger" priority="100" />
58-
</service>
5955
</services>
6056
</container>

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger_debug.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" ?>
2+
3+
<container xmlns="http://symfony.com/schema/dic/services"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
6+
7+
<services>
8+
<defaults public="false" />
9+
10+
<service id="data_collector.messenger" class="Symfony\Component\Messenger\DataCollector\MessengerDataCollector">
11+
<tag name="data_collector" template="@WebProfiler/Collector/messenger.html.twig" id="messenger" priority="100" />
12+
</service>
13+
</services>
14+
</container>

‎src/Symfony/Component/Console/Input/InputArgument.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function isArray()
8686
/**
8787
* Sets the default value.
8888
*
89-
* @param mixed $default The default value
89+
* @param string|string[] $default The default value
9090
*
9191
* @throws LogicException When incorrect default value is given
9292
*/
@@ -110,7 +110,7 @@ public function setDefault($default = null)
110110
/**
111111
* Returns the default value.
112112
*
113-
* @return mixed The default value
113+
* @return string|string[] The default value
114114
*/
115115
public function getDefault()
116116
{

‎src/Symfony/Component/Console/Input/InputInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function getArguments();
8585
*
8686
* @param string $name The argument name
8787
*
88-
* @return mixed The argument value
88+
* @return string|string[] The argument value
8989
*
9090
* @throws InvalidArgumentException When argument given doesn't exist
9191
*/
@@ -122,7 +122,7 @@ public function getOptions();
122122
*
123123
* @param string $name The option name
124124
*
125-
* @return mixed The option value
125+
* @return string|string[]|bool The option value
126126
*
127127
* @throws InvalidArgumentException When option given doesn't exist
128128
*/

‎src/Symfony/Component/Console/Input/InputOption.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public function isArray()
149149
/**
150150
* Sets the default value.
151151
*
152-
* @param mixed $default The default value
152+
* @param string|string[]|bool $default The default value
153153
*
154154
* @throws LogicException When incorrect default value is given
155155
*/
@@ -173,7 +173,7 @@ public function setDefault($default = null)
173173
/**
174174
* Returns the default value.
175175
*
176-
* @return mixed The default value
176+
* @return string|string[]|bool The default value
177177
*/
178178
public function getDefault()
179179
{

‎src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,14 @@
318318
<source>Error</source>
319319
<target>エラー</target>
320320
</trans-unit>
321+
<trans-unit id="83">
322+
<source>This is not a valid UUID.</source>
323+
<target>有効なUUIDではありません。</target>
324+
</trans-unit>
325+
<trans-unit id="84">
326+
<source>This value should be a multiple of {{ compared_value }}.</source>
327+
<target>{{ compared_value }}の倍数でなければなりません。</target>
328+
</trans-unit>
321329
</body>
322330
</file>
323331
</xliff>

0 commit comments

Comments
 (0)
0