bug #46811 [DoctrineBridge] Fix comment for type on Query::setValue (middlewares) (l-vo)

fabpot · fabpot · commit 06400fb28d80 · 2022-07-02T13:43:46.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [DoctrineBridge] Fix comment for type on Query::setValue (middlewares) | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | See #46810 and #46744 Commits ------- 928a754 [DoctrineBridge] Fix comment for type on Query::setValue (middlewares)
diff --git a/src/Symfony/Bridge/Doctrine/Middleware/Debug/Query.php b/src/Symfony/Bridge/Doctrine/Middleware/Debug/Query.php
@@ -59,8 +59,8 @@ public function setParam($param, &$variable, int $type): void
     }
 
     /**
-     * @param string|int                 $param
-     * @param string|int|float|bool|null $value
+     * @param string|int $param
+     * @param mixed      $value
      */
     public function setValue($param, $value, int $type): void
     {
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php
@@ -17,6 +17,7 @@
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Result;
+use Doctrine\DBAL\Types\Types;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\Middleware\Debug\DebugDataHolder;
 use Symfony\Bridge\Doctrine\Middleware\Debug\Middleware;
@@ -61,12 +62,23 @@ private function init(bool $withStopwatch = true): void
 	id INTEGER PRIMARY KEY,
 	name TEXT NOT NULL,
 	price REAL NOT NULL,
-	stock INTEGER NOT NULL
+	stock INTEGER NOT NULL,
+	picture BLOB NULL,
+	tags TEXT NULL,
+	created_at TEXT NULL
 );
 EOT
         );
     }
 
+    private function getResourceFromString(string $str)
+    {
+        $res = fopen('php://temp', 'r+');
+        fwrite($res, $str);
+
+        return $res;
+    }
+
     public function provideExecuteMethod(): array
     {
         return [
@@ -107,18 +119,26 @@ public function testWithValueBound(callable $executeMethod)
     {
         $this->init();
 
-        $stmt = $this->conn->prepare('INSERT INTO products(name, price, stock) VALUES (?, ?, ?)');
+        $sql = <<<EOT
+INSERT INTO products(name, price, stock, picture, tags, created_at)
+VALUES (?, ?, ?, ?, ?, ?)
+EOT;
+
+        $stmt = $this->conn->prepare($sql);
         $stmt->bindValue(1, 'product1');
         $stmt->bindValue(2, 12.5);
         $stmt->bindValue(3, 5, ParameterType::INTEGER);
+        $stmt->bindValue(4, $res = $this->getResourceFromString('mydata'), ParameterType::BINARY);
+        $stmt->bindValue(5, ['foo', 'bar'], Types::SIMPLE_ARRAY);
+        $stmt->bindValue(6, new \DateTime('2022-06-12 11:00:00'), Types::DATETIME_MUTABLE);
 
         $executeMethod($stmt);
 
         $debug = $this->debugDataHolder->getData()['default'] ?? [];
         $this->assertCount(2, $debug);
-        $this->assertSame('INSERT INTO products(name, price, stock) VALUES (?, ?, ?)', $debug[1]['sql']);
-        $this->assertSame(['product1', 12.5, 5], $debug[1]['params']);
-        $this->assertSame([ParameterType::STRING, ParameterType::STRING, ParameterType::INTEGER], $debug[1]['types']);
+        $this->assertSame($sql, $debug[1]['sql']);
+        $this->assertSame(['product1', 12.5, 5, $res, 'foo,bar', '2022-06-12 11:00:00'], $debug[1]['params']);
+        $this->assertSame([ParameterType::STRING, ParameterType::STRING, ParameterType::INTEGER, ParameterType::BINARY, ParameterType::STRING, ParameterType::STRING], $debug[1]['types']);
         $this->assertGreaterThan(0, $debug[1]['executionMS']);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,8 @@ public function setParam($param, &$variable, int $type): void`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/**`
`62`		`- * @param string\|int $param`
`63`		`- * @param string\|int\|float\|bool\|null $value`
	`62`	`+ * @param string\|int $param`
	`63`	`+ * @param mixed $value`
`64`	`64`	`*/`
`65`	`65`	`public function setValue($param, $value, int $type): void`
`66`	`66`	`{`