From e6e528defe1f8388bdbb061ac4a84945dfc8c145 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 31 Dec 2025 13:13:44 -0500 Subject: [PATCH 1/9] refactor(appframework/http): extract status messages to constant and remove unused properties Modernize this class Signed-off-by: Josh --- lib/private/AppFramework/Http.php | 171 +++++++++++++++--------------- 1 file changed, 83 insertions(+), 88 deletions(-) diff --git a/lib/private/AppFramework/Http.php b/lib/private/AppFramework/Http.php index 08d6259c2a254..a54f83ecb831d 100644 --- a/lib/private/AppFramework/Http.php +++ b/lib/private/AppFramework/Http.php @@ -9,100 +9,95 @@ use OCP\AppFramework\Http as BaseHttp; +/** + * Class for building HTTP status headers in Nextcloud. + * + * Provides protocol version handling and maps HTTP status codes to standard messages, + * used for generating accurate response headers within Nextcloud's AppFramework. + * + * @internal + */ class Http extends BaseHttp { - private $server; - private $protocolVersion; - protected $headers; + private const STATUS_MESSAGES = [ + self::STATUS_CONTINUE => 'Continue', + self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols', + self::STATUS_PROCESSING => 'Processing', + self::STATUS_OK => 'OK', + self::STATUS_CREATED => 'Created', + self::STATUS_ACCEPTED => 'Accepted', + self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information', + self::STATUS_NO_CONTENT => 'No Content', + self::STATUS_RESET_CONTENT => 'Reset Content', + self::STATUS_PARTIAL_CONTENT => 'Partial Content', + self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918 + self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842 + self::STATUS_IM_USED => 'IM Used', // RFC 3229 + self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices', + self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently', + self::STATUS_FOUND => 'Found', + self::STATUS_SEE_OTHER => 'See Other', + self::STATUS_NOT_MODIFIED => 'Not Modified', + self::STATUS_USE_PROXY => 'Use Proxy', + self::STATUS_RESERVED => 'Reserved', + self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect', + self::STATUS_BAD_REQUEST => 'Bad request', + self::STATUS_UNAUTHORIZED => 'Unauthorized', + self::STATUS_PAYMENT_REQUIRED => 'Payment Required', + self::STATUS_FORBIDDEN => 'Forbidden', + self::STATUS_NOT_FOUND => 'Not Found', + self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed', + self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable', + self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required', + self::STATUS_REQUEST_TIMEOUT => 'Request Timeout', + self::STATUS_CONFLICT => 'Conflict', + self::STATUS_GONE => 'Gone', + self::STATUS_LENGTH_REQUIRED => 'Length Required', + self::STATUS_PRECONDITION_FAILED => 'Precondition failed', + self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large', + self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long', + self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type', + self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable', + self::STATUS_EXPECTATION_FAILED => 'Expectation Failed', + self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324 + self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918 + self::STATUS_LOCKED => 'Locked', // RFC 4918 + self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918 + self::STATUS_UPGRADE_REQUIRED => 'Upgrade required', + self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status + self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status + self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status + self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error', + self::STATUS_NOT_IMPLEMENTED => 'Not Implemented', + self::STATUS_BAD_GATEWAY => 'Bad Gateway', + self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable', + self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout', + self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported', + self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates', + self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918 + self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842 + self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard + self::STATUS_NOT_EXTENDED => 'Not extended', + self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status + ]; - /** - * @param array $server $_SERVER - * @param string $protocolVersion the http version to use defaults to HTTP/1.1 - */ - public function __construct($server, $protocolVersion = 'HTTP/1.1') { - $this->server = $server; - $this->protocolVersion = $protocolVersion; - - $this->headers = [ - self::STATUS_CONTINUE => 'Continue', - self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols', - self::STATUS_PROCESSING => 'Processing', - self::STATUS_OK => 'OK', - self::STATUS_CREATED => 'Created', - self::STATUS_ACCEPTED => 'Accepted', - self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information', - self::STATUS_NO_CONTENT => 'No Content', - self::STATUS_RESET_CONTENT => 'Reset Content', - self::STATUS_PARTIAL_CONTENT => 'Partial Content', - self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918 - self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842 - self::STATUS_IM_USED => 'IM Used', // RFC 3229 - self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices', - self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently', - self::STATUS_FOUND => 'Found', - self::STATUS_SEE_OTHER => 'See Other', - self::STATUS_NOT_MODIFIED => 'Not Modified', - self::STATUS_USE_PROXY => 'Use Proxy', - self::STATUS_RESERVED => 'Reserved', - self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect', - self::STATUS_BAD_REQUEST => 'Bad request', - self::STATUS_UNAUTHORIZED => 'Unauthorized', - self::STATUS_PAYMENT_REQUIRED => 'Payment Required', - self::STATUS_FORBIDDEN => 'Forbidden', - self::STATUS_NOT_FOUND => 'Not Found', - self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed', - self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable', - self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required', - self::STATUS_REQUEST_TIMEOUT => 'Request Timeout', - self::STATUS_CONFLICT => 'Conflict', - self::STATUS_GONE => 'Gone', - self::STATUS_LENGTH_REQUIRED => 'Length Required', - self::STATUS_PRECONDITION_FAILED => 'Precondition failed', - self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large', - self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long', - self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type', - self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable', - self::STATUS_EXPECTATION_FAILED => 'Expectation Failed', - self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324 - self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918 - self::STATUS_LOCKED => 'Locked', // RFC 4918 - self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918 - self::STATUS_UPGRADE_REQUIRED => 'Upgrade required', - self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status - self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status - self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status - self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error', - self::STATUS_NOT_IMPLEMENTED => 'Not Implemented', - self::STATUS_BAD_GATEWAY => 'Bad Gateway', - self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable', - self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout', - self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported', - self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates', - self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918 - self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842 - self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard - self::STATUS_NOT_EXTENDED => 'Not extended', - self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status - ]; + public function __construct( + private readonly string $protocolVersion = 'HTTP/1.1', + ) { } - - /** - * Gets the correct header - * @param int Http::CONSTANT $status the constant from the Http class - * @param \DateTime $lastModified formatted last modified date - * @param string $ETag the etag - * @return string - */ - public function getStatusHeader($status) { - // we have one change currently for the http 1.0 header that differs - // from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND - // if this differs any more, we want to create childclasses for this - if ($status === self::STATUS_TEMPORARY_REDIRECT - && $this->protocolVersion === 'HTTP/1.0') { + /** + * Gets the correct status header line. + * + * @param int $status HTTP status code constant + * @return string Header string like "HTTP/1.1 200 OK" + */ + public function getStatusHeader(int $status): string { + // If HTTP/1.0, 307 Temporary Redirect should be 302 Found for compliance. + if ($this->protocolVersion === 'HTTP/1.0' && $status === self::STATUS_TEMPORARY_REDIRECT) { $status = self::STATUS_FOUND; } + $message = self::STATUS_MESSAGES[$status] ?? 'Unknown Status'; - return $this->protocolVersion . ' ' . $status . ' ' - . $this->headers[$status]; + return $this->protocolVersion . ' ' . $status . ' ' . $message; } } From 2b748f0ae598aa797e12fb62e314f40d5ec6b1ad Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 31 Dec 2025 13:46:44 -0500 Subject: [PATCH 2/9] chore: update/expand unit tests for getStatusHeader Signed-off-by: Josh --- tests/lib/AppFramework/Http/HttpTest.php | 64 ++++++++++++------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/tests/lib/AppFramework/Http/HttpTest.php b/tests/lib/AppFramework/Http/HttpTest.php index d3ec8438554d0..7e4227f86fdde 100644 --- a/tests/lib/AppFramework/Http/HttpTest.php +++ b/tests/lib/AppFramework/Http/HttpTest.php @@ -9,40 +9,40 @@ namespace Test\AppFramework\Http; use OC\AppFramework\Http; +use PHPUnit\Framework\Attributes\Test; +use PHPUnit\Framework\Attributes\DataProvider; +/** + * Unit tests for OC\AppFramework\Http. + */ class HttpTest extends \Test\TestCase { - private $server; - - /** - * @var Http - */ - private $http; - - protected function setUp(): void { - parent::setUp(); - - $this->server = []; - $this->http = new Http($this->server); - } - - - public function testProtocol(): void { - $header = $this->http->getStatusHeader(Http::STATUS_TEMPORARY_REDIRECT); - $this->assertEquals('HTTP/1.1 307 Temporary Redirect', $header); - } - - - public function testProtocol10(): void { - $this->http = new Http($this->server, 'HTTP/1.0'); - $header = $this->http->getStatusHeader(Http::STATUS_OK); - $this->assertEquals('HTTP/1.0 200 OK', $header); - } - - public function testTempRedirectBecomesFoundInHttp10(): void { - $http = new Http([], 'HTTP/1.0'); - $header = $http->getStatusHeader(Http::STATUS_TEMPORARY_REDIRECT); - $this->assertEquals('HTTP/1.0 302 Found', $header); + #[Test] + #[DataProvider('statusHeaderProvider')] + public function testGetStatusHeader(string $protocol, int $statusCode, string $expectedHeader): void { + $http = new Http($protocol); + $header = $http->getStatusHeader($statusCode); + $this->assertEquals($expectedHeader, $header); + } + + public static function statusHeaderProvider(): array + { + return [ + // Standard OK + ['HTTP/1.1', Http::STATUS_OK, 'HTTP/1.1 200 OK'], + // 307 is unchanged for HTTP/1.1 + ['HTTP/1.1', Http::STATUS_TEMPORARY_REDIRECT, 'HTTP/1.1 307 Temporary Redirect'], + // 307 maps to 302 for HTTP/1.0 + ['HTTP/1.0', Http::STATUS_TEMPORARY_REDIRECT, 'HTTP/1.0 302 Found'], + // Not Found + ['HTTP/1.1', Http::STATUS_NOT_FOUND, 'HTTP/1.1 404 Not Found'], + // Forbidden + ['HTTP/1.1', Http::STATUS_FORBIDDEN, 'HTTP/1.1 403 Forbidden'], + // Bad Request + ['HTTP/1.1', Http::STATUS_BAD_REQUEST, 'HTTP/1.1 400 Bad request'], + // Unknown/Fallback + ['HTTP/1.1', 999, 'HTTP/1.1 999 Unknown Status'], + ['HTTP/2.0', 123, 'HTTP/2.0 123 Unknown Status'], + ]; } - // TODO: write unittests for http codes } From b7a15b7c621700d9f1c76a3188fa3df586259ce4 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 31 Dec 2025 13:53:48 -0500 Subject: [PATCH 3/9] chore: update Http service registration Signed-off-by: Josh --- .../AppFramework/DependencyInjection/DIContainer.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index 78951d99364db..5975ef4777210 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -144,10 +144,9 @@ public function __construct(string $appName, array $urlParams = [], ?ServerConta /** @deprecated 32.0.0 */ $this->registerDeprecatedAlias('Protocol', Http::class); - $this->registerService(Http::class, function (ContainerInterface $c) { - $protocol = $c->get(IRequest::class)->getHttpProtocol(); - return new Http($_SERVER, $protocol); - }); + $this->registerService(Http::class, fn (ContainerInterface $c) => + new Http($c->get(IRequest::class)->getHttpProtocol()) + ); /** @deprecated 32.0.0 */ $this->registerDeprecatedAlias('Dispatcher', Dispatcher::class); From 590620d7e536aaba02d37ba93cbc08e36a6ab5f6 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 31 Dec 2025 14:32:06 -0500 Subject: [PATCH 4/9] chore: Remove internal annotation from Http class Removed internal annotation from the Http class. Signed-off-by: Josh --- lib/private/AppFramework/Http.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/private/AppFramework/Http.php b/lib/private/AppFramework/Http.php index a54f83ecb831d..1af8c6eda4777 100644 --- a/lib/private/AppFramework/Http.php +++ b/lib/private/AppFramework/Http.php @@ -14,8 +14,6 @@ * * Provides protocol version handling and maps HTTP status codes to standard messages, * used for generating accurate response headers within Nextcloud's AppFramework. - * - * @internal */ class Http extends BaseHttp { private const STATUS_MESSAGES = [ From f801fe74ec12d444c601ac6cb0d44bda49ff4c41 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 1 Jan 2026 13:05:06 -0500 Subject: [PATCH 5/9] test: fix setMiddlewareExpectations method to match implementation Wasn't a problem before that it was null here because getStatusHeader() lacked an explicit return type. Signed-off-by: Josh --- tests/lib/AppFramework/Http/DispatcherTest.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/lib/AppFramework/Http/DispatcherTest.php b/tests/lib/AppFramework/Http/DispatcherTest.php index 19b587116f931..fa059726a3921 100644 --- a/tests/lib/AppFramework/Http/DispatcherTest.php +++ b/tests/lib/AppFramework/Http/DispatcherTest.php @@ -148,9 +148,13 @@ protected function setUp(): void { * @param string $out * @param string $httpHeaders */ - private function setMiddlewareExpectations($out = null, - $httpHeaders = null, $responseHeaders = [], - $ex = false, $catchEx = true) { + private function setMiddlewareExpectations( + $out = null, + $httpHeaders = '', + $responseHeaders = [], + $ex = false, + $catchEx = true + ) { if ($ex) { $exception = new \Exception(); $this->middlewareDispatcher->expects($this->once()) From e04130501138ff38473636e38c338257cf5d0c3f Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 1 Jan 2026 13:15:04 -0500 Subject: [PATCH 6/9] chore: fixup for lint Signed-off-by: Josh --- lib/private/AppFramework/Http.php | 134 +++++++++++++++--------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/lib/private/AppFramework/Http.php b/lib/private/AppFramework/Http.php index 1af8c6eda4777..8f1c39fcf916b 100644 --- a/lib/private/AppFramework/Http.php +++ b/lib/private/AppFramework/Http.php @@ -16,79 +16,79 @@ * used for generating accurate response headers within Nextcloud's AppFramework. */ class Http extends BaseHttp { - private const STATUS_MESSAGES = [ - self::STATUS_CONTINUE => 'Continue', - self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols', - self::STATUS_PROCESSING => 'Processing', - self::STATUS_OK => 'OK', - self::STATUS_CREATED => 'Created', - self::STATUS_ACCEPTED => 'Accepted', - self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information', - self::STATUS_NO_CONTENT => 'No Content', - self::STATUS_RESET_CONTENT => 'Reset Content', - self::STATUS_PARTIAL_CONTENT => 'Partial Content', - self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918 - self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842 - self::STATUS_IM_USED => 'IM Used', // RFC 3229 - self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices', - self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently', - self::STATUS_FOUND => 'Found', - self::STATUS_SEE_OTHER => 'See Other', - self::STATUS_NOT_MODIFIED => 'Not Modified', - self::STATUS_USE_PROXY => 'Use Proxy', - self::STATUS_RESERVED => 'Reserved', - self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect', - self::STATUS_BAD_REQUEST => 'Bad request', - self::STATUS_UNAUTHORIZED => 'Unauthorized', - self::STATUS_PAYMENT_REQUIRED => 'Payment Required', - self::STATUS_FORBIDDEN => 'Forbidden', - self::STATUS_NOT_FOUND => 'Not Found', - self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed', - self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable', - self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required', - self::STATUS_REQUEST_TIMEOUT => 'Request Timeout', - self::STATUS_CONFLICT => 'Conflict', - self::STATUS_GONE => 'Gone', - self::STATUS_LENGTH_REQUIRED => 'Length Required', - self::STATUS_PRECONDITION_FAILED => 'Precondition failed', - self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large', - self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long', - self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type', - self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable', - self::STATUS_EXPECTATION_FAILED => 'Expectation Failed', - self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324 - self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918 - self::STATUS_LOCKED => 'Locked', // RFC 4918 - self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918 - self::STATUS_UPGRADE_REQUIRED => 'Upgrade required', - self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status - self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status - self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status - self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error', - self::STATUS_NOT_IMPLEMENTED => 'Not Implemented', - self::STATUS_BAD_GATEWAY => 'Bad Gateway', - self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable', - self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout', - self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported', - self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates', - self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918 - self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842 - self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard - self::STATUS_NOT_EXTENDED => 'Not extended', - self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status - ]; + private const STATUS_MESSAGES = [ + self::STATUS_CONTINUE => 'Continue', + self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols', + self::STATUS_PROCESSING => 'Processing', + self::STATUS_OK => 'OK', + self::STATUS_CREATED => 'Created', + self::STATUS_ACCEPTED => 'Accepted', + self:: STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information', + self::STATUS_NO_CONTENT => 'No Content', + self::STATUS_RESET_CONTENT => 'Reset Content', + self::STATUS_PARTIAL_CONTENT => 'Partial Content', + self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918 + self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842 + self::STATUS_IM_USED => 'IM Used', // RFC 3229 + self:: STATUS_MULTIPLE_CHOICES => 'Multiple Choices', + self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently', + self::STATUS_FOUND => 'Found', + self::STATUS_SEE_OTHER => 'See Other', + self::STATUS_NOT_MODIFIED => 'Not Modified', + self::STATUS_USE_PROXY => 'Use Proxy', + self::STATUS_RESERVED => 'Reserved', + self:: STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect', + self::STATUS_BAD_REQUEST => 'Bad request', + self::STATUS_UNAUTHORIZED => 'Unauthorized', + self::STATUS_PAYMENT_REQUIRED => 'Payment Required', + self::STATUS_FORBIDDEN => 'Forbidden', + self:: STATUS_NOT_FOUND => 'Not Found', + self:: STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed', + self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable', + self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required', + self::STATUS_REQUEST_TIMEOUT => 'Request Timeout', + self::STATUS_CONFLICT => 'Conflict', + self::STATUS_GONE => 'Gone', + self::STATUS_LENGTH_REQUIRED => 'Length Required', + self::STATUS_PRECONDITION_FAILED => 'Precondition failed', + self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large', + self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long', + self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type', + self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable', + self::STATUS_EXPECTATION_FAILED => 'Expectation Failed', + self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324 + self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918 + self::STATUS_LOCKED => 'Locked', // RFC 4918 + self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918 + self::STATUS_UPGRADE_REQUIRED => 'Upgrade required', + self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status + self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status + self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status + self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error', + self::STATUS_NOT_IMPLEMENTED => 'Not Implemented', + self::STATUS_BAD_GATEWAY => 'Bad Gateway', + self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable', + self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout', + self:: STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported', + self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates', + self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918 + self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842 + self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard + self::STATUS_NOT_EXTENDED => 'Not extended', + self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status + ]; public function __construct( private readonly string $protocolVersion = 'HTTP/1.1', ) { } - /** - * Gets the correct status header line. - * - * @param int $status HTTP status code constant - * @return string Header string like "HTTP/1.1 200 OK" - */ + /** + * Gets the correct status header line. + * + * @param int $status HTTP status code constant + * @return string Header string like "HTTP/1.1 200 OK" + */ public function getStatusHeader(int $status): string { // If HTTP/1.0, 307 Temporary Redirect should be 302 Found for compliance. if ($this->protocolVersion === 'HTTP/1.0' && $status === self::STATUS_TEMPORARY_REDIRECT) { From 33618a14cf3aee9026bcf1c4cef3a0388f5c5bd6 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 1 Jan 2026 13:16:12 -0500 Subject: [PATCH 7/9] chore: fixup for lint Signed-off-by: Josh --- lib/private/AppFramework/DependencyInjection/DIContainer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index 5975ef4777210..35753d5ef608e 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -144,8 +144,8 @@ public function __construct(string $appName, array $urlParams = [], ?ServerConta /** @deprecated 32.0.0 */ $this->registerDeprecatedAlias('Protocol', Http::class); - $this->registerService(Http::class, fn (ContainerInterface $c) => - new Http($c->get(IRequest::class)->getHttpProtocol()) + $this->registerService(Http::class, fn (ContainerInterface $c) + => new Http($c->get(IRequest::class)->getHttpProtocol()) ); /** @deprecated 32.0.0 */ From 38a91680b3a16d53d86263f3bf80c9b8a39d541a Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 1 Jan 2026 13:17:21 -0500 Subject: [PATCH 8/9] chore: fixup for lint Signed-off-by: Josh --- tests/lib/AppFramework/Http/HttpTest.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/lib/AppFramework/Http/HttpTest.php b/tests/lib/AppFramework/Http/HttpTest.php index 7e4227f86fdde..d843d7bd465d5 100644 --- a/tests/lib/AppFramework/Http/HttpTest.php +++ b/tests/lib/AppFramework/Http/HttpTest.php @@ -20,13 +20,12 @@ class HttpTest extends \Test\TestCase { #[Test] #[DataProvider('statusHeaderProvider')] public function testGetStatusHeader(string $protocol, int $statusCode, string $expectedHeader): void { - $http = new Http($protocol); - $header = $http->getStatusHeader($statusCode); - $this->assertEquals($expectedHeader, $header); - } + $http = new Http($protocol); + $header = $http->getStatusHeader($statusCode); + $this->assertEquals($expectedHeader, $header); + } - public static function statusHeaderProvider(): array - { + public static function statusHeaderProvider(): array { return [ // Standard OK ['HTTP/1.1', Http::STATUS_OK, 'HTTP/1.1 200 OK'], From 0ca558d47b86ac493e279fec92f227f604954003 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 1 Jan 2026 13:17:56 -0500 Subject: [PATCH 9/9] chore: fixup for lint Signed-off-by: Josh --- tests/lib/AppFramework/Http/DispatcherTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/AppFramework/Http/DispatcherTest.php b/tests/lib/AppFramework/Http/DispatcherTest.php index fa059726a3921..62e08a4e9de92 100644 --- a/tests/lib/AppFramework/Http/DispatcherTest.php +++ b/tests/lib/AppFramework/Http/DispatcherTest.php @@ -153,7 +153,7 @@ private function setMiddlewareExpectations( $httpHeaders = '', $responseHeaders = [], $ex = false, - $catchEx = true + $catchEx = true, ) { if ($ex) { $exception = new \Exception();