Merge branch '4.4' into 5.3

wouterj · wouterj · commit a166dc602c77 · 2022-01-25T13:26:33.000+01:00
* 4.4:
  call `fetchAllAssociative` for a result set
diff --git a/doctrine.rst b/doctrine.rst
@@ -851,10 +851,10 @@ In addition, you can query directly with SQL if you need to::
                 ORDER BY p.price ASC
                 ';
             $stmt = $conn->prepare($sql);
-            $stmt->executeQuery(['price' => $price]);
+            $resultSet = $stmt->executeQuery(['price' => $price]);
 
             // returns an array of arrays (i.e. a raw data set)
-            return $stmt->fetchAllAssociative();
+            return $resultSet->fetchAllAssociative();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -851,10 +851,10 @@ In addition, you can query directly with SQL if you need to::`
`851`	`851`	`ORDER BY p.price ASC`
`852`	`852`	`';`
`853`	`853`	`$stmt = $conn->prepare($sql);`
`854`		`- $stmt->executeQuery(['price' => $price]);`
	`854`	`+ $resultSet = $stmt->executeQuery(['price' => $price]);`
`855`	`855`
`856`	`856`	`// returns an array of arrays (i.e. a raw data set)`
`857`		`- return $stmt->fetchAllAssociative();`
	`857`	`+ return $resultSet->fetchAllAssociative();`
`858`	`858`	`}`
`859`	`859`	`}`
`860`	`860`