fix: get rid of (some) PHP deprecation warnings

- RequestHandlerComponent might not have CONTENT_TYPE env set - basics.php might not have SCRIPT_URI env set
kamilwylegala · Oct 20, 2023 · 0f1bb51 · 0f1bb51
1 parent 41af03e
commit 0f1bb51
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/Cake/Controller/Component/RequestHandlerComponent.php b/lib/Cake/Controller/Component/RequestHandlerComponent.php
@@ -531,7 +531,7 @@ public function requestedWith($type = null) {
 			return false;
 		}
 
-		list($contentType) = explode(';', env('CONTENT_TYPE'));
+		list($contentType) = explode(';', env('CONTENT_TYPE') ?? '');
 		if ($contentType === '') {
 			list($contentType) = explode(';', CakeRequest::header('CONTENT_TYPE'));
 		}

diff --git a/lib/Cake/basics.php b/lib/Cake/basics.php
@@ -323,7 +323,7 @@ function env($key) {
 			if (isset($_SERVER['HTTPS'])) {
 				return (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
 			}
-			return (strpos(env('SCRIPT_URI'), 'https://') === 0);
+			return (strpos(env('SCRIPT_URI') ?? '', 'https://') === 0);
 		}
 
 		if ($key === 'SCRIPT_NAME') {