Skip to content

Commit 1f29581

Browse files
committed
Merge branch '5.4' into 6.3
* 5.4: run composer update for compatibility with PHPUnit versions shipping composer.lock add parameter types in query builder
2 parents 37d0e25 + 735959c commit 1f29581

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@
265265
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
266266
$q = '\\' === \DIRECTORY_SEPARATOR && \PHP_VERSION_ID < 80000 ? '"' : '';
267267
// --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
268-
$exit = proc_close(proc_open("$q$COMPOSER install --no-dev --prefer-dist --no-progress $q", [], $p, getcwd()));
268+
$exit = proc_close(proc_open("$q$COMPOSER update --no-dev --prefer-dist --no-progress $q", [], $p, getcwd()));
269269
putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
270270
if ($prevCacheDir) {
271271
putenv("COMPOSER_CACHE_DIR=$prevCacheDir");

src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public function get(): ?array
183183
if ($this->driverConnection->getDatabasePlatform() instanceof OraclePlatform) {
184184
$query = $this->createQueryBuilder('w')
185185
->where('w.id IN ('.str_replace('SELECT a.* FROM', 'SELECT a.id FROM', $sql).')')
186-
->setParameters($query->getParameters());
186+
->setParameters($query->getParameters(), $query->getParameterTypes());
187187

188188
if (method_exists(QueryBuilder::class, 'forUpdate')) {
189189
$query->forUpdate();

0 commit comments

Comments
 (0)