Merge #18462 - Code improvement: NullableCompareToNullRector

williamdes · williamdes · commit 21cf996096f4 · 2023-05-29T13:05:51.000+02:00
Pull-request: #18462 Signed-off-by: William Desportes <williamdes@wdes.fr>
diff --git a/libraries/classes/Config/PageSettings.php b/libraries/classes/Config/PageSettings.php
@@ -113,7 +113,7 @@ private function processPageSettings(FormDisplay $formDisplay, ConfigFile $cf):
     private function storeError(FormDisplay $formDisplay, Message|null $error): void
     {
         $retval = '';
-        if ($error) {
+        if ($error !== null) {
             $retval .= $error->getDisplay();
         }
 
diff --git a/libraries/classes/Dbal/MysqliResult.php b/libraries/classes/Dbal/MysqliResult.php
@@ -43,7 +43,7 @@ public function __construct(mysqli_result|bool $result)
      */
     public function getIterator(): Generator
     {
-        if (! $this->result) {
+        if ($this->result === null) {
             return;
         }
 
@@ -62,7 +62,7 @@ public function getIterator(): Generator
      */
     public function fetchAssoc(): array
     {
-        if (! $this->result) {
+        if ($this->result === null) {
             return [];
         }
 
@@ -79,7 +79,7 @@ public function fetchAssoc(): array
      */
     public function fetchRow(): array
     {
-        if (! $this->result) {
+        if ($this->result === null) {
             return [];
         }
 
@@ -114,7 +114,7 @@ public function fetchValue(int|string $field = 0): string|false|null
      */
     public function fetchAllAssoc(): array
     {
-        if (! $this->result) {
+        if ($this->result === null) {
             return [];
         }
 
@@ -132,7 +132,7 @@ public function fetchAllAssoc(): array
      */
     public function fetchAllColumn(): array
     {
-        if (! $this->result) {
+        if ($this->result === null) {
             return [];
         }
 
@@ -153,7 +153,7 @@ public function fetchAllColumn(): array
      */
     public function fetchAllKeyPair(): array
     {
-        if (! $this->result) {
+        if ($this->result === null) {
             return [];
         }
 
@@ -170,7 +170,7 @@ public function fetchAllKeyPair(): array
      */
     public function numFields(): int
     {
-        if (! $this->result) {
+        if ($this->result === null) {
             return 0;
         }
 
@@ -184,7 +184,7 @@ public function numFields(): int
      */
     public function numRows(): string|int
     {
-        if (! $this->result) {
+        if ($this->result === null) {
             return 0;
         }
 
@@ -200,7 +200,7 @@ public function numRows(): string|int
      */
     public function seek(int $offset): bool
     {
-        if (! $this->result) {
+        if ($this->result === null) {
             return false;
         }
 
@@ -215,7 +215,7 @@ public function seek(int $offset): bool
      */
     public function getFieldsMeta(): array
     {
-        if (! $this->result) {
+        if ($this->result === null) {
             return [];
         }
 
@@ -235,7 +235,7 @@ public function getFieldsMeta(): array
      */
     public function getFieldNames(): array
     {
-        if (! $this->result) {
+        if ($this->result === null) {
             return [];
         }
 
diff --git a/libraries/classes/ErrorHandler.php b/libraries/classes/ErrorHandler.php
@@ -373,7 +373,7 @@ protected function dispPageStart(Error|null $error = null): void
     {
         ResponseRenderer::getInstance()->disable();
         echo '<html><head><title>';
-        if ($error) {
+        if ($error !== null) {
             echo $error->getTitle();
         } else {
             echo 'phpMyAdmin error reporting page';

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ private function processPageSettings(FormDisplay $formDisplay, ConfigFile $cf):`
`113`	`113`	`private function storeError(FormDisplay $formDisplay, Message\|null $error): void`
`114`	`114`	`{`
`115`	`115`	`$retval = '';`
`116`		`- if ($error) {`
	`116`	`+ if ($error !== null) {`
`117`	`117`	`$retval .= $error->getDisplay();`
`118`	`118`	`}`
`119`	`119`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct(mysqli_result\|bool $result)`
`43`	`43`	`*/`
`44`	`44`	`public function getIterator(): Generator`
`45`	`45`	`{`
`46`		`- if (! $this->result) {`
	`46`	`+ if ($this->result === null) {`
`47`	`47`	`return;`
`48`	`48`	`}`
`49`	`49`
`@@ -62,7 +62,7 @@ public function getIterator(): Generator`
`62`	`62`	`*/`
`63`	`63`	`public function fetchAssoc(): array`
`64`	`64`	`{`
`65`		`- if (! $this->result) {`
	`65`	`+ if ($this->result === null) {`
`66`	`66`	`return [];`
`67`	`67`	`}`
`68`	`68`
`@@ -79,7 +79,7 @@ public function fetchAssoc(): array`
`79`	`79`	`*/`
`80`	`80`	`public function fetchRow(): array`
`81`	`81`	`{`
`82`		`- if (! $this->result) {`
	`82`	`+ if ($this->result === null) {`
`83`	`83`	`return [];`
`84`	`84`	`}`
`85`	`85`
`@@ -114,7 +114,7 @@ public function fetchValue(int\|string $field = 0): string\|false\|null`
`114`	`114`	`*/`
`115`	`115`	`public function fetchAllAssoc(): array`
`116`	`116`	`{`
`117`		`- if (! $this->result) {`
	`117`	`+ if ($this->result === null) {`
`118`	`118`	`return [];`
`119`	`119`	`}`
`120`	`120`
`@@ -132,7 +132,7 @@ public function fetchAllAssoc(): array`
`132`	`132`	`*/`
`133`	`133`	`public function fetchAllColumn(): array`
`134`	`134`	`{`
`135`		`- if (! $this->result) {`
	`135`	`+ if ($this->result === null) {`
`136`	`136`	`return [];`
`137`	`137`	`}`
`138`	`138`
`@@ -153,7 +153,7 @@ public function fetchAllColumn(): array`
`153`	`153`	`*/`
`154`	`154`	`public function fetchAllKeyPair(): array`
`155`	`155`	`{`
`156`		`- if (! $this->result) {`
	`156`	`+ if ($this->result === null) {`
`157`	`157`	`return [];`
`158`	`158`	`}`
`159`	`159`
`@@ -170,7 +170,7 @@ public function fetchAllKeyPair(): array`
`170`	`170`	`*/`
`171`	`171`	`public function numFields(): int`
`172`	`172`	`{`
`173`		`- if (! $this->result) {`
	`173`	`+ if ($this->result === null) {`
`174`	`174`	`return 0;`
`175`	`175`	`}`
`176`	`176`
`@@ -184,7 +184,7 @@ public function numFields(): int`
`184`	`184`	`*/`
`185`	`185`	`public function numRows(): string\|int`
`186`	`186`	`{`
`187`		`- if (! $this->result) {`
	`187`	`+ if ($this->result === null) {`
`188`	`188`	`return 0;`
`189`	`189`	`}`
`190`	`190`
`@@ -200,7 +200,7 @@ public function numRows(): string\|int`
`200`	`200`	`*/`
`201`	`201`	`public function seek(int $offset): bool`
`202`	`202`	`{`
`203`		`- if (! $this->result) {`
	`203`	`+ if ($this->result === null) {`
`204`	`204`	`return false;`
`205`	`205`	`}`
`206`	`206`
`@@ -215,7 +215,7 @@ public function seek(int $offset): bool`
`215`	`215`	`*/`
`216`	`216`	`public function getFieldsMeta(): array`
`217`	`217`	`{`
`218`		`- if (! $this->result) {`
	`218`	`+ if ($this->result === null) {`
`219`	`219`	`return [];`
`220`	`220`	`}`
`221`	`221`
`@@ -235,7 +235,7 @@ public function getFieldsMeta(): array`
`235`	`235`	`*/`
`236`	`236`	`public function getFieldNames(): array`
`237`	`237`	`{`
`238`		`- if (! $this->result) {`
	`238`	`+ if ($this->result === null) {`
`239`	`239`	`return [];`
`240`	`240`	`}`
`241`	`241`
Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ protected function dispPageStart(Error\|null $error = null): void`
`373`	`373`	`{`
`374`	`374`	`ResponseRenderer::getInstance()->disable();`
`375`	`375`	`echo '<html><head><title>';`
`376`		`- if ($error) {`
	`376`	`+ if ($error !== null) {`
`377`	`377`	`echo $error->getTitle();`
`378`	`378`	`} else {`
`379`	`379`	`echo 'phpMyAdmin error reporting page';`