8000 Remove the validation-specific configuration · symfony/symfony@c6e3fbf · GitHub
[go: up one dir, main page]
Skip to content

Commit c6e3fbf

Browse files
srozesroze
committed
Remove the validation-specific configuration
1 parent 39389f0 commit c6e3fbf

File tree

13 files changed

+35
-115
lines changed

13 files changed

+35
-115
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,14 +1024,6 @@ function ($a) {
10241024
->end()
10251025
->scalarNode('encoder')->defaultValue('messenger.transport.serializer')->end()
10261026
->scalarNode('decoder')->defaultValue('messenger.transport.serializer')->end()
1027-
->arrayNode('middlewares')
1028-
->addDefaultsIfNotSet()
1029-
->children()
1030-
->arrayNode('validation')
1031-
->{!class_exists(FullStack::class) && class_exists(Validation::class) ? 'canBeDisabled' : 'canBeEnabled'}()
1032-
->end()
1033-
->end()
1034-
->end()
10351027
->arrayNode('adapters')
10361028
->useAttributeAsKey('name')
10371029
->arrayPrototype()

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,16 +1472,6 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
14721472
}
14731473

14741474
$defaultMiddlewares = array('before' => array('logging'), 'after' => array('route_messages', 'call_message_handler'));
1475-
if ($config['middlewares']['validation']['enabled']) {
1476-
if (!$container->has('validator')) {
1477-
throw new LogicException('The Validation middleware is only available when the Validator component is installed and enabled. Try running "composer require symfony/validator".');
1478-
}
1479-
1480-
$defaultMiddlewares['before'][] = 'validation';
1481-
} else {
1482-
$container->removeDefinition('messenger.middleware.validation');
1483-
}
1484-
14851475
foreach ($config['buses'] as $name => $bus) {
14861476
$busId = 'messenger.bus.'.$name;
14871477

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@
357357
<xsd:element name="decoder" type="xsd:string" minOccurs="0" />
358358
<xsd:element name="routing" type="messenger_routing" minOccurs="0" maxOccurs="unbounded" />
359359
<xsd:element name="adapter" type="messenger_adapter" minOccurs="0" maxOccurs="unbounded" />
360-
<xsd:element name="middlewares" type="messenger_middlewares" minOccurs="0" maxOccurs="unbounded" />
361360
<xsd:element name="bus" type="messenger_bus" minOccurs="0" maxOccurs="unbounded" />
362361
</xsd:sequence>
363362
<xsd:attribute name="default-bus" type="xsd:string" />
@@ -395,21 +394,11 @@
395394
<xsd:attribute name="value" type="xsd:string" />
396395
</xsd:complexType>
397396

398-
<xsd:complexType name="messenger_middlewares">
399-
<xsd:sequence>
400-
<xsd:element name="validation" type="messenger_validation" minOccurs="0" maxOccurs="1" />
401-
</xsd:sequence>
402-
</xsd:complexType>
403-
404397
<xsd:complexType name="messenger_bus">
405398
<xsd:sequence>
406399
<xsd:element name="middleware" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
407400
</xsd:sequence>
408401
<xsd:attribute name="name" type="xsd:string" use="required"/>
409402
<xsd:attribute name="default-middlewares" type="xsd:boolean"/>
410403
</xsd:complexType>
411-
412-
<xsd:complexType name="messenger_validation">
413-
<xsd:attribute name="enabled" type="xsd:boolean" />
414-
</xsd:complexType>
415404
</xsd:schema>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,6 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
254254
'messenger' => array(
255255
'enabled' => !class_exists(FullStack::class) && interface_exists(MessageBusInterface::class),
256256
'routing' => array(),
257-
'middlewares' => array(
258-
'validation' => array(
259-
'enabled' => !class_exists(FullStack::class),
260-
),
261-
),
262257
'adapters' => array(),
263258
'serializer' => array(
264259
'enabled' => true,

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_validation_disabled.php

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_validation_enabled.php

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_validation_disabled.xml

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_validation_enabled.xml

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_validation_disabled.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_validation_enabled.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -528,18 +528,6 @@ public function testMessenger()
528528
$this->assertTrue($container->has('message_bus'));
529529
}
530530

531-
public function testMessengerValidationEnabled()
532-
{
533-
$container = $this->createContainerFromFile('messenger_validation_enabled');
534-
$this->assertTrue($definition = $container->hasDefinition('messenger.middleware.validation'));
535-
}
536-
537-
public function testMessengerValidationDisabled()
538-
{
539-
$container = $this->createContainerFromFile('messenger_validation_disabled');
540-
$this->assertFalse($container->hasDefinition('messenger.middleware.validation'));
541-
}
542-
543531
public function testMessengerAdapter()
544532
{
545533
$container = $this->createContainerFromFile('messenger_adapter');
@@ -594,13 +582,12 @@ public function testMessengerWithMultipleBuses()
594582
{
595583
$container = $this->createContainerFromFile('messenger_multiple_buses');
596584

597-
$defaultBeforeBuses = !class_exists(FullStack::class) && class_exists(Validation::class) ? array('logging', 'validation') : array('logging');
598585
$this->assertTrue($container->has('messenger.bus.commands'));
599586
$this->assertSame(array(), $container->getDefinition('messenger.bus.commands')->getArgument(0));
600-
$this->assertEquals(array_merge($defaultBeforeBuses, array('route_messages', 'call_message_handler')), $container->getParameter('messenger.bus.commands.middlewares'));
587+
$this->assertEquals(array('logging', 'route_messages', 'call_message_handler'), $container->getParameter('messenger.bus.commands.middlewares'));
601588
$this->assertTrue($container->has('messenger.bus.events'));
602589
$this->assertSame(array(), $container->getDefinition('messenger.bus.events')->getArgument(0));
603-
$this->assertEquals(array_merge($defaultBeforeBuses, array(TolerateNoHandler::class, 'route_messages', 'call_message_handler')), $container->getParameter('messenger.bus.events.middlewares'));
590+
$this->assertEquals(array('logging', TolerateNoHandler::class, 'route_messages', 'call_message_handler'), $container->getParameter('messenger.bus.events.middlewares'));
604591
$this->assertTrue($container->has('messenger.bus.queries'));
605592
$this->assertSame(array(), $container->getDefinition('messenger.bus.queries')->getArgument(0));
606593
$this->assertEquals(array('route_messages', TolerateNoHandler::class, 'call_message_handler'), $container->getParameter('messenger.bus.queries.middlewares'));

‎src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,10 @@ private function registerBusMiddlewares(ContainerBuilder $container, string $bus
213213
throw new RuntimeException(sprintf('Invalid middleware "%s": define such service to be able to use it.', $name));
214214
}
215215

216+
if ($messengerMiddlewareId === 'messenger.middleware.validation' && !$container->has('validator')) {
217+
throw new RuntimeException('The Validation middleware is only available when the Validator component is installed and enabled. Try running "composer require symfony/validator".');
218+
}
219+
216220
if ($container->getDefinition($messengerMiddlewareId)->isAbstract()) {
217221
$childDefinition = new ChildDefinition($messengerMiddlewareId);
218222

‎src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
use Symfony\Component\Messenger\Handler\MessageSubscriberInterface;
2626
use Symfony\Component\Messenger\MessageBusInterface;
2727
use Symfony\Component\Messenger\Middleware\TolerateNoHandler;
28+
use Symfony\Component\Messenger\Middleware\ValidationMiddleware;
2829
use Symfony\Component\Messenger\MiddlewareInterface;
2930
use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
3031
use Symfony\Component\Messenger\Tests\Fixtures\SecondMessage;
@@ -287,6 +288,34 @@ public function testCannotRegistersAnUndefinedMiddleware()
287288
(new MessengerPass())->process($container);
288289
}
289290

291+
/**
292+
* @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
293+
* @expectedExceptionMessage The Validation middleware is only available when the Validator component is installed and enabled. Try running "composer require symfony/validator".
294+
*/
295+
public function testTheValidationMiddlewareIsNotAvailableWithoutTheComponent()
296+
{
297+
$container = $this->getContainerBuilder();
298+
$container->register('messenger.middleware.validation', ValidationMiddleware::class);
299+
$container->register($fooBusId = 'messenger.bus.foo', MessageBusInterface::class)->setArgument(0, array())->addTag('messenger.bus', array('name' => 'foo'));
300+
$container->setParameter($middlewaresParameter = $fooBusId.'.middlewares', array('validation'));
301+
302+
(new MessengerPass())->process($container);
303+
}
304+
305+
public function testCanUseTheValidationMiddlewareWhenTheValidatorIsHere()
306+
{
307+
$container = $this->getContainerBuilder();
308+
$container->register('validator', Validator::class);
309+
$container->register('messenger.middleware.validation', ValidationMiddleware::class)->setAbstract(true);
310+
$container->register($fooBusId = 'messenger.bus.foo', MessageBusInterface::class)->setArgument(0, array())->addTag('messenger.bus', array('name' => 'foo'));
311+
$container->setParameter($middlewaresParameter = $fooBusId.'.middlewares', array('validation'));
312+
313+
(new MessengerPass())->process($container);
314+
315+
$this->assertTrue($container->hasDefinition($childMiddlewareId = $fooBusId.'.middleware.validation'));
316+
$this->assertEquals(array(new Reference($childMiddlewareId)), $container->getDefinition($fooBusId)->getArgument(0));
317+
}
318+
290319
private function getContainerBuilder(): ContainerBuilder
291320
{
292321
$container = new ContainerBuilder();

0 commit comments

Comments
 (0)
0