mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-25 19:48:49 +02:00
Updating Symfony lib and dependencies:
Package operations: 2 installs, 23 updates, 0 removals - Updating psr/log (1.1.0 => 1.1.2) - Updating symfony/debug (v3.4.30 => v3.4.35) - Updating symfony/console (v3.4.30 => v3.4.35) - Updating symfony/dotenv (v3.4.30 => v3.4.35) - Updating symfony/routing (v3.4.30 => v3.4.35) - Updating symfony/finder (v3.4.30 => v3.4.35) - Updating symfony/filesystem (v3.4.30 => v3.4.35) - Installing symfony/polyfill-util (v1.12.0) - Installing symfony/polyfill-php56 (v1.12.0) - Updating symfony/http-foundation (v3.4.30 => v3.4.35) - Updating symfony/event-dispatcher (v3.4.30 => v3.4.35) - Updating symfony/http-kernel (v3.4.30 => v3.4.35) - Updating symfony/config (v3.4.30 => v3.4.35) - Updating symfony/dependency-injection (v3.4.30 => v3.4.35) - Updating symfony/class-loader (v3.4.30 => v3.4.35) - Updating symfony/cache (v3.4.30 => v3.4.35) - Updating symfony/framework-bundle (v3.4.30 => v3.4.35) - Updating twig/twig (v1.42.2 => v1.42.4) - Updating symfony/twig-bridge (v3.4.30 => v3.4.35) - Updating symfony/twig-bundle (v3.4.30 => v3.4.35) - Updating symfony/yaml (v3.4.30 => v3.4.35) - Updating symfony/stopwatch (v3.4.30 => v3.4.35) - Updating symfony/var-dumper (v3.4.30 => v3.4.35) - Updating symfony/web-profiler-bundle (v3.4.30 => v3.4.35) - Updating symfony/css-selector (v3.4.30 => v3.4.35)
This commit is contained in:
@@ -886,11 +886,9 @@ class RequestTest extends TestCase
|
||||
$this->assertEquals(80, $port, 'With only PROTO set and value is not recognized, getPort() defaults to 80.');
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException \RuntimeException
|
||||
*/
|
||||
public function testGetHostWithFakeHttpHostValue()
|
||||
{
|
||||
$this->expectException('RuntimeException');
|
||||
$request = new Request();
|
||||
$request->initialize([], [], [], [], [], ['HTTP_HOST' => 'www.host.com?query=string']);
|
||||
$request->getHost();
|
||||
@@ -1055,11 +1053,11 @@ class RequestTest extends TestCase
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException \Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException
|
||||
* @dataProvider getClientIpsWithConflictingHeadersProvider
|
||||
*/
|
||||
public function testGetClientIpsWithConflictingHeaders($httpForwarded, $httpXForwardedFor)
|
||||
{
|
||||
$this->expectException('Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException');
|
||||
$request = new Request();
|
||||
|
||||
$server = [
|
||||
@@ -1153,7 +1151,7 @@ class RequestTest extends TestCase
|
||||
{
|
||||
$req = new Request();
|
||||
$retval = $req->getContent(true);
|
||||
$this->assertInternalType('resource', $retval);
|
||||
$this->assertIsResource($retval);
|
||||
$this->assertEquals('', fread($retval, 1));
|
||||
$this->assertTrue(feof($retval));
|
||||
}
|
||||
@@ -1163,7 +1161,7 @@ class RequestTest extends TestCase
|
||||
$req = new Request([], [], [], [], [], [], 'MyContent');
|
||||
$resource = $req->getContent(true);
|
||||
|
||||
$this->assertInternalType('resource', $resource);
|
||||
$this->assertIsResource($resource);
|
||||
$this->assertEquals('MyContent', stream_get_contents($resource));
|
||||
}
|
||||
|
||||
@@ -1179,11 +1177,11 @@ class RequestTest extends TestCase
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException \LogicException
|
||||
* @dataProvider getContentCantBeCalledTwiceWithResourcesProvider
|
||||
*/
|
||||
public function testGetContentCantBeCalledTwiceWithResources($first, $second)
|
||||
{
|
||||
$this->expectException('LogicException');
|
||||
if (\PHP_VERSION_ID >= 50600) {
|
||||
$this->markTestSkipped('PHP >= 5.6 allows to open php://input several times.');
|
||||
}
|
||||
@@ -1551,7 +1549,6 @@ class RequestTest extends TestCase
|
||||
$request = new Request();
|
||||
$request->headers->set('Accept-language', 'zh, en-us; q=0.8, en; q=0.6');
|
||||
$this->assertEquals(['zh', 'en_US', 'en'], $request->getLanguages());
|
||||
$this->assertEquals(['zh', 'en_US', 'en'], $request->getLanguages());
|
||||
|
||||
$request = new Request();
|
||||
$request->headers->set('Accept-language', 'zh, en-us; q=0.6, en; q=0.8');
|
||||
@@ -1633,14 +1630,14 @@ class RequestTest extends TestCase
|
||||
|
||||
$asString = (string) $request;
|
||||
|
||||
$this->assertContains('Accept-Language: zh, en-us; q=0.8, en; q=0.6', $asString);
|
||||
$this->assertContains('Cookie: Foo=Bar', $asString);
|
||||
$this->assertStringContainsString('Accept-Language: zh, en-us; q=0.8, en; q=0.6', $asString);
|
||||
$this->assertStringContainsString('Cookie: Foo=Bar', $asString);
|
||||
|
||||
$request->cookies->set('Another', 'Cookie');
|
||||
|
||||
$asString = (string) $request;
|
||||
|
||||
$this->assertContains('Cookie: Foo=Bar; Another=Cookie', $asString);
|
||||
$this->assertStringContainsString('Cookie: Foo=Bar; Another=Cookie', $asString);
|
||||
}
|
||||
|
||||
public function testIsMethod()
|
||||
@@ -1968,20 +1965,20 @@ class RequestTest extends TestCase
|
||||
|
||||
/**
|
||||
* @group legacy
|
||||
* @expectedException \InvalidArgumentException
|
||||
*/
|
||||
public function testSetTrustedProxiesInvalidHeaderName()
|
||||
{
|
||||
$this->expectException('InvalidArgumentException');
|
||||
Request::create('http://example.com/');
|
||||
Request::setTrustedHeaderName('bogus name', 'X_MY_FOR');
|
||||
}
|
||||
|
||||
/**
|
||||
* @group legacy
|
||||
* @expectedException \InvalidArgumentException
|
||||
*/
|
||||
public function testGetTrustedProxiesInvalidHeaderName()
|
||||
{
|
||||
$this->expectException('InvalidArgumentException');
|
||||
Request::create('http://example.com/');
|
||||
Request::getTrustedHeaderName('bogus name');
|
||||
}
|
||||
@@ -2118,12 +2115,8 @@ class RequestTest extends TestCase
|
||||
$this->assertSame($expectedPort, $request->getPort());
|
||||
}
|
||||
} else {
|
||||
if (method_exists($this, 'expectException')) {
|
||||
$this->expectException(SuspiciousOperationException::class);
|
||||
$this->expectExceptionMessage('Invalid Host');
|
||||
} else {
|
||||
$this->setExpectedException(SuspiciousOperationException::class, 'Invalid Host');
|
||||
}
|
||||
$this->expectException(SuspiciousOperationException::class);
|
||||
$this->expectExceptionMessage('Invalid Host');
|
||||
|
||||
$request->getHost();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user