Merge branch '5.4' into 6.2

* 5.4:
  Do not check errored definitions’ type
  [HttpKernel] Fix restoring surrogate content from cache
  [HttpClient] Fix getting through proxies via CONNECT
  Remove legacy filters remnants

Author: nicolas-grekas

Compiler/CheckTypeDeclarationsPass.php

@@ -207,7 +207,7 @@ private function checkType(Definition $checkedDefinition, mixed $value, \Reflect
         $class = null;
 
         if ($value instanceof Definition) {
-            if ($value->getFactory()) {
+            if ($value->hasErrors() || $value->getFactory()) {
                 return;
             }
 

Tests/Compiler/CheckTypeDeclarationsPassTest.php

@@ -23,6 +23,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\EnvPlaceholderParameterBag;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\Bar;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\BarErroredDependency;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\BarMethodCall;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\BarOptionalArgument;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\BarOptionalArgumentNotNull;
@@ -980,6 +981,20 @@ public function testIgnoreDefinitionFactoryArgument()
 
         $this->addToAssertionCount(1);
     }
+
+    public function testErroredDefinitionsAreNotChecked()
+    {
+        $container = new ContainerBuilder();
+        $container->register('errored_dependency', BarErroredDependency::class)
+            ->setArguments([
+                (new Definition(Foo::class))
+                    ->addError('error'),
+            ]);
+
+        (new CheckTypeDeclarationsPass(true))->process($container);
+
+        $this->addToAssertionCount(1);
+    }
 }
 
 class CallableClass

Tests/Fixtures/CheckTypeDeclarationsPass/BarErroredDependency.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass;
+
+class BarErroredDependency
+{
+    public function __construct(\stdClass $foo)
+    {
+    }
+}