Merge branch '5.4' into 6.0

* 5.4:
  Make FormErrorIterator generic
  [symfony/mailjet-mailer] Fix invalid mailjet error managment
  typehint of DkimOptions algorithm wrong
  Remove extra space in NotificationEmail
  Fix the usage of the Valid constraints in array-based forms
  Fix return value of `NullToken::getUser()`
  [DI] fix `ServiceSubscriberTrait` bug where parent has `__call()`
  [HttpClient] Fix reading proxy settings from dotenv when curl is used
  [Process] Don't return executable directories in PhpExecutableFinder
  Center icons vertically in trace list

Author: derrabus

HttpClient/Test/HttpClientTestCase.php

@@ -954,6 +954,16 @@ public function testProxy()
 
         $body = $response->toArray();
         $this->assertSame('Basic Zm9vOmI9YXI=', $body['HTTP_PROXY_AUTHORIZATION']);
+
+        $_SERVER['http_proxy'] = 'http://localhost:8057';
+        try {
+            $response = $client->request('GET', 'http://localhost:8057/');
+            $body = $response->toArray();
+            $this->assertSame('localhost:8057', $body['HTTP_HOST']);
+            $this->assertMatchesRegularExpression('#^http://(localhost|127\.0\.0\.1):8057/$#', $body['REQUEST_URI']);
+        } finally {
+            unset($_SERVER['http_proxy']);
+        }
     }
 
     public function testNoProxy()

Service/ServiceSubscriberTrait.php

@@ -36,7 +36,7 @@ public static function getSubscribedServices(): array
             return $services;
         }
 
-        $services = \is_callable(['parent', __FUNCTION__]) ? parent::getSubscribedServices() : [];
+        $services = method_exists(get_parent_class(self::class) ?: '', __FUNCTION__) ? parent::getSubscribedServices() : [];
 
         foreach ((new \ReflectionClass(self::class))->getMethods() as $method) {
             if (self::class !== $method->getDeclaringClass()->name) {
@@ -74,7 +74,7 @@ public function setContainer(ContainerInterface $container): ?ContainerInterface
     {
         $this->container = $container;
 
-        if (\is_callable(['parent', __FUNCTION__])) {
+        if (method_exists(get_parent_class(self::class) ?: '', __FUNCTION__)) {
             return parent::setContainer($container);
         }
 

Tests/Service/ServiceSubscriberTraitTest.php

@@ -40,6 +40,32 @@ public function testSetContainerIsCalledOnParent()
 
         $this->assertSame($container, (new TestService())->setContainer($container));
     }
+
+    public function testParentNotCalledIfHasMagicCall()
+    {
+        $container = new class([]) implements ContainerInterface {
+            use ServiceLocatorTrait;
+        };
+        $service = new class() extends ParentWithMagicCall {
+            use ServiceSubscriberTrait;
+        };
+
+        $this->assertNull($service->setContainer($container));
+        $this->assertSame([], $service::getSubscribedServices());
+    }
+
+    public function testParentNotCalledIfNoParent()
+    {
+        $container = new class([]) implements ContainerInterface {
+            use ServiceLocatorTrait;
+        };
+        $service = new class() {
+            use ServiceSubscriberTrait;
+        };
+
+        $this->assertNull($service->setContainer($container));
+        $this->assertSame([], $service::getSubscribedServices());
+    }
 }
 
 class ParentTestService
@@ -77,6 +103,19 @@ public function aChildService(): Service3
     }
 }
 
+class ParentWithMagicCall
+{
+    public function __call($method, $args)
+    {
+        throw new \BadMethodCallException('Should not be called.');
+    }
+
+    public static function __callStatic($method, $args)
+    {
+        throw new \BadMethodCallException('Should not be called.');
+    }
+}
+
 class Service3
 {
 }