Leverage str_starts_with(), str_ends_with() and str_contains()

Author: fancyweb

AmpHttpClient.php

@@ -81,10 +81,10 @@ public function request(string $method, string $url, array $options = []): Respo
         }
 
         if ($options['bindto']) {
-            if (0 === strpos($options['bindto'], 'if!')) {
+            if (str_starts_with($options['bindto'], 'if!')) {
                 throw new TransportException(__CLASS__.' cannot bind to network interfaces, use e.g. CurlHttpClient instead.');
             }
-            if (0 === strpos($options['bindto'], 'host!')) {
+            if (str_starts_with($options['bindto'], 'host!')) {
                 $options['bindto'] = substr($options['bindto'], 5);
             }
         }

Chunk/ServerSentEvent.php

@@ -29,7 +29,7 @@ public function __construct(string $content)
         parent::__construct(-1, $content);
 
         // remove BOM
-        if (0 === strpos($content, "\xEF\xBB\xBF")) {
+        if (str_starts_with($content, "\xEF\xBB\xBF")) {
             $content = substr($content, 3);
         }
 

DataCollector/HttpClientDataCollector.php

@@ -140,7 +140,7 @@ private function collectOnClient(TraceableHttpClient $client): array
                     }
                 }
 
-                if (0 === strpos($contentType, 'image/') && class_exists(ImgStub::class)) {
+                if (str_starts_with($contentType, 'image/') && class_exists(ImgStub::class)) {
                     $content = new ImgStub($content, $contentType, '');
                 } else {
                     $content = [$content];

Internal/AmpClientState.php

@@ -76,7 +76,7 @@ public function request(array $options, Request $request, CancellationToken $can
             foreach ($options['proxy']['no_proxy'] as $rule) {
                 $dotRule = '.'.ltrim($rule, '.');
 
-                if ('*' === $rule || $host === $rule || substr($host, -\strlen($dotRule)) === $dotRule) {
+                if ('*' === $rule || $host === $rule || str_ends_with($host, $dotRule)) {
                     $options['proxy'] = null;
                     break;
                 }

Internal/AmpListener.php

@@ -81,7 +81,7 @@ public function startSendingRequest(Request $request, Stream $stream): Promise
     {
         $host = $stream->getRemoteAddress()->getHost();
 
-        if (false !== strpos($host, ':')) {
+        if (str_contains($host, ':')) {
             $host = '['.$host.']';
         }
 

Tests/CurlHttpClientTest.php

@@ -22,7 +22,7 @@ class CurlHttpClientTest extends HttpClientTestCase
 {
     protected function getHttpClient(string $testCase): HttpClientInterface
     {
-        if (false !== strpos($testCase, 'Push')) {
+        if (str_contains($testCase, 'Push')) {
             if (!\defined('CURLMOPT_PUSHFUNCTION') || 0x073d00 > ($v = curl_version())['version_number'] || !(\CURL_VERSION_HTTP2 & $v['features'])) {
                 $this->markTestSkipped('curl <7.61 is used or it is not compiled with support for HTTP/2 PUSH');
             }