diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '5.2' into 5.x

Browse Source 
* 5.2:
  [FrameworkBundle] Fix messenger.receiver_locator service definition
  Fix CS in IsbnValidator and IssnValidator
This commit is contained in:
Robin Chalas 2021-04-14 15:13:13 +02:00
commit a58ccf7c45
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
View File

@ -11,6 +11,7 @@
namespace Symfony\Component\DependencyInjection\Loader\Configurator; namespace Symfony\Component\DependencyInjection\Loader\Configurator;
use Symfony\Component\DependencyInjection\ServiceLocator;
use Symfony\Component\Messenger\Bridge\AmazonSqs\Transport\AmazonSqsTransportFactory; use Symfony\Component\Messenger\Bridge\AmazonSqs\Transport\AmazonSqsTransportFactory;
use Symfony\Component\Messenger\Bridge\Amqp\Transport\AmqpTransportFactory; use Symfony\Component\Messenger\Bridge\Amqp\Transport\AmqpTransportFactory;
use Symfony\Component\Messenger\Bridge\Beanstalkd\Transport\BeanstalkdTransportFactory; use Symfony\Component\Messenger\Bridge\Beanstalkd\Transport\BeanstalkdTransportFactory;
@ -107,7 +108,7 @@ return static function (ContainerConfigurator $container) {
]) ])
// Discovery // Discovery
->set('messenger.receiver_locator') ->set('messenger.receiver_locator', ServiceLocator::class)
->args([ ->args([
[], [],
]) ])
@ -141,7 +142,7 @@ return static function (ContainerConfigurator $container) {
->set('messenger.transport.beanstalkd.factory', BeanstalkdTransportFactory::class) ->set('messenger.transport.beanstalkd.factory', BeanstalkdTransportFactory::class)
// retry // retry
->set('messenger.retry_strategy_locator') ->set('messenger.retry_strategy_locator', ServiceLocator::class)
->args([ ->args([
[], [],
]) ])

3
src/Symfony/Component/Validator/Constraints/IsbnValidator.php
View File

@ -163,8 +163,7 @@ class IsbnValidator extends ConstraintValidator
} }
for ($i = 1; $i < 12; $i += 2) { for ($i = 1; $i < 12; $i += 2) {
$checkSum += $isbn[$i] $checkSum += $isbn[$i] * 3;
* 3;
} }
return 0 === $checkSum % 10 ? true : Isbn::CHECKSUM_FAILED_ERROR; return 0 === $checkSum % 10 ? true : Isbn::CHECKSUM_FAILED_ERROR;

5
src/Symfony/Component/Validator/Constraints/IssnValidator.php
View File

@ -114,10 +114,7 @@ class IssnValidator extends ConstraintValidator
} }
// Calculate a checksum. "X" equals 10. // Calculate a checksum. "X" equals 10.
$checkSum = 'X' === $canonical[7] $checkSum = 'X' === $canonical[7] || 'x' === $canonical[7] ? 10 : $canonical[7];
|| 'x' === $canonical[7]
? 10
: $canonical[7];
for ($i = 0; $i < 7; ++$i) { for ($i = 0; $i < 7; ++$i) {
// Multiply the first digit by 8, the second by 7, etc. // Multiply the first digit by 8, the second by 7, etc.