Merge branch '5.1' into 5.2

* 5.1:
  [Security] Replace message data in JSON security error response
  [DI] Skip deprecated definitions in CheckTypeDeclarationsPass
  [Messenger][AmazonSqs] Fix auto-setup for fifo queue
  [DoctrineBridge] Take into account that indexBy="person_id" could be a db column name, for a referenced entity

Author: chalasr

Compiler/CheckTypeDeclarationsPass.php

@@ -84,7 +84,7 @@ protected function processValue($value, $isRoot = false)
             return $value;
         }
 
-        if (!$value instanceof Definition || $value->hasErrors()) {
+        if (!$value instanceof Definition || $value->hasErrors() || $value->isDeprecated()) {
             return parent::processValue($value, $isRoot);
         }
 

Tests/Compiler/CheckTypeDeclarationsPassTest.php

@@ -24,6 +24,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\BarMethodCall;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\BarOptionalArgument;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\BarOptionalArgumentNotNull;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\Deprecated;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\Foo;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\FooObject;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\UnionConstructor;
@@ -720,6 +721,19 @@ public function testProcessSkipSkippedIds()
         $this->addToAssertionCount(1);
     }
 
+    public function testProcessSkipsDeprecatedDefinitions()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foobar', Deprecated::class)
+            ->setDeprecated(true)
+        ;
+
+        (new CheckTypeDeclarationsPass(true))->process($container);
+
+        $this->addToAssertionCount(1);
+    }
+
     public function testProcessHandleClosureForCallable()
     {
         $closureDefinition = new Definition(\Closure::class);

Tests/Fixtures/CheckTypeDeclarationsPass/Deprecated.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass;
+
+trigger_deprecation('foo/bar', '1.2.3', 'Deprecated class.');
+
+class Deprecated
+{
+}