Skip to content

Commit 6dcfc42

Browse files
authored
Merge pull request #494 from FriendsOfSymfony/fix-dependency-constraint
the backslash gets passed to composer and leads to an error
2 parents fa9abf6 + 981e30f commit 6dcfc42

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
- VARNISH_VERSION=5.1
1111
- SYMFONY_PHPUNIT_VERSION=8
1212
- SYMFONY_DEPRECATIONS_HELPER="max[self]=0"
13-
- DEPENDENCIES="toflar/psr6-symfony-http-cache-store:^2.2.0\|^3.0.0"
13+
- DEPENDENCIES="toflar/psr6-symfony-http-cache-store:^2.2.0|^3.0.0"
1414

1515
matrix:
1616
fast_finish: true

tests/Unit/ProxyClient/HttpDispatcherTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public function testSetServersThrowsInvalidUrlException()
277277
public function testSetServersThrowsWeirdInvalidUrlException()
278278
{
279279
$this->expectException(InvalidUrlException::class);
280-
$this->expectExceptionMessage('URL "this ://is no url" is invalid.');
280+
$this->expectExceptionMessage('"this ://is no url" is invalid.');
281281

282282
new HttpDispatcher(['this ://is no url']);
283283
}

tests/Unit/SymfonyCache/UserContextListenerTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@ function (Request $request) use ($that, $hashRequest) {
138138
// we need to call some methods to get the internal fields initialized
139139
$request->getMethod();
140140
$request->getPathInfo();
141+
$hashRequest->server->remove('REQUEST_TIME_FLOAT');
142+
$hashRequest->server->remove('REQUEST_TIME');
143+
$request->server->remove('REQUEST_TIME_FLOAT');
144+
$request->server->remove('REQUEST_TIME');
141145
$that->assertEquals($hashRequest, $request);
142146
$that->assertCount(0, $request->cookies->all());
143147

0 commit comments

Comments
 (0)