fix: get rid of (some) PHP deprecation warnings

- CakeResponse.php strotime() and preg_split() warnings
kamilwylegala · Jan 19, 2024 · a83e9c7 · a83e9c7
1 parent be94fb8
commit a83e9c7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -55,6 +55,10 @@ It means that composer will look at `master` branch of repository configured und
 
 ## Changelog
 
+### 2024-01-19
+
+- `strotime()` and `preg_split()` in CakeResponse deprecation warning fixes (passing null)
+
 ### 2024-01-11
 
 - `preg_replace` deprecation warning fixes (passing null instead of `string`)

diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php
@@ -1164,15 +1164,19 @@ public function checkNotModified(CakeRequest $request) {
 		$ifNoneMatchHeader = $request->header('If-None-Match');
 		$etags = array();
 		if (is_string($ifNoneMatchHeader)) {
-			$etags = preg_split('/\s*,\s*/', $ifNoneMatchHeader, null, PREG_SPLIT_NO_EMPTY);
+			$etags = preg_split('/\s*,\s*/', $ifNoneMatchHeader, 0, PREG_SPLIT_NO_EMPTY);
 		}
 		$modifiedSince = $request->header('If-Modified-Since');
 		$checks = array();
 		if ($responseTag = $this->etag()) {
 			$checks[] = in_array('*', $etags) || in_array($responseTag, $etags);
 		}
 		if ($modifiedSince) {
-			$checks[] = strtotime($this->modified()) === strtotime($modifiedSince);
+			if ($this->modified() === null) {
+				$checks[] = strtotime($modifiedSince) === false;
+			} else {
+				$checks[] = strtotime($this->modified()) === strtotime($modifiedSince);
+			}
 		}
 		if (empty($checks)) {
 			return false;