Merge pull request #58911 from nextcloud/backport/58201/stable33

[stable33] fix: Remove deprecated RFC7231 constant to avoid warnings on PHP 8.5

Author: kesselb

apps/dav/lib/Provisioning/Apple/AppleProvisioningNode.php

@@ -7,6 +7,7 @@
 namespace OCA\DAV\Provisioning\Apple;
 
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Constants;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\INode;
 use Sabre\DAV\IProperties;
@@ -58,7 +59,7 @@ public function getProperties($properties) {
 
 		return [
 			'{DAV:}getcontentlength' => 42,
-			'{DAV:}getlastmodified' => $datetime->format(\DateTimeInterface::RFC7231),
+			'{DAV:}getlastmodified' => $datetime->format(Constants::DATE_RFC7231),
 		];
 	}
 

lib/private/AppFramework/Middleware/NotModifiedMiddleware.php

@@ -11,6 +11,7 @@
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Middleware;
+use OCP\Constants;
 use OCP\IRequest;
 
 class NotModifiedMiddleware extends Middleware {
@@ -29,7 +30,7 @@ public function afterController($controller, $methodName, Response $response) {
 		}
 
 		$modifiedSinceHeader = $this->request->getHeader('IF_MODIFIED_SINCE');
-		if ($modifiedSinceHeader !== '' && $response->getLastModified() !== null && trim($modifiedSinceHeader) === $response->getLastModified()->format(\DateTimeInterface::RFC7231)) {
+		if ($modifiedSinceHeader !== '' && $response->getLastModified() !== null && trim($modifiedSinceHeader) === $response->getLastModified()->format(Constants::DATE_RFC7231)) {
 			$response->setStatus(Http::STATUS_NOT_MODIFIED);
 			return $response;
 		}

lib/public/AppFramework/Http/Response.php

@@ -9,6 +9,7 @@
 
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Constants;
 use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IUserSession;
@@ -98,7 +99,7 @@ public function cacheFor(int $cacheSeconds, bool $public = false, bool $immutabl
 			$time = \OCP\Server::get(ITimeFactory::class);
 			$expires->setTimestamp($time->getTime());
 			$expires->add(new \DateInterval('PT' . $cacheSeconds . 'S'));
-			$this->addHeader('Expires', $expires->format(\DateTimeInterface::RFC7231));
+			$this->addHeader('Expires', $expires->format(Constants::DATE_RFC7231));
 		} else {
 			$this->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
 			unset($this->headers['Expires']);
@@ -240,7 +241,7 @@ public function getHeaders() {
 		];
 
 		if ($this->lastModified) {
-			$mergeWith['Last-Modified'] = $this->lastModified->format(\DateTimeInterface::RFC7231);
+			$mergeWith['Last-Modified'] = $this->lastModified->format(Constants::DATE_RFC7231);
 		}
 
 		if ($this->ETag) {

lib/public/Constants.php

@@ -59,4 +59,12 @@ class Constants {
 	 * cf. sharing.maxAutocompleteResults in config.sample.php.
 	 */
 	public const SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT = 25;
+
+	/**
+	 * Replacement for the built-in `DATE_RFC7231` constant
+	 * deprecated since PHP 8.5.
+	 *
+	 * @since 33.0.1
+	 */
+	public const DATE_RFC7231 = 'D, d M Y H:i:s \G\M\T';
 }

tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php

@@ -12,6 +12,7 @@
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Response;
+use OCP\Constants;
 use OCP\IRequest;
 
 class NotModifiedMiddlewareTest extends \Test\TestCase {
@@ -44,13 +45,13 @@ public static function dataModified(): array {
 			[null, '"etag"', null, '', false],
 			['etag', '"etag"', null, '', true],
 
-			[null, '', $now, $now->format(\DateTimeInterface::RFC7231), true],
+			[null, '', $now, $now->format(Constants::DATE_RFC7231), true],
 			[null, '', $now, $now->format(\DateTimeInterface::ATOM), false],
-			[null, '', null, $now->format(\DateTimeInterface::RFC7231), false],
+			[null, '', null, $now->format(Constants::DATE_RFC7231), false],
 			[null, '', $now, '', false],
 
 			['etag', '"etag"', $now, $now->format(\DateTimeInterface::ATOM), true],
-			['etag', '"etag"', $now, $now->format(\DateTimeInterface::RFC7231), true],
+			['etag', '"etag"', $now, $now->format(Constants::DATE_RFC7231), true],
 		];
 	}