Fix incompatibilities with some null values for PHP 8.1 (#114)

willdurand · Jan 30, 2022 · 68e9ea0 · 68e9ea0
1 parent 9785ce2
commit 68e9ea0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Negotiation/BaseAccept.php b/src/Negotiation/BaseAccept.php
@@ -112,11 +112,15 @@ public function hasParameter($key)
 
  /**
  *
- * @param string $acceptPart
+ * @param string|null $acceptPart
  * @return array
  */
  private function parseParameters($acceptPart)
  {
+ if ($acceptPart === null) {
+ return ['', []];
+ }
+
  $parts = explode(';', $acceptPart);
  $type = array_shift($parts);
 

diff --git a/src/Negotiation/LanguageNegotiator.php b/src/Negotiation/LanguageNegotiator.php
@@ -27,8 +27,8 @@ protected function match(AcceptHeader $acceptLanguage, AcceptHeader $priority, $
  $as = $acceptLanguage->getSubPart();
  $ps = $priority->getSubPart();
 
- $baseEqual = !strcasecmp($ab, $pb);
- $subEqual = !strcasecmp($as, $ps);
+ $baseEqual = !strcasecmp((string)$ab, (string)$pb);
+ $subEqual = !strcasecmp((string)$as, (string)$ps);
 
  if (($ab == '*' || $baseEqual) && ($as === null || $subEqual || null === $ps)) {
  $score = 10 * $baseEqual + $subEqual;