Merge branch '5.2' into 5.3

* 5.2:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with

Author: nicolas-grekas

Command/ConsumeMessagesCommand.php

@@ -215,9 +215,9 @@ private function convertToBytes(string $memoryLimit): int
     {
         $memoryLimit = strtolower($memoryLimit);
         $max = ltrim($memoryLimit, '+');
-        if (0 === strpos($max, '0x')) {
+        if (str_starts_with($max, '0x')) {
             $max = \intval($max, 16);
-        } elseif (0 === strpos($max, '0')) {
+        } elseif (str_starts_with($max, '0')) {
             $max = \intval($max, 8);
         } else {
             $max = (int) $max;

Handler/HandlerDescriptor.php

@@ -65,7 +65,7 @@ private function callableName(callable $handler): string
 
         if ($handler instanceof \Closure) {
             $r = new \ReflectionFunction($handler);
-            if (false !== strpos($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure}')) {
                 return 'Closure';
             }
             if ($class = $r->getClosureScopeClass()) {

TraceableMessageBus.php

@@ -86,7 +86,7 @@ private function getCaller(): array
                 $line = $trace[$i]['line'];
 
                 while (++$i < 8) {
-                    if (isset($trace[$i]['function'], $trace[$i]['file']) && empty($trace[$i]['class']) && 0 !== strpos($trace[$i]['function'], 'call_user_func')) {
+                    if (isset($trace[$i]['function'], $trace[$i]['file']) && empty($trace[$i]['class']) && !str_starts_with($trace[$i]['function'], 'call_user_func')) {
                         $file = $trace[$i]['file'];
                         $line = $trace[$i]['line'];
 

Transport/InMemoryTransportFactory.php

@@ -33,7 +33,7 @@ public function createTransport(string $dsn, array $options, SerializerInterface
 
     public function supports(string $dsn, array $options): bool
     {
-        return 0 === strpos($dsn, 'in-memory://');
+        return str_starts_with($dsn, 'in-memory://');
     }
 
     public function reset()

Transport/Serialization/PhpSerializer.php

@@ -29,7 +29,7 @@ public function decode(array $encodedEnvelope): Envelope
             throw new MessageDecodingFailedException('Encoded envelope should have at least a "body".');
         }
 
-        if (false === strpos($encodedEnvelope['body'], '}', -1)) {
+        if (!str_contains($encodedEnvelope['body'], '}', -1)) {
             $encodedEnvelope['body'] = base64_decode($encodedEnvelope['body']);
         }
 

Transport/Serialization/Serializer.php

@@ -112,7 +112,7 @@ private function decodeStamps(array $encodedEnvelope): array
     {
         $stamps = [];
         foreach ($encodedEnvelope['headers'] as $name => $value) {
-            if (0 !== strpos($name, self::STAMP_HEADER_PREFIX)) {
+            if (!str_starts_with($name, self::STAMP_HEADER_PREFIX)) {
                 continue;
             }
 

Transport/Sync/SyncTransportFactory.php

@@ -35,6 +35,6 @@ public function createTransport(string $dsn, array $options, SerializerInterface
 
     public function supports(string $dsn, array $options): bool
     {
-        return 0 === strpos($dsn, 'sync://');
+        return str_starts_with($dsn, 'sync://');
     }
 }

composer.json

@@ -21,7 +21,7 @@
         "symfony/amqp-messenger": "^5.1",
         "symfony/deprecation-contracts": "^2.1",
         "symfony/doctrine-messenger": "^5.1",
-        "symfony/polyfill-php80": "^1.15",
+        "symfony/polyfill-php80": "^1.16",
         "symfony/redis-messenger": "^5.1"
     },
     "require-dev": {