8000 Merge branch '4.2' · symfony/symfony@a928d2b · GitHub
[go: up one dir, main page]
Skip to content

Commit a928d2b

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.2'
* 4.2: fix cs [FrameworkBundle] define doctrine as default_pdo_provider only if the package is installed [Validator] Allow `ConstraintViolation::__toString()` to expose codes that are not null or emtpy strings Added upgrade to HandlersLocator fix type for $value in DocBlock [WebProfilerBundle] Fix title case [Config] fix path exclusion during glob discovery [FrameworkBundle][Messenger] Restore check for messenger serializer default id Fix wrapped loop of event listener [DI] fix edge case in InlineServiceDefinitionsPass undeprecate the single-colon notation for controllers Update HttpKernel.php
2 parents 5ba4997 + afb4244 commit a928d2b
  • WebProfilerBundle/Resources/views/Collector
  • Component

    • 27 files changed

    +165
    -51
    lines changed

    ‎UPGRADE-4.2.md

    Lines changed: 17 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -285,6 +285,23 @@ Messenger
    285285
    ```
    286286
    * The `EncoderInterface` and `DecoderInterface` interfaces have been replaced by a unified `Symfony\Component\Messenger\Transport\Serialization\SerializerInterface`.
    287287
    Each interface method have been merged untouched into the `Serializer` interface, so you can simply merge your two implementations together and implement the new interface.
    288+
    * The `HandlerLocator` class was replaced with `Symfony\Component\Messenger\Handler\HandlersLocator`.
    289+
    290+
    Before:
    291+
    ```php
    292+
    new HandlerLocator([
    293+
    YourMessage::class => $handlerCallable,
    294+
    ]);
    295+
    ```
    296+
    297+
    After:
    298+
    ```php
    299+
    new HandlersLocator([
    300+
    YourMessage::class => [
    301+
    $handlerCallable,
    302+
    ]
    303+
    ]);
    304+
    ```
    288305

    289306
    Monolog
    290307
    -------

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

    Lines changed: 3 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -13,6 +13,7 @@
    1313

    1414
    use Doctrine\Common\Annotations\Annotation;
    1515
    use Doctrine\Common\Cache\Cache;
    16+
    use Doctrine\DBAL\Connection;
    1617
    use Symfony\Bundle\FullStack;
    1718
    use Symfony\Component\Asset\Package;
    1819
    use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
    @@ -882,7 +883,7 @@ private function addCacheSection(ArrayNodeDefinition $rootNode)
    882883
    ->scalarNode('default_psr6_provider')->end()
    883884
    ->scalarNode('default_redis_provider')->defaultValue('redis://localhost')->end()
    884885
    ->scalarNode('default_memcached_provider')->defaultValue('memcached://localhost')->end()
    885-
    ->scalarNode('default_pdo_provider')->defaultValue('doctrine.dbal.default_connection')->end()
    886+
    ->scalarNode('default_pdo_provider')->defaultValue(class_exists(Connection::class) ? 'database_connection' : null)->end()
    886887
    ->arrayNode('pools')
    887888
    ->useAttributeAsKey('name')
    888889
    ->prototype('array')
    @@ -1059,7 +1060,7 @@ function ($a) {
    10591060
    })
    10601061
    ->end()
    10611062
    ->children()
    1062-
    ->scalarNode('id')->defaultValue('messenger.transport.symfony_serializer')->end()
    1063+
    ->scalarNode('id')->defaultValue(!class_exists(FullStack::class) && class_exists(Serializer::class) ? 'messenger.transport.symfony_serializer' : null)->end()
    10631064
    ->scalarNode('format')->defaultValue('json')->end()
    10641065
    ->arrayNode('context')
    10651066
    ->normalizeKeys(false)

    ‎src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -100,7 +100,7 @@ public function load($resource, $type = null)
    100100

    101101
    if (1 === substr_count($controller, ':')) {
    102102
    $nonDeprecatedNotation = str_replace(':', '::', $controller);
    103-
    @trigger_error(sprintf('Referencing controllers with a single colon is deprecated since Symfony 4.1, use "%s" instead.', $nonDeprecatedNotation), E_USER_DEPRECATED);
    103+
    // TODO deprecate this in 5.1
    104104
    }
    105105

    106106
    $route->setDefault('_controller', $controller);

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

    Lines changed: 4 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -11,13 +11,15 @@
    1111

    1212
    namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection;
    1313

    14+
    use Doctrine\DBAL\Connection;
    1415
    use PHPUnit\Framework\TestCase;
    1516
    use Symfony\Bundle\FrameworkBundle\DependencyInjection\Configuration;
    1617
    use Symfony\Bundle\FullStack;
    1718
    use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
    1819
    use Symfony\Component\Config\Definition\Processor;
    1920
    use Symfony\Component\Lock\Store\SemaphoreStore;
    2021
    use Symfony\Component\Messenger\MessageBusInterface;
    22+
    use Symfony\Component\Serializer\Serializer;
    2123

    2224
    class ConfigurationTest extends TestCase
    2325
    {
    @@ -267,7 +269,7 @@ protected static function getBundleDefaultConfig()
    267269
    'directory' => '%kernel.cache_dir%/pools',
    268270
    'default_redis_provider' => 'redis://localhost',
    269271
    'default_memcached_provider' => 'memcached://localhost',
    270-
    'default_pdo_provider' => 'doctrine.dbal.default_connection',
    272+
    'default_pdo_provider' => class_exists(Connection::class) ? 'database_connection' : null,
    271273
    ),
    272274
    'workflows' => array(
    273275
    'enabled' => false,
    @@ -293,7 +295,7 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
    293295
    'routing' => array(),
    294296
    'transports' => array(),
    295297
    'serializer' => array(
    296-
    'id' => 'messenger.transport.symfony_serializer',
    298+
    'id' => !class_exists(FullStack::class) && class_exists(Serializer::class) ? 'messenger.transport.symfony_serializer' : null,
    297299
    'format' => 'json',
    298300
    'context' => array(),
    299301
    ),

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

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -3,6 +3,7 @@
    33
    $container->loadFromExtension('framework', array(
    44
    'serializer' => true,
    55
    'messenger' => array(
    6+
    'serializer' => 'messenger.transport.symfony_serializer',
    67
    'routing' => array(
    78
    'Symfony\Component\Messenger\Tests\Fixtures\DummyMessage' => array('amqp', 'audit'),
    89
    'Symfony\Component\Messenger\Tests\Fixtures\SecondMessage' => array(

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

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -4,6 +4,7 @@
    44
    'serializer' => true,
    55
    'messenger' => array(
    66
    'serializer' => array(
    7+
    'id' => 'messenger.transport.symfony_serializer',
    78
    'format' => 'csv',
    89
    'context' => array('enable_max_depth' => true),
    910
    ),

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

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -5,6 +5,7 @@
    55
    'enabled' => false,
    66
    ),
    77
    'messenger' => array(
    8+
    'serializer' => 'messenger.transport.symfony_serializer',
    89
    'transports' => array(
    910
    'default' => 'amqp://localhost/%2f/messages',
    1011
    ),

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

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -3,6 +3,7 @@
    33
    $container->loadFromExtension('framework', array(
    44
    'serializer' => true,
    55
    'messenger' => array(
    6+
    'serializer' => 'serializer: messenger.transport.symfony_serializer',
    67
    'transports' => array(
    78
    'default' => 'amqp://localhost/%2f/messages',
    89
    'customised' => array(

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

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -8,6 +8,7 @@
    88
    <framework:config>
    99
    <framework:serializer enabled="true" />
    1010
    <framework:messenger>
    11+
    <framework:serializer id="messenger.transport.symfony_serializer" />
    1112
    <framework:routing message-class="Symfony\Component\Messenger\Tests\Fixtures\DummyMessage">
    1213
    <framework:sender service="amqp" />
    1314
    <framework:sender service="audit" />

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

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -8,7 +8,7 @@
    88
    <framework:config>
    99
    <framework:serializer enabled="true" />
    1010
    <framework:messenger>
    11-
    <framework:serializer format="csv">
    11+
    <framework:serializer id="messenger.transport.symfony_serializer" format="csv">
    1212
    <framework:context>
    1313
    <framework:enable_max_depth>true</framework:enable_max_depth>
    1414
    </framework:context>

    0 commit comments

    Comments
     (0)
    0