From 42363288987adf5dd4430d286a2a9f31a50fc65a Mon Sep 17 00:00:00 2001
From: David Dreschner <david.dreschner@nextcloud.com>
Date: Mon, 9 Feb 2026 16:26:04 +0100
Subject: [PATCH] fix: Remove deprecated RFC7231 constant to avoid warnings on
 PHP 8.5

Signed-off-by: David Dreschner <david.dreschner@nextcloud.com>
---
 apps/dav/lib/Provisioning/Apple/AppleProvisioningNode.php   | 2 +-
 .../AppFramework/Middleware/NotModifiedMiddleware.php       | 2 +-
 lib/public/AppFramework/Http/Response.php                   | 4 ++--
 .../AppFramework/Middleware/NotModifiedMiddlewareTest.php   | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/dav/lib/Provisioning/Apple/AppleProvisioningNode.php b/apps/dav/lib/Provisioning/Apple/AppleProvisioningNode.php
index 845c87cfce1cd..44e483fe56911 100644
--- a/apps/dav/lib/Provisioning/Apple/AppleProvisioningNode.php
+++ b/apps/dav/lib/Provisioning/Apple/AppleProvisioningNode.php
@@ -60,7 +60,7 @@ public function getProperties($properties) {
 
 		return [
 			'{DAV:}getcontentlength' => 42,
-			'{DAV:}getlastmodified' => $datetime->format(\DateTimeInterface::RFC7231),
+			'{DAV:}getlastmodified' => $datetime->format('D, d M Y H:i:s \G\M\T'),
 		];
 	}
 
diff --git a/lib/private/AppFramework/Middleware/NotModifiedMiddleware.php b/lib/private/AppFramework/Middleware/NotModifiedMiddleware.php
index e2514916d7da6..2bfe8e36da3d6 100644
--- a/lib/private/AppFramework/Middleware/NotModifiedMiddleware.php
+++ b/lib/private/AppFramework/Middleware/NotModifiedMiddleware.php
@@ -27,7 +27,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('D, d M Y H:i:s \G\M\T')) {
 			$response->setStatus(Http::STATUS_NOT_MODIFIED);
 			return $response;
 		}
diff --git a/lib/public/AppFramework/Http/Response.php b/lib/public/AppFramework/Http/Response.php
index 6edd32a1f8b69..52215c7cec044 100644
--- a/lib/public/AppFramework/Http/Response.php
+++ b/lib/public/AppFramework/Http/Response.php
@@ -98,7 +98,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('D, d M Y H:i:s \G\M\T'));
 		} else {
 			$this->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
 			unset($this->headers['Expires']);
@@ -240,7 +240,7 @@ public function getHeaders() {
 		];
 
 		if ($this->lastModified) {
-			$mergeWith['Last-Modified'] = $this->lastModified->format(\DateTimeInterface::RFC7231);
+			$mergeWith['Last-Modified'] = $this->lastModified->format('D, d M Y H:i:s \G\M\T');
 		}
 
 		if ($this->ETag) {
diff --git a/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php b/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php
index 7dcb28a2af4b3..12bfa68ab5825 100644
--- a/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php
@@ -44,13 +44,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('D, d M Y H:i:s \G\M\T'), true],
 			[null, '', $now, $now->format(\DateTimeInterface::ATOM), false],
-			[null, '', null, $now->format(\DateTimeInterface::RFC7231), false],
+			[null, '', null, $now->format('D, d M Y H:i:s \G\M\T'), 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('D, d M Y H:i:s \G\M\T'), true],
 		];
 	}