fix: Http/HttpTest

lib/private/AppFramework/Http.php

@@ -30,15 +30,15 @@
 use OCP\AppFramework\Http as BaseHttp;
 
 class Http extends BaseHttp {
-	private $server;
-	private $protocolVersion;
-	protected $headers;
+	private array $server;
+	private string $protocolVersion;
+	protected array $headers;
 
 	/**
 	 * @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') {
+	public function __construct(array $server, string $protocolVersion='HTTP/1.1') {
 		$this->server = $server;
 		$this->protocolVersion = $protocolVersion;
 
@@ -107,16 +107,17 @@ public function __construct($server, $protocolVersion='HTTP/1.1') {
 
 	/**
 	 * Gets the correct header
+	 *
 	 * @param Http::CONSTANT $status the constant from the Http class
-	 * @param \DateTime $lastModified formatted last modified date
-	 * @param string $ETag the etag
+	 * @param \DateTime|null $lastModified formatted last modified date
+	 * @param null $ETag the etag
 	 * @return string
 	 */
 	public function getStatusHeader(
 		$status,
 		\DateTime $lastModified=null,
 		$ETag=null
-	) {
+	): string {
 		if ($lastModified !== null) {
 			$lastModified = $lastModified->format(\DateTime::RFC2822);
 		}
@@ -135,7 +136,7 @@ public function getStatusHeader(
 
 		// 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 this differs anymore, we want to create child-classes for this
 		if ($status === self::STATUS_TEMPORARY_REDIRECT
 			&& $this->protocolVersion === 'HTTP/1.0') {
 			$status = self::STATUS_FOUND;

tests/lib/AppFramework/Http/HttpTest.php

@@ -23,15 +23,14 @@
 
 namespace Test\AppFramework\Http;
 
+use DateTime;
+use DateTimeZone;
 use OC\AppFramework\Http;
+use Test\TestCase;
 
-class HttpTest extends \Test\TestCase {
-	private $server;
-
-	/**
-	 * @var Http
-	 */
-	private $http;
+class HttpTest extends TestCase {
+	private array $server;
+	private Http $http;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -40,33 +39,33 @@ protected function setUp(): void {
 		$this->http = new Http($this->server);
 	}
 
-	public function testProtocol() {
+	public function testProtocol(): void {
 		$header = $this->http->getStatusHeader(Http::STATUS_TEMPORARY_REDIRECT);
 		$this->assertEquals('HTTP/1.1 307 Temporary Redirect', $header);
 	}
 
-	public function testProtocol10() {
+	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 testEtagMatchReturnsNotModified() {
+	public function testEtagMatchReturnsNotModified(): void {
 		$http = new Http(['HTTP_IF_NONE_MATCH' => 'hi']);
 
 		$header = $http->getStatusHeader(Http::STATUS_OK, null, 'hi');
 		$this->assertEquals('HTTP/1.1 304 Not Modified', $header);
 	}
 
-	public function testQuotedEtagMatchReturnsNotModified() {
+	public function testQuotedEtagMatchReturnsNotModified(): void {
 		$http = new Http(['HTTP_IF_NONE_MATCH' => '"hi"']);
 
 		$header = $http->getStatusHeader(Http::STATUS_OK, null, 'hi');
 		$this->assertEquals('HTTP/1.1 304 Not Modified', $header);
 	}
 
-	public function testLastModifiedMatchReturnsNotModified() {
-		$dateTime = new \DateTime(null, new \DateTimeZone('GMT'));
+	public function testLastModifiedMatchReturnsNotModified(): void {
+		$dateTime = new DateTime('now', new DateTimeZone('GMT'));
 		$dateTime->setTimestamp('12');
 
 		$http = new Http(
@@ -78,7 +77,7 @@ public function testLastModifiedMatchReturnsNotModified() {
 		$this->assertEquals('HTTP/1.1 304 Not Modified', $header);
 	}
 
-	public function testTempRedirectBecomesFoundInHttp10() {
+	public function testTempRedirectBecomesFoundInHttp10(): void {
 		$http = new Http([], 'HTTP/1.0');
 
 		$header = $http->getStatusHeader(Http::STATUS_TEMPORARY_REDIRECT);