Merge branch '5.4' into 6.0

* 5.4:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with

Author: nicolas-grekas

Crypto/SMime.php

@@ -83,7 +83,7 @@ private function getMessageHeaders(string $headerData): array
             }
 
             // Handle headers that span multiple lines
-            if (false === strpos($headerLine, ':')) {
+            if (!str_contains($headerLine, ':')) {
                 $headers[$currentHeaderName] .= ' '.trim($headerLine);
                 continue;
             }

FileBinaryMimeTypeGuesser.php

@@ -74,7 +74,7 @@ public function guessMimeType(string $path): ?string
         ob_start();
 
         // need to use --mime instead of -i. see #6641
-        passthru(sprintf($this->cmd, escapeshellarg((0 === strpos($path, '-') ? './' : '').$path)), $return);
+        passthru(sprintf($this->cmd, escapeshellarg((str_starts_with($path, '-') ? './' : '').$path)), $return);
         if ($return > 0) {
             ob_end_clean();
 

Tests/AbstractMimeTypeGuesserTest.php

@@ -116,7 +116,7 @@ public function testGuessWithNonReadablePath()
         touch($path);
         @chmod($path, 0333);
 
-        if ('0333' == substr(sprintf('%o', fileperms($path)), -4)) {
+        if (str_ends_with(sprintf('%o', fileperms($path)), '0333')) {
             $this->expectException(\InvalidArgumentException::class);
             $this->getGuesser()->guessMimeType($path);
         } else {

Tests/Crypto/SMimeSignerTest.php

@@ -159,7 +159,7 @@ private function assertMessageSignatureIsValid(Message $message, Message $origin
         $this->assertMessageHeaders($message, $originalMessage);
         $this->assertTrue(openssl_pkcs7_verify($messageFile, 0, $this->generateTmpFilename(), [$this->samplesDir.'ca.crt']), sprintf('Verification of the message %s failed. Internal error "%s".', $messageFile, openssl_error_string()));
 
-        if (false === strpos($messageString, 'enveloped-data')) {
+        if (!str_contains($messageString, 'enveloped-data')) {
             // Tamper to ensure it actually verified
             file_put_contents($messageFile, str_replace('Content-Transfer-Encoding: ', 'Content-Transfer-Encoding:  ', $messageString));
             $this->assertFalse(openssl_pkcs7_verify($messageFile, 0, $this->generateTmpFilename(), [$this->samplesDir.'ca.crt']), sprintf('Verification of the message failed. Internal error "%s".', openssl_error_string()));