PHP 8.0: ensure parameter names are aligned with PHP native param names

src/Cookie/Jar.php

@@ -58,54 +58,54 @@ public function normalize_cookie($cookie, $key = null) {
 	/**
 	 * Check if the given item exists
 	 *
-	 * @param string $key Item key
+	 * @param string $offset Item key
 	 * @return boolean Does the item exist?
 	 */
 	#[ReturnTypeWillChange]
-	public function offsetExists($key) {
-		return isset($this->cookies[$key]);
+	public function offsetExists($offset) {
+		return isset($this->cookies[$offset]);
 	}
 
 	/**
 	 * Get the value for the item
 	 *
-	 * @param string $key Item key
+	 * @param string $offset Item key
 	 * @return string|null Item value (null if offsetExists is false)
 	 */
 	#[ReturnTypeWillChange]
-	public function offsetGet($key) {
-		if (!isset($this->cookies[$key])) {
+	public function offsetGet($offset) {
+		if (!isset($this->cookies[$offset])) {
 			return null;
 		}
 
-		return $this->cookies[$key];
+		return $this->cookies[$offset];
 	}
 
 	/**
 	 * Set the given item
 	 *
 	 * @throws \WpOrg\Requests\Exception On attempting to use dictionary as list (`invalidset`)
 	 *
-	 * @param string $key Item name
+	 * @param string $offset Item name
 	 * @param string $value Item value
 	 */
 	#[ReturnTypeWillChange]
-	public function offsetSet($key, $value) {
-		if ($key === null) {
+	public function offsetSet($offset, $value) {
+		if ($offset === null) {
 			throw new Exception('Object is a dictionary, not a list', 'invalidset');
 		}
 
-		$this->cookies[$key] = $value;
+		$this->cookies[$offset] = $value;
 	}
 
 	/**
 	 * Unset the given header
 	 *
-	 * @param string $key
+	 * @param string $offset
 	 */
 	#[ReturnTypeWillChange]
-	public function offsetUnset($key) {
-		unset($this->cookies[$key]);
+	public function offsetUnset($offset) {
+		unset($this->cookies[$offset]);
 	}
 
 	/**

src/Response/Headers.php

@@ -26,53 +26,53 @@ class Headers extends CaseInsensitiveDictionary {
 	 * Avoid using this where commas may be used unquoted in values, such as
 	 * Set-Cookie headers.
 	 *
-	 * @param string $key
+	 * @param string $offset
 	 * @return string|null Header value
 	 */
-	public function offsetGet($key) {
-		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
+	public function offsetGet($offset) {
+		$offset = strtolower($offset);
+		if (!isset($this->data[$offset])) {
 			return null;
 		}
 
-		return $this->flatten($this->data[$key]);
+		return $this->flatten($this->data[$offset]);
 	}
 
 	/**
 	 * Set the given item
 	 *
 	 * @throws \WpOrg\Requests\Exception On attempting to use dictionary as list (`invalidset`)
 	 *
-	 * @param string $key Item name
+	 * @param string $offset Item name
 	 * @param string $value Item value
 	 */
-	public function offsetSet($key, $value) {
-		if ($key === null) {
+	public function offsetSet($offset, $value) {
+		if ($offset === null) {
 			throw new Exception('Object is a dictionary, not a list', 'invalidset');
 		}
 
-		$key = strtolower($key);
+		$offset = strtolower($offset);
 
-		if (!isset($this->data[$key])) {
-			$this->data[$key] = array();
+		if (!isset($this->data[$offset])) {
+			$this->data[$offset] = array();
 		}
 
-		$this->data[$key][] = $value;
+		$this->data[$offset][] = $value;
 	}
 
 	/**
 	 * Get all values for a given header
 	 *
-	 * @param string $key
+	 * @param string $offset
 	 * @return array|null Header values
 	 */
-	public function getValues($key) {
-		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
+	public function getValues($offset) {
+		$offset = strtolower($offset);
+		if (!isset($this->data[$offset])) {
 			return null;
 		}
 
-		return $this->data[$key];
+		return $this->data[$offset];
 	}
 
 	/**

src/Utility/CaseInsensitiveDictionary.php

@@ -34,65 +34,65 @@ class CaseInsensitiveDictionary implements ArrayAccess, IteratorAggregate {
 	 * @param array $data Dictionary/map to convert to case-insensitive
 	 */
 	public function __construct(array $data = array()) {
-		foreach ($data as $key => $value) {
-			$this->offsetSet($key, $value);
+		foreach ($data as $offset => $value) {
+			$this->offsetSet($offset, $value);
 		}
 	}
 
 	/**
 	 * Check if the given item exists
 	 *
-	 * @param string $key Item key
+	 * @param string $offset Item key
 	 * @return boolean Does the item exist?
 	 */
 	#[ReturnTypeWillChange]
-	public function offsetExists($key) {
-		$key = strtolower($key);
-		return isset($this->data[$key]);
+	public function offsetExists($offset) {
+		$offset = strtolower($offset);
+		return isset($this->data[$offset]);
 	}
 
 	/**
 	 * Get the value for the item
 	 *
-	 * @param string $key Item key
+	 * @param string $offset Item key
 	 * @return string|null Item value (null if offsetExists is false)
 	 */
 	#[ReturnTypeWillChange]
-	public function offsetGet($key) {
-		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
+	public function offsetGet($offset) {
+		$offset = strtolower($offset);
+		if (!isset($this->data[$offset])) {
 			return null;
 		}
 
-		return $this->data[$key];
+		return $this->data[$offset];
 	}
 
 	/**
 	 * Set the given item
 	 *
 	 * @throws \WpOrg\Requests\Exception On attempting to use dictionary as list (`invalidset`)
 	 *
-	 * @param string $key Item name
+	 * @param string $offset Item name
 	 * @param string $value Item value
 	 */
 	#[ReturnTypeWillChange]
-	public function offsetSet($key, $value) {
-		if ($key === null) {
+	public function offsetSet($offset, $value) {
+		if ($offset === null) {
 			throw new Exception('Object is a dictionary, not a list', 'invalidset');
 		}
 
-		$key              = strtolower($key);
-		$this->data[$key] = $value;
+		$offset              = strtolower($offset);
+		$this->data[$offset] = $value;
 	}
 
 	/**
 	 * Unset the given header
 	 *
-	 * @param string $key
+	 * @param string $offset
 	 */
 	#[ReturnTypeWillChange]
-	public function offsetUnset($key) {
-		unset($this->data[strtolower($key)]);
+	public function offsetUnset($offset) {
+		unset($this->data[strtolower($offset)]);
 	}
 
 	/**

src/Utility/FilteredIterator.php

@@ -43,7 +43,7 @@ public function __construct($data, $callback) {
 	 * @phpcs:disable PHPCompatibility.FunctionNameRestrictions.NewMagicMethods.__unserializeFound
 	 */
 	#[ReturnTypeWillChange]
-	public function __unserialize($serialized) {}
+	public function __unserialize($data) {}
 	// phpcs:enable
 
 	public function __wakeup() {
@@ -70,5 +70,5 @@ public function current() {
 	 * @inheritdoc
 	 */
 	#[ReturnTypeWillChange]
-	public function unserialize($serialized) {}
+	public function unserialize($data) {}
 }