Merge pull request #6858 from morozov/use-bool-in-while

Use boolean values in while loops

Author: morozov

src/Driver/SQLSrv/Result.php

@@ -106,7 +106,7 @@ public function free(): void
         // @link http://php.net/manual/en/pdostatement.closecursor.php
         // @link https://github.com/php/php-src/blob/php-7.0.11/ext/pdo/pdo_stmt.c#L2075
         // deliberately do not consider multiple result sets, since doctrine/dbal doesn't support them
-        while (sqlsrv_fetch($this->statement)) {
+        while (sqlsrv_fetch($this->statement) === true) {
         }
     }
 

src/Schema/SQLServerSchemaManager.php

@@ -156,7 +156,7 @@ protected function _getPortableTableColumnDefinition(array $tableColumn): Column
 
     private function parseDefaultExpression(string $value): ?string
     {
-        while (preg_match('/^\((.*)\)$/s', $value, $matches)) {
+        while (preg_match('/^\((.*)\)$/s', $value, $matches) === 1) {
             $value = $matches[1];
         }
 

tests/Functional/Driver/OCI8/ResultTest.php

@@ -100,7 +100,7 @@ public function testTruncatedFetch(
         }
 
         try {
-            while ($result->fetchOne()) {
+            while ($result->fetchOne() !== false) {
                 // Attempt to access all remaining rows from the original fetch
                 // The rows locally cached from the default prefetch will first be used
                 // but when the result attempts to get the remaining 10 rows beyond

tests/Functional/PortabilityTest.php

@@ -36,15 +36,15 @@ public function testFullFetchMode(): void
 
         $result = $this->connection->executeQuery('SELECT * FROM portability_table');
 
-        while (($row = $result->fetchAssociative())) {
+        while (($row = $result->fetchAssociative()) !== false) {
             $this->assertFetchResultRow($row);
         }
 
         $result = $this->connection
             ->prepare('SELECT * FROM portability_table')
             ->executeQuery();
 
-        while (($row = $result->fetchAssociative())) {
+        while (($row = $result->fetchAssociative()) !== false) {
             $this->assertFetchResultRow($row);
         }
     }