From 36a74bd8b8c193e0b5261ebe04bf69431cbf2368 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Fri, 19 Apr 2024 14:47:55 +0545 Subject: [PATCH] chore: adjust for php-cs-fixer 3.54.0 --- composer.json | 2 +- examples/stringify.php | 4 +- tests/HTTP/ClientTest.php | 110 ++++++++++++++-------------- tests/HTTP/MessageDecoratorTest.php | 4 +- 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/composer.json b/composer.json index 07b18f6..af40ba7 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "sabre/uri" : "^2.3 || ^3.0" }, "require-dev" : { - "friendsofphp/php-cs-fixer": "^3.51", + "friendsofphp/php-cs-fixer": "^3.54", "phpstan/phpstan": "^1.10", "phpstan/phpstan-phpunit": "^1.3", "phpstan/phpstan-strict-rules": "^1.5", diff --git a/examples/stringify.php b/examples/stringify.php index 96f7da8..8ceefe2 100644 --- a/examples/stringify.php +++ b/examples/stringify.php @@ -30,7 +30,7 @@ $request->setHeaders([ 'Host' => 'example.org', 'Content-Type' => 'application/json', - ]); +]); $request->setBody(json_encode(['foo' => 'bar'])); @@ -41,7 +41,7 @@ $response->setHeaders([ 'Content-Type' => 'text/plain', 'Connection' => 'close', - ]); +]); $response->setBody('ABORT! ABORT!'); diff --git a/tests/HTTP/ClientTest.php b/tests/HTTP/ClientTest.php index c5281de..97345e2 100644 --- a/tests/HTTP/ClientTest.php +++ b/tests/HTTP/ClientTest.php @@ -14,17 +14,17 @@ public function testCreateCurlSettingsArrayGET(): void $request = new Request('GET', 'http://example.org/', ['X-Foo' => 'bar']); $settings = [ - CURLOPT_RETURNTRANSFER => true, - CURLOPT_HEADER => true, - CURLOPT_POSTREDIR => 0, - CURLOPT_HTTPHEADER => ['X-Foo: bar'], - CURLOPT_NOBODY => false, - CURLOPT_URL => 'http://example.org/', - CURLOPT_CUSTOMREQUEST => 'GET', - CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)', - CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, - CURLOPT_REDIR_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, - ]; + CURLOPT_RETURNTRANSFER => true, + CURLOPT_HEADER => true, + CURLOPT_POSTREDIR => 0, + CURLOPT_HTTPHEADER => ['X-Foo: bar'], + CURLOPT_NOBODY => false, + CURLOPT_URL => 'http://example.org/', + CURLOPT_CUSTOMREQUEST => 'GET', + CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)', + CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, + CURLOPT_REDIR_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, + ]; self::assertEquals($settings, $client->createCurlSettingsArray($request)); } @@ -62,16 +62,16 @@ public function testCreateCurlSettingsArrayHEAD(): void $request = new Request('HEAD', 'http://example.org/', ['X-Foo' => 'bar']); $settings = [ - CURLOPT_RETURNTRANSFER => true, - CURLOPT_HEADER => true, - CURLOPT_NOBODY => true, - CURLOPT_CUSTOMREQUEST => 'HEAD', - CURLOPT_HTTPHEADER => ['X-Foo: bar'], - CURLOPT_URL => 'http://example.org/', - CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)', - CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, - CURLOPT_REDIR_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, - ]; + CURLOPT_RETURNTRANSFER => true, + CURLOPT_HEADER => true, + CURLOPT_NOBODY => true, + CURLOPT_CUSTOMREQUEST => 'HEAD', + CURLOPT_HTTPHEADER => ['X-Foo: bar'], + CURLOPT_URL => 'http://example.org/', + CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)', + CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, + CURLOPT_REDIR_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, + ]; self::assertEquals($settings, $client->createCurlSettingsArray($request)); } @@ -90,16 +90,16 @@ public function testCreateCurlSettingsArrayGETAfterHEAD(): void $request = new Request('GET', 'http://example.org/', ['X-Foo' => 'bar']); $settings = [ - CURLOPT_CUSTOMREQUEST => 'GET', - CURLOPT_RETURNTRANSFER => true, - CURLOPT_HEADER => true, - CURLOPT_HTTPHEADER => ['X-Foo: bar'], - CURLOPT_NOBODY => false, - CURLOPT_URL => 'http://example.org/', - CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)', - CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, - CURLOPT_REDIR_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, - ]; + CURLOPT_CUSTOMREQUEST => 'GET', + CURLOPT_RETURNTRANSFER => true, + CURLOPT_HEADER => true, + CURLOPT_HTTPHEADER => ['X-Foo: bar'], + CURLOPT_NOBODY => false, + CURLOPT_URL => 'http://example.org/', + CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)', + CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, + CURLOPT_REDIR_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, + ]; self::assertEquals($settings, $client->createCurlSettingsArray($request)); } @@ -114,19 +114,19 @@ public function testCreateCurlSettingsArrayPUTStream(): void $request = new Request('PUT', 'http://example.org/', ['X-Foo' => 'bar'], $h); $settings = [ - CURLOPT_RETURNTRANSFER => true, - CURLOPT_HEADER => true, - CURLOPT_PUT => true, - CURLOPT_INFILE => $h, - CURLOPT_INFILESIZE => strlen($fileContent), - CURLOPT_NOBODY => false, - CURLOPT_CUSTOMREQUEST => 'PUT', - CURLOPT_HTTPHEADER => ['X-Foo: bar'], - CURLOPT_URL => 'http://example.org/', - CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)', - CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, - CURLOPT_REDIR_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, - ]; + CURLOPT_RETURNTRANSFER => true, + CURLOPT_HEADER => true, + CURLOPT_PUT => true, + CURLOPT_INFILE => $h, + CURLOPT_INFILESIZE => strlen($fileContent), + CURLOPT_NOBODY => false, + CURLOPT_CUSTOMREQUEST => 'PUT', + CURLOPT_HTTPHEADER => ['X-Foo: bar'], + CURLOPT_URL => 'http://example.org/', + CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)', + CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, + CURLOPT_REDIR_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, + ]; self::assertEquals($settings, $client->createCurlSettingsArray($request)); } @@ -137,17 +137,17 @@ public function testCreateCurlSettingsArrayPUTString(): void $request = new Request('PUT', 'http://example.org/', ['X-Foo' => 'bar'], 'boo'); $settings = [ - CURLOPT_RETURNTRANSFER => true, - CURLOPT_HEADER => true, - CURLOPT_NOBODY => false, - CURLOPT_POSTFIELDS => 'boo', - CURLOPT_CUSTOMREQUEST => 'PUT', - CURLOPT_HTTPHEADER => ['X-Foo: bar'], - CURLOPT_URL => 'http://example.org/', - CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)', - CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, - CURLOPT_REDIR_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, - ]; + CURLOPT_RETURNTRANSFER => true, + CURLOPT_HEADER => true, + CURLOPT_NOBODY => false, + CURLOPT_POSTFIELDS => 'boo', + CURLOPT_CUSTOMREQUEST => 'PUT', + CURLOPT_HTTPHEADER => ['X-Foo: bar'], + CURLOPT_URL => 'http://example.org/', + CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)', + CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, + CURLOPT_REDIR_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, + ]; self::assertEquals($settings, $client->createCurlSettingsArray($request)); } diff --git a/tests/HTTP/MessageDecoratorTest.php b/tests/HTTP/MessageDecoratorTest.php index b033f42..6b58df5 100644 --- a/tests/HTTP/MessageDecoratorTest.php +++ b/tests/HTTP/MessageDecoratorTest.php @@ -30,7 +30,7 @@ public function testHeaders(): void { $this->outer->setHeaders([ 'a' => 'b', - ]); + ]); self::assertEquals(['a' => ['b']], $this->inner->getHeaders()); self::assertEquals(['a' => ['b']], $this->outer->getHeaders()); @@ -44,7 +44,7 @@ public function testHeaders(): void $this->outer->addHeaders([ 'e' => 'f', - ]); + ]); self::assertEquals(['a' => ['b'], 'c' => ['d'], 'e' => ['f']], $this->inner->getHeaders()); self::assertEquals(['a' => ['b'], 'c' => ['d'], 'e' => ['f']], $this->outer->getHeaders());