Merge branch '4.4' into 5.3

* 4.4:
  [DependencyInjection] only allow `ReflectionNamedType` for `ServiceSubscriberTrait`
  Fix CS

Author: derrabus

src/Symfony/Component/Console/Input/ArgvInput.php

@@ -134,7 +134,7 @@ private function parseLongOption(string $token)
         $name = substr($token, 2);
 
         if (false !== $pos = strpos($name, '=')) {
-            if (0 === \strlen($value = substr($name, $pos + 1))) {
+            if ('' === $value = substr($name, $pos + 1)) {
                 array_unshift($this->parsed, $value);
             }
             $this->addLongOption(substr($name, 0, $pos), $value);

src/Symfony/Component/Console/Output/TrimmedBufferOutput.php

@@ -24,7 +24,8 @@ class TrimmedBufferOutput extends Output
     private $maxLength;
     private $buffer = '';
 
-    public function __construct(int $maxLength, ?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, OutputFormatterInterface $formatter = null) {
+    public function __construct(int $maxLength, ?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, OutputFormatterInterface $formatter = null)
+    {
         if ($maxLength <= 0) {
             throw new InvalidArgumentException(sprintf('"%s()" expects a strictly positive maxLength. Got %d.', __METHOD__, $maxLength));
         }

src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php

@@ -57,7 +57,7 @@ public function mapViolation(ConstraintViolation $violation, FormInterface $form
         $match = false;
 
         // Don't create a ViolationPath instance for empty property paths
-        if (\strlen($violation->getPropertyPath()) > 0) {
+        if ('' !== $violation->getPropertyPath()) {
             $violationPath = new ViolationPath($violation->getPropertyPath());
             $relativePath = $this->reconstructPath($violationPath, $form);
         }

src/Symfony/Component/HttpClient/CurlHttpClient.php

@@ -93,7 +93,7 @@ public function __construct(array $defaultOptions = [], int $maxHostConnections
         }
 
         // HTTP/2 push crashes before curl 7.61
-        if (!\defined('CURLMOPT_PUSHFUNCTION') || 0x073d00 > self::$curlVersion['version_number'] || !(\CURL_VERSION_HTTP2 & self::$curlVersion['features'])) {
+        if (!\defined('CURLMOPT_PUSHFUNCTION') || 0x073D00 > self::$curlVersion['version_number'] || !(\CURL_VERSION_HTTP2 & self::$curlVersion['features'])) {
             return;
         }
 
@@ -188,7 +188,7 @@ public function request(string $method, string $url, array $options = []): Respo
             $this->multi->dnsCache->evictions = [];
             $port = parse_url($authority, \PHP_URL_PORT) ?: ('http:' === $scheme ? 80 : 443);
 
-            if ($resolve && 0x072a00 > self::$curlVersion['version_number']) {
+            if ($resolve && 0x072A00 > self::$curlVersion['version_number']) {
                 // DNS cache removals require curl 7.42 or higher
                 // On lower versions, we have to create a new multi handle
                 curl_multi_close($this->multi->handle);

src/Symfony/Component/HttpFoundation/IpUtils.php

@@ -146,7 +146,7 @@ public static function checkIp6(?string $requestIp, string $ip)
         for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; ++$i) {
             $left = $netmask - 16 * ($i - 1);
             $left = ($left <= 16) ? $left : 16;
-            $mask = ~(0xffff >> $left) & 0xffff;
+            $mask = ~(0xFFFF >> $left) & 0xFFFF;
             if (($bytesAddr[$i] & $mask) != ($bytesTest[$i] & $mask)) {
                 return self::$checkedIps[$cacheKey] = false;
             }

src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php

@@ -168,12 +168,12 @@ public function testFilter()
 
         $this->assertFalse($bag->filter('dec', '', \FILTER_VALIDATE_INT, [
             'flags' => \FILTER_FLAG_ALLOW_HEX,
-            'options' => ['min_range' => 1, 'max_range' => 0xff],
+            'options' => ['min_range' => 1, 'max_range' => 0xFF],
         ]), '->filter() gets a value of parameter as integer between boundaries');
 
         $this->assertFalse($bag->filter('hex', '', \FILTER_VALIDATE_INT, [
             'flags' => \FILTER_FLAG_ALLOW_HEX,
-            'options' => ['min_range' => 1, 'max_range' => 0xff],
+            'options' => ['min_range' => 1, 'max_range' => 0xFF],
         ]), '->filter() gets a value of parameter as integer between boundaries');
 
         $this->assertEquals(['bang'], $bag->filter('array', ''), '->filter() gets a value of parameter as an array');

src/Symfony/Component/Intl/Data/Util/RingBuffer.php

@@ -64,8 +64,6 @@ public function offsetGet($key)
 
     /**
      * {@inheritdoc}
-     *
-     * @return void
      */
     public function offsetSet($key, $value): void
     {
@@ -81,8 +79,6 @@ public function offsetSet($key, $value): void
 
     /**
      * {@inheritdoc}
-     *
-     * @return void
      */
     public function offsetUnset($key): void
     {

src/Symfony/Component/Ldap/Adapter/ExtLdap/ConnectionOptions.php

@@ -52,8 +52,8 @@ final class ConnectionOptions
     public const X_TLS_RANDOM_FILE = 0x6009;
     public const X_TLS_CRLFILE = 0x6010;
     public const X_TLS_PACKAGE = 0x6011;
-    public const X_TLS_CRLCHECK = 0x600b;
-    public const X_TLS_DHFILE = 0x600e;
+    public const X_TLS_CRLCHECK = 0x600B;
+    public const X_TLS_DHFILE = 0x600E;
     public const X_SASL_MECH = 0x6100;
     public const X_SASL_REALM = 0x6101;
     public const X_SASL_AUTHCID = 0x6102;

src/Symfony/Component/Mime/Encoder/Rfc2231Encoder.php

@@ -37,7 +37,7 @@ public function encodeString(string $string, ?string $charset = 'utf-8', int $fi
 
         while (null !== $char = $charStream->read(4)) {
             $encodedChar = rawurlencode($char);
-            if (0 !== \strlen($currentLine) && \strlen($currentLine.$encodedChar) > $thisLineLength) {
+            if ('' !== $currentLine && \strlen($currentLine.$encodedChar) > $thisLineLength) {
                 $lines[] = '';
                 $currentLine = &$lines[$lineCount++];
                 $thisLineLength = $maxLineLength;

src/Symfony/Component/Mime/Header/AbstractHeader.php

@@ -262,7 +262,7 @@ private function tokensToString(array $tokens): string
             // Line longer than specified maximum or token was just a new line
             if (("\r\n" === $token) ||
                 ($i > 0 && \strlen($currentLine.$token) > $this->lineLength)
-                && 0 < \strlen($currentLine)) {
+                && '' !== $currentLine) {
                 $headerLines[] = '';
                 $currentLine = &$headerLines[$lineCount++];
             }

src/Symfony/Component/Process/Tests/PipeStdinInStdoutStdErrStreamSelect.php

@@ -34,7 +34,7 @@
         exit(ERR_TIMEOUT);
     }
 
-    if (in_array(\STDOUT, $w) && strlen($out) > 0) {
+    if (in_array(\STDOUT, $w) && '' !== $out) {
         $written = fwrite(\STDOUT, (string) $out, 32768);
         if (false === $written) {
             exit(ERR_WRITE_FAILED);
@@ -45,7 +45,7 @@
         $write = array_diff($write, [\STDOUT]);
     }
 
-    if (in_array(\STDERR, $w) && strlen($err) > 0) {
+    if (in_array(\STDERR, $w) && '' !== $err) {
         $written = fwrite(\STDERR, (string) $err, 32768);
         if (false === $written) {
             exit(ERR_WRITE_FAILED);

src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php

@@ -54,7 +54,7 @@ function (\SplFileInfo $current) {
         });
 
         foreach ($files as $file) {
-            if (!$file->isFile() ||  !str_ends_with($file->getFilename(), '.php')) {
+            if (!$file->isFile() || !str_ends_with($file->getFilename(), '.php')) {
                 continue;
             }
 

src/Symfony/Component/Routing/RouteCompiler.php

@@ -155,7 +155,7 @@ private static function compilePattern(Route $route, string $pattern, bool $isHo
 
             if ($isSeparator && $precedingText !== $precedingChar) {
                 $tokens[] = ['text', substr($precedingText, 0, -\strlen($precedingChar))];
-            } elseif (!$isSeparator && \strlen($precedingText) > 0) {
+            } elseif (!$isSeparator && '' !== $precedingText) {
                 $tokens[] = ['text', $precedingText];
             }
 

src/Symfony/Component/Security/Http/Firewall/ContextListener.php

@@ -293,7 +293,7 @@ private function safelyUnserialize(string $serializedToken)
         $prevUnserializeHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
         $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler) {
             if (__FILE__ === $file) {
-                throw new \ErrorException($msg, 0x37313bc, $type, $file, $line);
+                throw new \ErrorException($msg, 0x37313BC, $type, $file, $line);
             }
 
             return $prevErrorHandler ? $prevErrorHandler($type, $msg, $file, $line, $context) : false;
@@ -306,7 +306,7 @@ private function safelyUnserialize(string $serializedToken)
         restore_error_handler();
         ini_set('unserialize_callback_func', $prevUnserializeHandler);
         if ($e) {
-            if (!$e instanceof \ErrorException || 0x37313bc !== $e->getCode()) {
+            if (!$e instanceof \ErrorException || 0x37313BC !== $e->getCode()) {
                 throw $e;
             }
             if ($this->logger) {
@@ -322,7 +322,7 @@ private function safelyUnserialize(string $serializedToken)
      */
     public static function handleUnserializeCallback(string $class)
     {
-        throw new \ErrorException('Class not found: '.$class, 0x37313bc);
+        throw new \ErrorException('Class not found: '.$class, 0x37313BC);
     }
 
     public function setRememberMeServices(RememberMeServicesInterface $rememberMeServices)

src/Symfony/Component/Translation/Loader/MoFileLoader.php

@@ -22,13 +22,13 @@ class MoFileLoader extends FileLoader
      * Magic used for validating the format of an MO file as well as
      * detecting if the machine used to create that file was little endian.
      */
-    public const MO_LITTLE_ENDIAN_MAGIC = 0x950412de;
+    public const MO_LITTLE_ENDIAN_MAGIC = 0x950412DE;
 
     /**
      * Magic used for validating the format of an MO file as well as
      * detecting if the machine used to create that file was big endian.
      */
-    public const MO_BIG_ENDIAN_MAGIC = 0xde120495;
+    public const MO_BIG_ENDIAN_MAGIC = 0xDE120495;
 
     /**
      * The size of the header of an MO file in bytes.

src/Symfony/Contracts/Service/ServiceSubscriberTrait.php

@@ -42,9 +42,19 @@ public static function getSubscribedServices(): array
                 continue;
             }
 
-            if (self::class === $method->getDeclaringClass()->name && ($returnType = $method->getReturnType()) && !$returnType->isBuiltin()) {
-                $services[self::class.'::'.$method->name] = '?'.($returnType instanceof \ReflectionNamedType ? $returnType->getName() : $returnType);
+            if (self::class !== $method->getDeclaringClass()->name) {
+                continue;
+            }
+
+            if (!($returnType = $method->getReturnType()) instanceof \ReflectionNamedType) {
+                continue;
             }
+
+            if ($returnType->isBuiltin()) {
+                continue;
+            }
+
+            $services[self::class.'::'.$method->name] = '?'.$returnType->getName();
         }
 
         return $services;

src/Symfony/Contracts/Tests/Fixtures/TestServiceSubscriberUnion.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Symfony\Contracts\Tests\Fixtures;
+
+use Symfony\Contracts\Service\ServiceSubscriberTrait;
+
+class TestServiceSubscriberUnion
+{
+    use ServiceSubscriberTrait;
+
+    private function method1(): Service1
+    {
+        return $this->container->get(__METHOD__);
+    }
+
+    private function method2(): Service1|Service2
+    {
+        return $this->container->get(__METHOD__);
+    }
+
+    private function method3(): Service1|Service2|null
+    {
+        return $this->container->get(__METHOD__);
+    }
+}

src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php

@@ -16,6 +16,7 @@
 use Symfony\Contracts\Service\ServiceLocatorTrait;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
 use Symfony\Contracts\Service\ServiceSubscriberTrait;
+use Symfony\Contracts\Tests\Fixtures\TestServiceSubscriberUnion;
 
 class ServiceSubscriberTraitTest extends TestCase
 {
@@ -34,6 +35,16 @@ public function testSetContainerIsCalledOnParent()
 
         $this->assertSame($container, (new TestService())->setContainer($container));
     }
+
+    /**
+     * @requires PHP 8
+     */
+    public function testMethodsWithUnionReturnTypesAreIgnored()
+    {
+        $expected = [TestServiceSubscriberUnion::class.'::method1' => '?Symfony\Contracts\Tests\Fixtures\Service1'];
+
+        $this->assertEquals($expected, TestServiceSubscriberUnion::getSubscribedServices());
+    }
 }
 
 class ParentTestService