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
Appearance settings

Commit 3c0cfbc

Browse filesBrowse files
derrabusderrabus
committed
Merge branch '5.2' into 5.x
* 5.2: do not depend on the actual time to fix a transient test Run Redis Sentinel tests in GithubAction Minor : Removed typo (extra "the" term) Check if method inheritEnvironmentVariables exists [PhpUnitBridge] Fix test fixture file name
2 parents 2fa9291 + 0302332 commit 3c0cfbc
Copy full SHA for 3c0cfbc

File tree

Expand file treeCollapse file tree

6 files changed

+15
-5
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+15
-5
lines changed

‎.github/workflows/tests.yml

Copy file name to clipboardExpand all lines: .github/workflows/tests.yml
+11-2Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,16 @@ jobs:
4646
- 7004:7004
4747
- 7005:7005
4848
- 7006:7006
49-
- 7007:7007
5049
env:
51-
STANDALONE: true
50+
STANDALONE: 1
51+
redis-sentinel:
52+
image: bitnami/redis-sentinel:6.0
53+
ports:
54+
- 26379:26379
55+
env:
56+
REDIS_MASTER_HOST: redis
57+
REDIS_MASTER_SET: redis_sentinel
58+
REDIS_SENTINEL_QUORUM: 1
5259
memcached:
5360
image: memcached:1.6.5
5461
ports:
@@ -159,6 +166,8 @@ jobs:
159166
env:
160167
REDIS_HOST: localhost
161168
REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
169+
REDIS_SENTINEL_HOSTS: 'localhost:26379'
170+
REDIS_SENTINEL_SERVICE: redis_sentinel
162171
MESSENGER_REDIS_DSN: redis://127.0.0.1:7006/messages
163172
MESSENGER_AMQP_DSN: amqp://localhost/%2f/messages
164173
MESSENGER_SQS_DSN: "sqs://localhost:9494/messages?sslmode=disable&poll_timeout=0.01"

‎src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/SutNotFindTest.php renamed to ‎src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/SutNotFoundTest.php

Copy file name to clipboard
File renamed without changes.

‎src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static function setUpBeforeClass(): void
3737
public function testInvalidDSNHasBothClusterAndSentinel()
3838
{
3939
$this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
40-
$this->expectExceptionMessage('Invalid Redis DSN: cannot use both redis_cluster and redis_sentinel at the same time');
40+
$this->expectExceptionMessage('Cannot use both "redis_cluster" and "redis_sentinel" at the same time:');
4141
$dsn = 'redis:?host[redis1]&host[redis2]&host[redis3]&redis_cluster=1&redis_sentinel=mymaster';
4242
RedisAdapter::createConnection($dsn);
4343
}

‎src/Symfony/Component/Dotenv/Dotenv.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Dotenv/Dotenv.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ private function resolveCommands(string $value, array $loadedVars): string
456456

457457
$process = method_exists(Process::class, 'fromShellCommandline') ? Process::fromShellCommandline('echo '.$matches[0]) : new Process('echo '.$matches[0]);
458458

459-
if (!method_exists(Process::class, 'fromShellCommandline')) {
459+
if (!method_exists(Process::class, 'fromShellCommandline') && method_exists(Process::class, 'inheritEnvironmentVariables')) {
460460
// Symfony 3.4 does not inherit env vars by default:
461461
$process->inheritEnvironmentVariables();
462462
}

‎src/Symfony/Component/Finder/Finder.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Finder/Finder.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ public function append(iterable $iterator)
655655
}
656656

657657
/**
658-
* Check if the any results were found.
658+
* Check if any results were found.
659659
*
660660
* @return bool
661661
*/

‎src/Symfony/Component/HttpKernel/Tests/HttpCache/ResponseCacheStrategyTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/HttpCache/ResponseCacheStrategyTest.php
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ public function testResponseIsExpirableButNotValidateableWhenMasterResponseCombi
239239
}
240240

241241
/**
242+
* @group time-sensitive
242243
* @dataProvider cacheControlMergingProvider
243244
*/
244245
public function testCacheControlMerging(array $expects, array $master, array $surrogates)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.