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

Commitdd1f998

Browse files
Merge branch '6.0' into 6.1
* 6.0: Fix tests Bump Symfony version to 6.0.7 Update VERSION for 6.0.6 Update CHANGELOG for 6.0.6 Bump Symfony version to 5.4.7 Update VERSION for 5.4.6 Update CHANGELOG for 5.4.6 Bump Symfony version to 4.4.40 Update VERSION for 4.4.39 Update CONTRIBUTORS for 4.4.39 Update CHANGELOG for 4.4.39 [redis-messenger] remove undefined array key warnings do not pass DBAL connections to PDO adapters [HttpFoundation] Fix PHP 8.1 deprecation in isNotModified
2 parents25a5eb2 +e4b3a32 commitdd1f998

File tree

8 files changed

+37
-8
lines changed

8 files changed

+37
-8
lines changed

‎CHANGELOG-6.0.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@ in 6.0 minor versions.
77
To get the diff for a specific change, go tohttps://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go tohttps://github.com/symfony/symfony/compare/v6.0.0...v6.0.1
99

10+
* 6.0.6 (2022-03-05)
11+
12+
* bug#45619[redis-messenger] remove undefined array key warnings (PhilETaylor)
13+
* bug#45637[Cache] do not pass DBAL connections to PDO adapters (xabbuh)
14+
* bug#45631[HttpFoundation] Fix PHP 8.1 deprecation in`Response::isNotModified` (HypeMC)
15+
* bug#45610[HttpKernel] Guard against bad profile data (nicolas-grekas)
16+
* bug#45532 Fix deprecations on PHP 8.2 (nicolas-grekas)
17+
* bug#45595[FrameworkBundle] Fix resetting container between tests (nicolas-grekas)
18+
* bug#45590[Console] Revert StringInput bc break from#45088 (bobthecow)
19+
* bug#45585[HttpClient] fix checking for unset property on PHP <= 7.1.4 (nicolas-grekas)
20+
* bug#45583[WebProfilerBundle] Fixes HTML syntax regression introduced by#44570 (xavismeh)
21+
1022
* 6.0.5 (2022-02-28)
1123

1224
* bug#45351[WebProfilerBundle] Log section minor fixes (missing "notice" filter, log priority, accessibility) (Amunak)

‎CONTRIBUTORS.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ The Symfony Connect username in parenthesis allows to get more information
7878
- Henrik Bjørnskov (henrikbjorn)
7979
- Antoine M (amakdessi)
8080
- Miha Vrhovnik
81-
- Diego Saint Esteben (dii3g0)
8281
- Mathieu Piot (mpiot)
82+
- Diego Saint Esteben (dii3g0)
8383
- Konstantin Kudryashov (everzet)
8484
- Vladimir Reznichenko (kalessil)
8585
- Bilal Amarni (bamarni)
@@ -110,13 +110,13 @@ The Symfony Connect username in parenthesis allows to get more information
110110
- Luis Cordova (cordoval)
111111
- Daniel Holmes (dholmes)
112112
- Sebastiaan Stok (sstok)
113+
- Alexandre Daubois (alexandre-daubois)
113114
- HypeMC (hypemc)
114115
- Toni Uebernickel (havvg)
115116
- Bart van den Burg (burgov)
116117
- Jordan Alliot (jalliot)
117118
- John Wards (johnwards)
118119
- Tomas Norkūnas (norkunas)
119-
- Alexandre Daubois (alexandre-daubois)
120120
- Julien Falque (julienfalque)
121121
- Baptiste Clavié (talus)
122122
- Massimiliano Arione (garak)
@@ -2723,6 +2723,7 @@ The Symfony Connect username in parenthesis allows to get more information
27232723
- Cyrille Jouineau (tuxosaurus)
27242724
- Vladimir Chernyshev (volch)
27252725
- Wim Godden (wimg)
2726+
- Xav` (xavismeh)
27262727
- Yorkie Chadwick (yorkie76)
27272728
- Maxime Aknin (3m1x4m)
27282729
- Geordie

‎src/Symfony/Bridge/PhpUnit/Tests/expectdeprecationfail.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $test = realpath(__DIR__.'/FailTests/ExpectDeprecationTraitTestFail.php');
66
passthru('php'.getenv('SYMFONY_SIMPLE_PHPUNIT_BIN_DIR').'/simple-phpunit.php --colors=never'.$test);
77
?>
88
--EXPECTF--
9-
PHPUnit %s by Sebastian Bergmann and contributors.
9+
PHPUnit %s
1010

1111
%ATesting Symfony\Bridge\PhpUnit\Tests\FailTests\ExpectDeprecationTraitTestFail
1212
FF 2 / 2 (100%)

‎src/Symfony/Bridge/PhpUnit/Tests/expectrisky.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $test = realpath(__DIR__.'/FailTests/NoAssertionsTestRisky.php');
88
passthru('php'.getenv('SYMFONY_SIMPLE_PHPUNIT_BIN_DIR').'/simple-phpunit.php --fail-on-risky --colors=never'.$test);
99
?>
1010
--EXPECTF--
11-
PHPUnit %s by Sebastian Bergmann and contributors.
11+
PHPUnit %s
1212

1313
%ATesting Symfony\Bridge\PhpUnit\Tests\FailTests\NoAssertionsTestRisky
1414
R. 2 / 2 (100%)

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
usePsr\Log\LogLevel;
1717
useSymfony\Bundle\FullStack;
1818
useSymfony\Component\Asset\Package;
19+
useSymfony\Component\Cache\Adapter\DoctrineAdapter;
1920
useSymfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
2021
useSymfony\Component\Config\Definition\Builder\NodeBuilder;
2122
useSymfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -1049,7 +1050,7 @@ private function addCacheSection(ArrayNodeDefinition $rootNode, callable $willBe
10491050
->scalarNode('default_redis_provider')->defaultValue('redis://localhost')->end()
10501051
->scalarNode('default_memcached_provider')->defaultValue('memcached://localhost')->end()
10511052
->scalarNode('default_doctrine_dbal_provider')->defaultValue('database_connection')->end()
1052-
->scalarNode('default_pdo_provider')->defaultValue($willBeAvailable('doctrine/dbal', Connection::class) ?'database_connection' :null)->end()
1053+
->scalarNode('default_pdo_provider')->defaultValue($willBeAvailable('doctrine/dbal', Connection::class)&&class_exists(DoctrineAdapter::class)?'database_connection' :null)->end()
10531054
->arrayNode('pools')
10541055
->useAttributeAsKey('name')
10551056
->prototype('array')

‎src/Symfony/Component/HttpFoundation/Response.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,8 +1064,7 @@ public function isNotModified(Request $request): bool
10641064
$lastModified =$this->headers->get('Last-Modified');
10651065
$modifiedSince =$request->headers->get('If-Modified-Since');
10661066

1067-
if ($ifNoneMatchEtags =$request->getETags()) {
1068-
$etag =$this->getEtag();
1067+
if (($ifNoneMatchEtags =$request->getETags()) && (null !==$etag =$this->getEtag())) {
10691068
if (0 ==strncmp($etag,'W/',2)) {
10701069
$etag =substr($etag,2);
10711070
}

‎src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,20 @@ public function testIsNotModifiedIfModifiedSinceAndEtagWithoutLastModified()
275275
$this->assertFalse($response->isNotModified($request));
276276
}
277277

278+
publicfunctiontestIfNoneMatchWithoutETag()
279+
{
280+
$request =newRequest();
281+
$request->headers->set('If-None-Match','randomly_generated_etag');
282+
283+
$this->assertFalse((newResponse())->isNotModified($request));
284+
285+
// Test wildcard
286+
$request =newRequest();
287+
$request->headers->set('If-None-Match','*');
288+
289+
$this->assertFalse((newResponse())->isNotModified($request));
290+
}
291+
278292
publicfunctiontestIsValidateable()
279293
{
280294
$response =newResponse('',200, ['Last-Modified' =>$this->createDateTimeOneHourAgo()->format(\DATE_RFC2822)]);

‎src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,10 +334,12 @@ public function get(): ?array
334334
$queuedMessageCount =$this->rawCommand('ZCOUNT',0,$now);
335335

336336
while ($queuedMessageCount--) {
337-
if (![$queuedMessage,$expiry] =$this->rawCommand('ZPOPMIN',1)) {
337+
if (!$message =$this->rawCommand('ZPOPMIN',1)) {
338338
break;
339339
}
340340

341+
[$queuedMessage,$expiry] =$message;
342+
341343
if (\strlen($expiry) ===\strlen($now) ?$expiry >$now :\strlen($expiry) <\strlen($now)) {
342344
// if a future-placed message is popped because of a race condition with
343345
// another running consumer, the message is readded to the queue

0 commit comments

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