8000 Merge branch '4.4' into 5.1 · symfony/symfony@3e90720 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3e90720

Browse files
derrabusderrabus
committed
Merge branch '4.4' into 5.1
* 4.4: 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 e05dc00 + 1f0a27a commit 3e90720

File tree

6 files changed

+15
-5
lines changed

6 files changed

+15
-5
lines changed

‎.github/workflows/tests.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,16 @@ jobs:
4040
- 7004:7004
4141
- 7005:7005
4242
- 7006:7006
43-
- 7007:7007
4443
env:
45-
STANDALONE: true
44+
STANDALONE: 1
45+
redis-sentinel:
46+
image: bitnami/redis-sentinel:6.0
47+
ports:
48+
- 26379:26379
49+
env:
50+
REDIS_MASTER_HOST: redis
51+
REDIS_MASTER_SET: redis_sentinel
52+
REDIS_SENTINEL_QUORUM: 1
4653
memcached:
4754
image: memcached:1.6.5
4855
ports:
@@ -153,6 +160,8 @@ jobs:
153160
env:
154161
REDIS_HOST: localhost
155162
REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
163+
REDIS_SENTINEL_HOSTS: 'localhost:26379'
164+
REDIS_SENTINEL_SERVICE: redis_sentinel
156165
MESSENGER_REDIS_DSN: redis://127.0.0.1:7006/messages
157166
MESSENGER_AMQP_DSN: amqp://localhost/%2f/messages
158167
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

File renamed without changes.

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

Lines 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

Lines 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

Lines 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

Lines 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