Merge branch '5.2' into 5.x

* 5.2:
  [HttpClient][PHPDoc] Fix 2 remaining return mixed
  [Cache] [FrameworkBundle] Fix logging for TagAwareAdapter
  [Route] Better inline requirements and defaults parsing
  Simplified condition and removed unused code from AbstractSessionListener::onKernelRequest
  [PhpUnitBridge] Fix phpunit symlink on Windows
  [Yaml] Fixed infinite loop when parser goes through an additional and invalid closing tag
  [Form] Fix 'invalid_message' use in multiple ChoiceType

Author: derrabus

DependencyInjection/FrameworkExtension.php

@@ -2109,6 +2109,12 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
                     ->setPublic($pool['public'])
                 ;
 
+                if (method_exists(TagAwareAdapter::class, 'setLogger')) {
+                    $container
+                        ->getDefinition($name)
+                        ->addMethodCall('setLogger', [new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]);
+                }
+
                 $pool['name'] = $tagAwareId = $name;
                 $pool['public'] = false;
                 $name = '.'.$name.'.inner';

Tests/DependencyInjection/Fixtures/php/cache.php

@@ -35,6 +35,11 @@
                     'redis://foo' => 'cache.adapter.redis',
                 ],
             ],
+            'cache.ccc' => [
+                'adapter' => 'cache.adapter.array',
+                'default_lifetime' => 410,
+                'tags' => true,
+            ],
             'cache.redis_tag_aware.foo' => [
                 'adapter' => 'cache.adapter.redis_tag_aware',
             ],

Tests/DependencyInjection/Fixtures/xml/cache.xml

@@ -18,6 +18,7 @@
                 <framework:adapter name="cache.adapter.filesystem" />
                 <framework:adapter name="cache.adapter.redis" provider="redis://foo" />
             </framework:pool>
+            <framework:pool name="cache.ccc" adapter="cache.adapter.array" default-lifetime="410" tags="true" />
             <framework:pool name="cache.redis_tag_aware.foo" adapter="cache.adapter.redis_tag_aware" />
             <framework:pool name="cache.redis_tag_aware.foo2" tags="true" adapter="cache.adapter.redis_tag_aware" />
             <framework:pool name="cache.redis_tag_aware.bar" adapter="cache.redis_tag_aware.foo" />

Tests/DependencyInjection/Fixtures/yml/cache.yml

@@ -25,6 +25,10 @@ framework:
                     - cache.adapter.array
                     - cache.adapter.filesystem
                     - {name: cache.adapter.redis, provider: 'redis://foo'}
+            cache.ccc:
+                adapter: cache.adapter.array
+                default_lifetime: 410
+                tags: true
             cache.redis_tag_aware.foo:
                 adapter: cache.adapter.redis_tag_aware
             cache.redis_tag_aware.foo2:

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -30,6 +30,7 @@
 use Symfony\Component\Cache\Adapter\ProxyAdapter;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\Cache\Adapter\RedisTagAwareAdapter;
+use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 use Symfony\Component\Cache\DependencyInjection\CachePoolPass;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
@@ -1537,6 +1538,17 @@ public function testCachePoolServices()
             12,
         ];
         $this->assertEquals($expected, $chain->getArguments());
+
+        // Test "tags: true" wrapping logic
+        $tagAwareDefinition = $container->getDefinition('cache.ccc');
+        $this->assertSame(TagAwareAdapter::class, $tagAwareDefinition->getClass());
+        $this->assertCachePoolServiceDefinitionIsCreated($container, (string) $tagAwareDefinition->getArgument(0), 'cache.adapter.array', 410);
+
+        if (method_exists(TagAwareAdapter::class, 'setLogger')) {
+            $this->assertEquals([
+                ['setLogger', [new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]],
+            ], $tagAwareDefinition->getMethodCalls());
+        }
     }
 
     public function testRedisTagAwareAdapter()
@@ -1948,6 +1960,9 @@ private function assertCachePoolServiceDefinitionIsCreated(ContainerBuilder $con
             case 'cache.adapter.redis':
                 $this->assertSame(RedisAdapter::class, $parentDefinition->getClass());
                 break;
+            case 'cache.adapter.array':
+                $this->assertSame(ArrayAdapter::class, $parentDefinition->getClass());
+                break;
             default:
                 $this->fail('Unresolved adapter: '.$adapter);
         }