refactor: fix code with code quality prepared sets

Artur Weigandt · Artur Weigandt · commit 72dbf3470911 · 2025-11-22T08:44:34.000+01:00
diff --git a/.rector.php b/.rector.php
@@ -14,8 +14,8 @@
     ->withPhp74Sets()
     ->withPhpVersion(70400)
     ->withTypeCoverageLevel(1)
-    ->withCodeQualityLevel(0)
     ->withPreparedSets(
+        true,
         true
     )
 ;
diff --git a/src/Redmine/Api/AbstractApi.php b/src/Redmine/Api/AbstractApi.php
@@ -300,7 +300,7 @@ protected function retrieveAll($endpoint, array $params = [])
      */
     protected function retrieveData(string $endpoint, array $params = []): array
     {
-        if (empty($params)) {
+        if ($params === []) {
             $this->lastResponse = $this->getHttpClient()->request(HttpFactory::makeRequest(
                 'GET',
                 strval($endpoint),
@@ -366,7 +366,7 @@ protected function retrieveData(string $endpoint, array $params = []): array
             $offset += $realLimit;
 
             if (
-                empty($newDataSet)
+                $newDataSet === []
                 || !isset($newDataSet['limit'])
                 || (
                     isset($newDataSet['offset'])
diff --git a/src/Redmine/Api/CustomField.php b/src/Redmine/Api/CustomField.php
@@ -92,7 +92,7 @@ public function all(array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
@@ -151,7 +151,7 @@ public function getIdByName($name, array $params = [])
      */
     private function doListing(bool $forceUpdate, array $params): array
     {
-        if (empty($this->customFields) || $forceUpdate) {
+        if ($this->customFields === [] || $forceUpdate) {
             $this->customFields = $this->list($params);
         }
 
diff --git a/src/Redmine/Api/Group.php b/src/Redmine/Api/Group.php
@@ -94,7 +94,7 @@ public function all(array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
@@ -118,7 +118,7 @@ public function listing($forceUpdate = false)
     {
         @trigger_error('`' . __METHOD__ . '()` is deprecated since v2.7.0, use `' . self::class . '::listNames()` instead.', E_USER_DEPRECATED);
 
-        if (empty($this->groups) || $forceUpdate) {
+        if ($this->groups === [] || $forceUpdate) {
             $this->groups = $this->list();
         }
         $ret = [];
diff --git a/src/Redmine/Api/Issue.php b/src/Redmine/Api/Issue.php
@@ -135,7 +135,7 @@ public function all(array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
diff --git a/src/Redmine/Api/IssueCategory.php b/src/Redmine/Api/IssueCategory.php
@@ -120,7 +120,7 @@ public function all($project, array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
@@ -296,7 +296,7 @@ public function remove($id, array $params = [])
      */
     private function doListing($projectIdentifier, bool $forceUpdate): array
     {
-        if (true === $forceUpdate || empty($this->issueCategories)) {
+        if ($forceUpdate || $this->issueCategories === []) {
             $this->issueCategories = $this->listByProject($projectIdentifier);
         }
 
diff --git a/src/Redmine/Api/IssuePriority.php b/src/Redmine/Api/IssuePriority.php
@@ -63,7 +63,7 @@ public function all(array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
diff --git a/src/Redmine/Api/IssueRelation.php b/src/Redmine/Api/IssueRelation.php
@@ -68,7 +68,7 @@ public function all($issueId, array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
diff --git a/src/Redmine/Api/IssueStatus.php b/src/Redmine/Api/IssueStatus.php
@@ -92,7 +92,7 @@ public function all(array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
@@ -147,7 +147,7 @@ public function getIdByName($name)
      */
     private function doListing(bool $forceUpdate): array
     {
-        if (empty($this->issueStatuses) || $forceUpdate) {
+        if ($this->issueStatuses === [] || $forceUpdate) {
             $this->issueStatuses = $this->list();
         }
 
diff --git a/src/Redmine/Api/Membership.php b/src/Redmine/Api/Membership.php
@@ -78,7 +78,7 @@ public function all($project, array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
diff --git a/src/Redmine/Api/News.php b/src/Redmine/Api/News.php
@@ -87,17 +87,13 @@ public function all($project = null, array $params = [])
         @trigger_error('`' . __METHOD__ . '()` is deprecated since v2.4.0, use `' . self::class . '::list()` or `' . self::class . '::listByProject()` instead.', E_USER_DEPRECATED);
 
         try {
-            if (null === $project) {
-                $this->news = $this->list($params);
-            } else {
-                $this->news = $this->listByProject(strval($project), $params);
-            }
+            $this->news = null === $project ? $this->list($params) : $this->listByProject(strval($project), $params);
         } catch (Exception $e) {
             if ($this->getLastResponse()->getContent() === '') {
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
diff --git a/src/Redmine/Api/Project.php b/src/Redmine/Api/Project.php
@@ -112,7 +112,7 @@ public function all(array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
@@ -460,7 +460,7 @@ public function remove($id)
      */
     private function doListing(bool $forceUpdate, bool $reverse, array $params): array
     {
-        if (true === $forceUpdate || empty($this->projects)) {
+        if ($forceUpdate || $this->projects === []) {
             $this->projects = $this->list($params);
         }
 
diff --git a/src/Redmine/Api/Query.php b/src/Redmine/Api/Query.php
@@ -63,7 +63,7 @@ public function all(array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
diff --git a/src/Redmine/Api/Role.php b/src/Redmine/Api/Role.php
@@ -93,7 +93,7 @@ public function all(array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
@@ -117,7 +117,7 @@ public function listing($forceUpdate = false)
     {
         @trigger_error('`' . __METHOD__ . '()` is deprecated since v2.7.0, use `' . self::class . '::listNames()` instead.', E_USER_DEPRECATED);
 
-        if (empty($this->roles) || $forceUpdate) {
+        if ($this->roles === [] || $forceUpdate) {
             $this->roles = $this->list();
         }
         $ret = [];
diff --git a/src/Redmine/Api/Search.php b/src/Redmine/Api/Search.php
@@ -63,7 +63,7 @@ public function search($query, array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
diff --git a/src/Redmine/Api/TimeEntry.php b/src/Redmine/Api/TimeEntry.php
@@ -68,7 +68,7 @@ public function all(array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
diff --git a/src/Redmine/Api/TimeEntryActivity.php b/src/Redmine/Api/TimeEntryActivity.php
@@ -87,7 +87,7 @@ public function all(array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
@@ -142,7 +142,7 @@ public function getIdByName($name)
      */
     private function doListing(bool $forceUpdate): array
     {
-        if (empty($this->timeEntryActivities) || $forceUpdate) {
+        if ($this->timeEntryActivities === [] || $forceUpdate) {
             $this->timeEntryActivities = $this->list();
         }
 
diff --git a/src/Redmine/Api/Tracker.php b/src/Redmine/Api/Tracker.php
@@ -91,7 +91,7 @@ public function all(array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
@@ -146,7 +146,7 @@ public function getIdByName($name)
      */
     private function doListing(bool $forceUpdate): array
     {
-        if (empty($this->trackers) || $forceUpdate) {
+        if ($this->trackers === [] || $forceUpdate) {
             $this->trackers = $this->list();
         }
 
diff --git a/src/Redmine/Api/User.php b/src/Redmine/Api/User.php
@@ -111,7 +111,7 @@ public function all(array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
@@ -329,7 +329,7 @@ public function remove($id)
      */
     private function doListing(bool $forceUpdate, array $params): array
     {
-        if (empty($this->users) || $forceUpdate) {
+        if ($this->users === [] || $forceUpdate) {
             $this->users = $this->list($params);
         }
 
diff --git a/src/Redmine/Api/Version.php b/src/Redmine/Api/Version.php
@@ -118,7 +118,7 @@ public function all($project, array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
@@ -345,7 +345,7 @@ public function remove($id)
      */
     private function doListing($projectIdentifier, bool $forceUpdate, bool $reverse, array $params): array
     {
-        if (true === $forceUpdate || empty($this->versions)) {
+        if ($forceUpdate || $this->versions === []) {
             $this->versions = $this->listByProject($projectIdentifier, $params);
         }
 
diff --git a/src/Redmine/Api/Wiki.php b/src/Redmine/Api/Wiki.php
@@ -78,7 +78,7 @@ public function all($project, array $params = [])
                 return false;
             }
 
-            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {
                 $e = $e->getPrevious();
             }
 
diff --git a/src/Redmine/Client/NativeCurlClient.php b/src/Redmine/Client/NativeCurlClient.php
@@ -410,13 +410,11 @@ private function createHttpHeader(string $path, string $contentType = ''): array
         // @see https://www.redmine.org/projects/redmine/wiki/Rest_api#Authentication
         if (null === $this->password && !array_key_exists(strtolower('X-Redmine-API-Key'), $this->httpHeadersNames)) {
             $httpHeaders[] = 'X-Redmine-API-Key: ' . $this->apikeyOrUsername;
-        } else {
-            if (!array_key_exists(strtolower('Authorization'), $this->httpHeadersNames)) {
-                // Setting Header "Authorization: Basic base64" is the same as
-                // $this->setCurlOption(CURLOPT_USERPWD, "$username:$password")
-                // @see https://stackoverflow.com/a/26285941
-                $httpHeaders[] = 'Authorization: Basic ' . base64_encode($this->apikeyOrUsername . ':' . $this->password);
-            }
+        } elseif (!array_key_exists(strtolower('Authorization'), $this->httpHeadersNames)) {
+            // Setting Header "Authorization: Basic base64" is the same as
+            // $this->setCurlOption(CURLOPT_USERPWD, "$username:$password")
+            // @see https://stackoverflow.com/a/26285941
+            $httpHeaders[] = 'Authorization: Basic ' . base64_encode($this->apikeyOrUsername . ':' . $this->password);
         }
 
         // prepare custom headers
diff --git a/src/Redmine/Client/Psr18Client.php b/src/Redmine/Client/Psr18Client.php
@@ -201,7 +201,7 @@ public function getLastResponseStatusCode(): int
     {
         @trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Api\AbstractApi::getLastResponse()` instead.', E_USER_DEPRECATED);
 
-        if (null === $this->lastResponse) {
+        if (!$this->lastResponse instanceof \Psr\Http\Message\ResponseInterface) {
             return 0;
         }
 
@@ -218,7 +218,7 @@ public function getLastResponseContentType(): string
     {
         @trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Api\AbstractApi::getLastResponse()` instead.', E_USER_DEPRECATED);
 
-        if (null === $this->lastResponse) {
+        if (!$this->lastResponse instanceof \Psr\Http\Message\ResponseInterface) {
             return '';
         }
 
@@ -235,7 +235,7 @@ public function getLastResponseBody(): string
     {
         @trigger_error('`' . __METHOD__ . '()` is deprecated since v2.8.0, use `\Redmine\Api\AbstractApi::getLastResponse()` instead.', E_USER_DEPRECATED);
 
-        if (null === $this->lastResponse) {
+        if (!$this->lastResponse instanceof \Psr\Http\Message\ResponseInterface) {
             return '';
         }
 
diff --git a/src/Redmine/Exception/UnexpectedResponseException.php b/src/Redmine/Exception/UnexpectedResponseException.php
@@ -25,7 +25,7 @@ public static function create(Response $response, ?Throwable $prev = null): self
     {
         $e = new self(
             'The Redmine server replied with an unexpected response.',
-            ($prev !== null) ? $prev->getCode() : 1,
+            ($prev instanceof \Throwable) ? $prev->getCode() : 1,
             $prev,
         );
 
diff --git a/src/Redmine/Http/HttpFactory.php b/src/Redmine/Http/HttpFactory.php
@@ -80,11 +80,11 @@ public function getContent(): string
 
     public static function makeJsonRequest(string $method, string $path, string $content = ''): Request
     {
-        return static::makeRequest($method, $path, 'application/json', $content);
+        return self::makeRequest($method, $path, 'application/json', $content);
     }
 
     public static function makeXmlRequest(string $method, string $path, string $content = ''): Request
     {
-        return static::makeRequest($method, $path, 'application/xml', $content);
+        return self::makeRequest($method, $path, 'application/xml', $content);
     }
 }
diff --git a/src/Redmine/Serializer/PathSerializer.php b/src/Redmine/Serializer/PathSerializer.php
@@ -37,7 +37,7 @@ public function getPath(): string
     {
         $queryString = '';
 
-        if (!empty($this->queryParams)) {
+        if ($this->queryParams !== []) {
             $queryString = '?' . \http_build_query($this->queryParams);
 
             // @see #154: replace every encoded array (`foo[0]=`, `foo[1]=`, etc with `foo[]=`)
diff --git a/tests/Behat/Bootstrap/FeatureContext.php b/tests/Behat/Bootstrap/FeatureContext.php
diff --git a/tests/Fixtures/AssertingHttpClient.php b/tests/Fixtures/AssertingHttpClient.php
diff --git a/tests/RedmineExtension/BehatHookTracer.php b/tests/RedmineExtension/BehatHookTracer.php

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`	`->withPhp74Sets()`
`15`	`15`	`->withPhpVersion(70400)`
`16`	`16`	`->withTypeCoverageLevel(1)`
`17`		`- ->withCodeQualityLevel(0)`
`18`	`17`	`->withPreparedSets(`
	`18`	`+ true,`
`19`	`19`	`true`
`20`	`20`	`)`
`21`	`21`	`;`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function all(array $params = [])`
`92`	`92`	`return false;`
`93`	`93`	`}`
`94`	`94`
`95`		`- if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {`
	`95`	`+ if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {`
`96`	`96`	`$e = $e->getPrevious();`
`97`	`97`	`}`
`98`	`98`
`@@ -151,7 +151,7 @@ public function getIdByName($name, array $params = [])`
`151`	`151`	`*/`
`152`	`152`	`private function doListing(bool $forceUpdate, array $params): array`
`153`	`153`	`{`
`154`		`- if (empty($this->customFields) \|\| $forceUpdate) {`
	`154`	`+ if ($this->customFields === [] \|\| $forceUpdate) {`
`155`	`155`	`$this->customFields = $this->list($params);`
`156`	`156`	`}`
`157`	`157`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function all(array $params = [])`
`94`	`94`	`return false;`
`95`	`95`	`}`
`96`	`96`
`97`		`- if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {`
	`97`	`+ if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {`
`98`	`98`	`$e = $e->getPrevious();`
`99`	`99`	`}`
`100`	`100`
`@@ -118,7 +118,7 @@ public function listing($forceUpdate = false)`
`118`	`118`	`{`
`119`	`119`	@trigger_error('`' . __METHOD__ . '()` is deprecated since v2.7.0, use `' . self::class . '::listNames()` instead.', E_USER_DEPRECATED);
`120`	`120`
`121`		`- if (empty($this->groups) \|\| $forceUpdate) {`
	`121`	`+ if ($this->groups === [] \|\| $forceUpdate) {`
`122`	`122`	`$this->groups = $this->list();`
`123`	`123`	`}`
`124`	`124`	`$ret = [];`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public function all(array $params = [])`
`135`	`135`	`return false;`
`136`	`136`	`}`
`137`	`137`
`138`		`- if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {`
	`138`	`+ if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {`
`139`	`139`	`$e = $e->getPrevious();`
`140`	`140`	`}`
`141`	`141`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public function all($project, array $params = [])`
`120`	`120`	`return false;`
`121`	`121`	`}`
`122`	`122`
`123`		`- if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {`
	`123`	`+ if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {`
`124`	`124`	`$e = $e->getPrevious();`
`125`	`125`	`}`
`126`	`126`
`@@ -296,7 +296,7 @@ public function remove($id, array $params = [])`
`296`	`296`	`*/`
`297`	`297`	`private function doListing($projectIdentifier, bool $forceUpdate): array`
`298`	`298`	`{`
`299`		`- if (true === $forceUpdate \|\| empty($this->issueCategories)) {`
	`299`	`+ if ($forceUpdate \|\| $this->issueCategories === []) {`
`300`	`300`	`$this->issueCategories = $this->listByProject($projectIdentifier);`
`301`	`301`	`}`
`302`	`302`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function all(array $params = [])`
`63`	`63`	`return false;`
`64`	`64`	`}`
`65`	`65`
`66`		`- if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {`
	`66`	`+ if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {`
`67`	`67`	`$e = $e->getPrevious();`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function all($issueId, array $params = [])`
`68`	`68`	`return false;`
`69`	`69`	`}`
`70`	`70`
`71`		`- if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {`
	`71`	`+ if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {`
`72`	`72`	`$e = $e->getPrevious();`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function all($project, array $params = [])`
`78`	`78`	`return false;`
`79`	`79`	`}`
`80`	`80`
`81`		`- if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {`
	`81`	`+ if ($e instanceof UnexpectedResponseException && $e->getPrevious() instanceof \Throwable) {`
`82`	`82`	`$e = $e->getPrevious();`
`83`	`83`	`}`
`84`	`84`