Merge branch '7.0' into 7.1

xabbuh · xabbuh · commit 4e2022f22a89 · 2023-12-01T10:26:42.000+01:00
* 7.0:
  run composer update for compatibility with PHPUnit versions shipping composer.lock
  [AssetMapper] Upgrade asset mapper to 6.4 fails due to invalid entries "downloaded_to" and "preload"
  add parameter types in query builder
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
@@ -263,7 +263,7 @@
     putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
     $q = '\\' === \DIRECTORY_SEPARATOR && \PHP_VERSION_ID < 80000 ? '"' : '';
     // --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
-    $exit = proc_close(proc_open("$q$COMPOSER install --no-dev --prefer-dist --no-progress $q", [], $p, getcwd()));
+    $exit = proc_close(proc_open("$q$COMPOSER update --no-dev --prefer-dist --no-progress $q", [], $p, getcwd()));
     putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
     if ($prevCacheDir) {
         putenv("COMPOSER_CACHE_DIR=$prevCacheDir");
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
@@ -179,7 +179,7 @@ public function get(): ?array
             if ($this->driverConnection->getDatabasePlatform() instanceof OraclePlatform) {
                 $query = $this->createQueryBuilder('w')
                     ->where('w.id IN ('.str_replace('SELECT a.* FROM', 'SELECT a.id FROM', $sql).')')
-                    ->setParameters($query->getParameters());
+                    ->setParameters($query->getParameters(), $query->getParameterTypes());
 
                 $sql = $query->getSQL();
             }

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public function get(): ?array`
`179`	`179`	`if ($this->driverConnection->getDatabasePlatform() instanceof OraclePlatform) {`
`180`	`180`	`$query = $this->createQueryBuilder('w')`
`181`	`181`	`->where('w.id IN ('.str_replace('SELECT a.* FROM', 'SELECT a.id FROM', $sql).')')`
`182`		`- ->setParameters($query->getParameters());`
	`182`	`+ ->setParameters($query->getParameters(), $query->getParameterTypes());`
`183`	`183`
`184`	`184`	`$sql = $query->getSQL();`
`185`	`185`	`}`