minor #52022 [Doctrine][DoctrineBridge][HttpFoundation][VarDumper] Run tests with ORM 3 and DBAL 4 (derrabus)

nicolas-grekas · nicolas-grekas · commit f36e4ab305d6 · 2023-10-12T23:09:32.000+02:00
This PR was merged into the 6.3 branch. Discussion ---------- [Doctrine][DoctrineBridge][HttpFoundation][VarDumper] Run tests with ORM 3 and DBAL 4 | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Follow-up to #51997 | License | MIT Everything that got lost in the merge-up + a fix for the VarDumper testsuite. 😇 Commits ------- 81c40be Run tests with ORM 3 and DBAL 4
diff --git a/.github/patch-types.php b/.github/patch-types.php
@@ -23,6 +23,8 @@
             }
             // no break;
         case false !== strpos($file, '/vendor/'):
+        case false !== strpos($file, '/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php'):
+        case false !== strpos($file, '/src/Symfony/Bridge/Doctrine/Middleware/Debug/'):
         case false !== strpos($file, '/src/Symfony/Bridge/PhpUnit/'):
         case false !== strpos($file, '/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php'):
         case false !== strpos($file, '/src/Symfony/Component/Cache/Tests/Fixtures/DriverWrapper.php'):
diff --git a/composer.json b/composer.json
@@ -132,7 +132,7 @@
         "doctrine/collections": "^1.0|^2.0",
         "doctrine/data-fixtures": "^1.1",
         "doctrine/dbal": "^2.13.1|^3.0",
-        "doctrine/orm": "^2.12",
+        "doctrine/orm": "^2.12|^3",
         "dragonmantank/cron-expression": "^3.1",
         "egulias/email-validator": "^2.1.10|^3.1|^4",
         "guzzlehttp/promises": "^1.4",
diff --git a/src/Symfony/Bridge/Doctrine/Middleware/Debug/Statement.php b/src/Symfony/Bridge/Doctrine/Middleware/Debug/Statement.php
@@ -39,15 +39,14 @@ public function __construct(
         $this->query = new Query($sql);
     }
 
-    public function bindValue($param, $value, $type = null): void
+    public function bindValue(int|string $param, mixed $value, ParameterType $type): void
     {
-        $type ??= ParameterType::STRING;
         $this->query->setValue($param, $value, $type);
 
         parent::bindValue($param, $value, $type);
     }
 
-    public function execute($params = null): ResultInterface
+    public function execute(): ResultInterface
     {
         // clone to prevent variables by reference to change
         $this->debugDataHolder->addQuery($this->connectionName, $query = clone $this->query);
@@ -56,7 +55,7 @@ public function execute($params = null): ResultInterface
         $query->start();
 
         try {
-            return parent::execute($params);
+            return parent::execute();
         } finally {
             $query->stop();
             $this->stopwatch?->stop('doctrine');
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
@@ -22,7 +22,7 @@
         "symfony/polyfill-php83": "^1.27"
     },
     "require-dev": {
-        "doctrine/dbal": "^2.13.1|^3.0",
+        "doctrine/dbal": "^2.13.1|^3|^4",
         "predis/predis": "^1.1|^2.0",
         "symfony/cache": "^6.3",
         "symfony/dependency-injection": "^5.4|^6.0",
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/DoctrineCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/DoctrineCasterTest.php
@@ -31,14 +31,28 @@ public function testCastPersistentCollection()
 
         $collection = new PersistentCollection($this->createMock(EntityManagerInterface::class), $classMetadata, new ArrayCollection(['test']));
 
-        $expected = <<<EODUMP
-Doctrine\ORM\PersistentCollection {
-%A
-  -em: Mock_EntityManagerInterface_%s { …3}
-  -backRefFieldName: null
-  -typeClass: Doctrine\ORM\Mapping\ClassMetadata { …}
-%A
-EODUMP;
+        if (property_exists(PersistentCollection::class, 'isDirty')) {
+            // Collections >= 2
+            $expected = <<<EODUMP
+                Doctrine\ORM\PersistentCollection {
+                %A
+                  -em: Mock_EntityManagerInterface_%s { …3}
+                  -backRefFieldName: null
+                  -isDirty: false
+                  -typeClass: Doctrine\ORM\Mapping\ClassMetadata { …}
+                %A
+                EODUMP;
+        } else {
+            // Collections 1
+            $expected = <<<EODUMP
+                Doctrine\ORM\PersistentCollection {
+                %A
+                  -em: Mock_EntityManagerInterface_%s { …3}
+                  -backRefFieldName: null
+                  -typeClass: Doctrine\ORM\Mapping\ClassMetadata { …}
+                %A
+                EODUMP;
+        }
 
         $this->assertDumpMatchesFormat($expected, $collection);
     }

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@`
`23`	`23`	`}`
`24`	`24`	`// no break;`
`25`	`25`	`case false !== strpos($file, '/vendor/'):`
	`26`	`+ case false !== strpos($file, '/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php'):`
	`27`	`+ case false !== strpos($file, '/src/Symfony/Bridge/Doctrine/Middleware/Debug/'):`
`26`	`28`	`case false !== strpos($file, '/src/Symfony/Bridge/PhpUnit/'):`
`27`	`29`	`case false !== strpos($file, '/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php'):`
`28`	`30`	`case false !== strpos($file, '/src/Symfony/Component/Cache/Tests/Fixtures/DriverWrapper.php'):`
Original file line number	Diff line number	Diff line change
`@@ -39,15 +39,14 @@ public function __construct(`
`39`	`39`	`$this->query = new Query($sql);`
`40`	`40`	`}`
`41`	`41`
`42`		`- public function bindValue($param, $value, $type = null): void`
	`42`	`+ public function bindValue(int\|string $param, mixed $value, ParameterType $type): void`
`43`	`43`	`{`
`44`		`- $type ??= ParameterType::STRING;`
`45`	`44`	`$this->query->setValue($param, $value, $type);`
`46`	`45`
`47`	`46`	`parent::bindValue($param, $value, $type);`
`48`	`47`	`}`
`49`	`48`
`50`		`- public function execute($params = null): ResultInterface`
	`49`	`+ public function execute(): ResultInterface`
`51`	`50`	`{`
`52`	`51`	`// clone to prevent variables by reference to change`
`53`	`52`	`$this->debugDataHolder->addQuery($this->connectionName, $query = clone $this->query);`
`@@ -56,7 +55,7 @@ public function execute($params = null): ResultInterface`
`56`	`55`	`$query->start();`
`57`	`56`
`58`	`57`	`try {`
`59`		`- return parent::execute($params);`
	`58`	`+ return parent::execute();`
`60`	`59`	`} finally {`
`61`	`60`	`$query->stop();`
`62`	`61`	`$this->stopwatch?->stop('doctrine');`