Merge pull request #1956 from carusogabriel/chore/use-coalesce-operator

Use Null Coalesce Operator
codeigniter4 · Apr 20, 2019 · 2db456a · 2db456a
2 parents 6973c65 + 319b60b
commit 2db456a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
@@ -148,12 +148,7 @@ public function getSegments(): array
 	 */
 	public function getOption(string $key)
 	{
-		if (array_key_exists($key, $this->options))
-		{
-			return $this->options[$key];
-		}
-
-		return null;
+		return $this->options[$key] ?? null;
 	}
 
 	//--------------------------------------------------------------------

diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
@@ -480,7 +480,7 @@ public function getEXIF(string $key = null, bool $silent = false)
 		$exif = exif_read_data($this->image->getPathname());
 		if (! is_null($key) && is_array($exif))
 		{
-			$exif = array_key_exists($key, $exif) ? $exif[$key] : false;
+			$exif = $exif[$key] ?? false;
 		}
 
 		return $exif;