Merge pull request #208 from phil-davis/apply-cs-fixer-20230626

Apply cs-fixer and phpstan changes to make CI pass
sabre-io · Jun 26, 2023 · c2cd0a5 · c2cd0a5
2 parents cea804b + 7c4062e
commit c2cd0a5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/lib/Client.php b/lib/Client.php
@@ -301,8 +301,6 @@ public function setThrowExceptions(bool $throwExceptions): void
      * Adds a CURL setting.
      *
      * These settings will be included in every HTTP request.
-     *
-     * @param mixed $value
      */
     public function addCurlSetting(int $name, $value): void
     {
@@ -340,7 +338,7 @@ protected function doRequest(RequestInterface $request): ResponseInterface
      *
      * @var resource|null
      */
-    private $curlHandle = null;
+    private $curlHandle;
 
     /**
      * Handler for curl_multi requests.
@@ -349,7 +347,7 @@ protected function doRequest(RequestInterface $request): ResponseInterface
      *
      * @var resource|null
      */
-    private $curlMultiHandle = null;
+    private $curlMultiHandle;
 
     /**
      * Has a list of curl handles, as well as their associated success and

diff --git a/lib/Message.php b/lib/Message.php
@@ -22,7 +22,7 @@ abstract class Message implements MessageInterface
      *
      * @var resource|string|callable|null
      */
-    protected $body = null;
+    protected $body;
 
     /**
      * Contains the list of HTTP headers.

diff --git a/lib/Response.php b/lib/Response.php
@@ -101,7 +101,7 @@ class Response extends Message implements ResponseInterface
      * @param array<string, mixed>|null     $headers
      * @param resource|string|callable|null $body
      */
-    public function __construct($status = 500, ?array $headers = null, $body = null)
+    public function __construct($status = 500, array $headers = null, $body = null)
     {
         if (null !== $status) {
             $this->setStatus($status);

diff --git a/lib/functions.php b/lib/functions.php
@@ -168,9 +168,9 @@ function negotiateContentType(?string $acceptHeaderValue, array $availableOption
 
             // Does this entry win?
             if (
-                ($proposal['quality'] > $lastQuality) ||
-                ($proposal['quality'] === $lastQuality && $specificity > $lastSpecificity) ||
-                ($proposal['quality'] === $lastQuality && $specificity === $lastSpecificity && $optionIndex < $lastOptionIndex)
+                ($proposal['quality'] > $lastQuality)
+                || ($proposal['quality'] === $lastQuality && $specificity > $lastSpecificity)
+                || ($proposal['quality'] === $lastQuality && $specificity === $lastSpecificity && $optionIndex < $lastOptionIndex)
             ) {
                 $lastQuality = $proposal['quality'];
                 $lastSpecificity = $specificity;

diff --git a/phpstan.neon b/phpstan.neon
@@ -12,7 +12,7 @@ parameters:
     path: lib/Client.php
   -
     message: "#^Left side of || is always false.$#"
-    count: 1
+    count: 2
     path: lib/Client.php
   -
     message: "#^Strict comparison using === between null and array<string, mixed> will always evaluate to false.$#"