Support for PHP 8.1

yiisoft · Jul 12, 2023 · c1ea29a · c1ea29a
1 parent e67aca8
commit c1ea29a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
  fail-fast: false
  matrix:
  os: [ubuntu-latest]
- php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
+ php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
 
  steps:
  - name: Checkout

diff --git a/src/CurlFormatter.php b/src/CurlFormatter.php
@@ -42,7 +42,7 @@ public function format(Request $request)
  $content = http_build_query((array)$data, '', '&', $this->encodingType);
  $request->setFullUrl(null);
  $url = $request->getFullUrl();
- $url .= (strpos($url, '?') === false) ? '?' : '&';
+ $url .= ($url === null || strpos($url, '?') === false) ? '?' : '&';
  $url .= $content;
  $request->setFullUrl($url);
  }

diff --git a/src/UrlEncodedFormatter.php b/src/UrlEncodedFormatter.php
@@ -48,7 +48,7 @@ public function format(Request $request)
  if (!empty($content)) {
  $request->setFullUrl(null);
  $url = $request->getFullUrl();
- $url .= (strpos($url, '?') === false) ? '?' : '&';
+ $url .= ($url === null || strpos($url, '?') === false) ? '?' : '&';
  $url .= $content;
  $request->setFullUrl($url);
  }