8000 minor #52020 Fix deps=low (nicolas-grekas) · symfony/symfony@c947f78 · GitHub
[go: up one dir, main page]
Skip to content

Commit c947f78

Browse files
nicolas-grekasnicolas-grekas
committed
minor #52020 Fix deps=low (nicolas-grekas)
This PR was merged into the 6.3 branch. Discussion ---------- Fix deps=low | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT Trying to make the CI green. Commits ------- 03e5598 Fix deps=low
2 parents 73b272a + 03e5598 commit c947f78

File tree

4 files changed

+11
-17
lines changed

4 files changed

+11
-17
lines changed

‎src/Symfony/Bundle/SecurityBundle/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
"symfony/password-hasher": "^5.4|^6.0",
3030
"symfony/security-core": "^6.2",
3131
"symfony/security-csrf": "^5.4|^6.0",
32-
"symfony/security-http": "^6.3.4",
33-
"symfony/service-contracts": "^1.10|^2|^3"
32+
"symfony/security-http": "^6.3.6",
33+
"symfony/service-contracts": "^2.5|^3"
3434
},
3535
"require-dev": {
3636
"doctrine/annotations": "^1.10.4|^2",

‎src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,23 +79,17 @@ public function testRelayProxy()
7979
}
8080

8181
/**
82-
* @requires extension redis
83-
*
8482
* @testWith ["Redis", "redis"]
8583
* ["RedisCluster", "redis_cluster"]
8684
*/
8785
public function testRedis6Proxy($class, $stub)
8886
{
89-
if (version_compare(phpversion('redis'), '6.0.0', '<')) {
90-
$stub = file_get_contents("https://raw.githubusercontent.com/phpredis/phpredis/develop/{$stub}.stub.php");
91-
$stub = preg_replace('/^class /m', 'return; \0', $stub);
92-
$stub = preg_replace('/^return; class ([a-zA-Z]++)/m', 'interface \1StubInterface', $stub, 1);
93-
$stub = preg_replace('/^ public const .*/m', '', $stub);
94-
eval(substr($stub, 5));
95-
$r = new \ReflectionClass($class.'StubInterface');
96-
} else {
97-
$r = new \ReflectionClass($class);
98-
}
87+
$stub = file_get_contents("https://raw.githubusercontent.com/phpredis/phpredis/develop/{$stub}.stub.php");
88+
$stub = preg_replace('/^class /m', 'return; \0', $stub);
89+
$stub = preg_replace('/^return; class ([a-zA-Z]++)/m', 'interface \1StubInterface', $stub, 1);
90+
$stub = preg_replace('/^ public const .*/m', '', $stub);
91+
eval(substr($stub, 5));
92+
$r = new \ReflectionClass($class.'StubInterface');
9993

10094
$proxy = file_get_contents(\dirname(__DIR__, 2)."/Traits/{$class}6Proxy.php");
10195
$proxy = substr($proxy, 0, 4 + strpos($proxy, '[];'));

‎src/Symfony/Component/HttpFoundation/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
"require-dev": {
2525
"doctrine/dbal": "^2.13.1|^3.0",
2626
"predis/predis": "^1.1|^2.0",
27-
"symfony/cache": "^5.4|^6.0",
27+
"symfony/cache": "^6.3",
2828
"symfony/dependency-injection": "^5.4|^6.0",
2929
"symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4",
3030
"symfony/mime": "^5.4|^6.0",
3131
"symfony/expression-language": "^5.4|^6.0",
3232
"symfony/rate-limiter": "^5.2|^6.0"
3333
},
3434
"conflict": {
35-
"symfony/cache": "<6.2"
35+
"symfony/cache": "<6.3"
3636
9673 },
3737
"autoload": {
3838
"psr-4": { "Symfony\\Component\\HttpFoundation\\": "" },

‎src/Symfony/Component/Security/Http/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"symfony/polyfill-mbstring": "~1.0",
2424
"symfony/property-access": "^5.4|^6.0",
2525
"symfony/security-core": "^6.3",
26-
"symfony/service-contracts": "^1.10|^2|^3"
26+
"symfony/service-contracts": "^2.5|^3"
2727
},
2828
"require-dev": {
2929
"symfony/cache": "^5.4|^6.0",

0 commit comments

Comments
 (0)
0