Merge branch '4.4' into 5.2

* 4.4:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with

Author: nicolas-grekas

Test/TransportFactoryTestCase.php

@@ -69,7 +69,7 @@ public function testCreate(Dsn $dsn, TransportInterface $transport)
         $factory = $this->getFactory();
 
         $this->assertEquals($transport, $factory->create($dsn));
-        if (false !== strpos('smtp', $dsn->getScheme())) {
+        if (str_contains('smtp', $dsn->getScheme())) {
             $this->assertStringMatchesFormat($dsn->getScheme().'://%S'.$dsn->getHost().'%S', (string) $transport);
         }
     }

Tests/Transport/Smtp/SmtpTransportTest.php

@@ -166,9 +166,9 @@ public function write(string $bytes, $debug = true): void
 
         $this->commands[] = $bytes;
 
-        if (0 === strpos($bytes, 'DATA')) {
+        if (str_starts_with($bytes, 'DATA')) {
             $this->nextResponse = '354 Enter message, ending with "." on a line by itself';
-        } elseif (0 === strpos($bytes, 'QUIT')) {
+        } elseif (str_starts_with($bytes, 'QUIT')) {
             $this->nextResponse = '221 Goodbye';
         } else {
             $this->nextResponse = '250 OK';

Transport/SendmailTransport.php

@@ -55,15 +55,15 @@ public function __construct(string $command = null, EventDispatcherInterface $di
         parent::__construct($dispatcher, $logger);
 
         if (null !== $command) {
-            if (false === strpos($command, ' -bs') && false === strpos($command, ' -t')) {
+            if (!str_contains($command, ' -bs') && !str_contains($command, ' -t')) {
                 throw new \InvalidArgumentException(sprintf('Unsupported sendmail command flags "%s"; must be one of "-bs" or "-t" but can include additional flags.', $command));
             }
 
             $this->command = $command;
         }
 
         $this->stream = new ProcessStream();
-        if (false !== strpos($this->command, ' -bs')) {
+        if (str_contains($this->command, ' -bs')) {
             $this->stream->setCommand($this->command);
             $this->transport = new SmtpTransport($this->stream, $dispatcher, $logger);
         }
@@ -92,13 +92,13 @@ protected function doSend(SentMessage $message): void
         $this->getLogger()->debug(sprintf('Email transport "%s" starting', __CLASS__));
 
         $command = $this->command;
-        if (false === strpos($command, ' -f')) {
+        if (!str_contains($command, ' -f')) {
             $command .= ' -f'.escapeshellarg($message->getEnvelope()->getSender()->getEncodedAddress());
         }
 
         $chunks = AbstractStream::replace("\r\n", "\n", $message->toIterable());
 
-        if (false === strpos($command, ' -i') && false === strpos($command, ' -oi')) {
+        if (!str_contains($command, ' -i') && !str_contains($command, ' -oi')) {
             $chunks = AbstractStream::replace("\n.", "\n..", $chunks);
         }
 

Transport/Smtp/Stream/AbstractStream.php

@@ -114,7 +114,7 @@ public static function replace(string $from, string $to, iterable $chunks): \Gen
                 continue;
             }
 
-            if (false !== strpos($chunk, $from)) {
+            if (str_contains($chunk, $from)) {
                 $chunk = explode($from, $chunk);
                 $carry = array_pop($chunk);
 

composer.json

@@ -21,7 +21,7 @@
         "psr/log": "^1|^2|^3",
         "symfony/event-dispatcher": "^4.4|^5.0",
         "symfony/mime": "^5.2.6",
-        "symfony/polyfill-php80": "^1.15",
+        "symfony/polyfill-php80": "^1.16",
         "symfony/service-contracts": "^1.1|^2"
     },
     "require-dev": {