Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4e2022f

Browse files
committed
Merge branch '7.0' into 7.1
* 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
2 parents3330e55 +4e48f53 commit4e2022f

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
@@ -263,7 +263,7 @@
263263
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
264264
$q ='\\' === \DIRECTORY_SEPARATOR && \PHP_VERSION_ID <80000 ?'"' :'';
265265
// --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
266-
$exit =proc_close(proc_open("$q$COMPOSERinstall --no-dev --prefer-dist --no-progress$q", [],$p,getcwd()));
266+
$exit =proc_close(proc_open("$q$COMPOSERupdate --no-dev --prefer-dist --no-progress$q", [],$p,getcwd()));
267267
putenv('COMPOSER_ROOT_VERSION'.(false !==$prevRoot ?'='.$prevRoot :''));
268268
if ($prevCacheDir) {
269269
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
@@ -179,7 +179,7 @@ public function get(): ?array
179179
if ($this->driverConnection->getDatabasePlatform()instanceof OraclePlatform) {
180180
$query =$this->createQueryBuilder('w')
181181
->where('w.id IN ('.str_replace('SELECT a.* FROM','SELECT a.id FROM',$sql).')')
182-
->setParameters($query->getParameters());
182+
->setParameters($query->getParameters(),$query->getParameterTypes());
183183

184184
$sql =$query->getSQL();
185185
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp