Merge branch '3.4' into 4.2
* 3.4: [HttpFoundation] fix tests bumped Symfony version to 3.4.27 updated VERSION for 3.4.26 updated CHANGELOG for 3.4.26
This commit is contained in:
commit
3b05c07029
2
phpunit
2
phpunit
@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env php
|
#!/usr/bin/env php
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
// Cache-Id: https://github.com/symfony/symfony/commit/aad0c58
|
// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/32c5fa570117630dad45c21528b93d26bad02bc1
|
||||||
|
|
||||||
if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
|
if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
|
||||||
echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\nPlease run `composer update` before running this command.\n";
|
echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\nPlease run `composer update` before running this command.\n";
|
||||||
|
@ -1004,14 +1004,15 @@ class ResponseTest extends ResponseTestCase
|
|||||||
|
|
||||||
$ianaHttpStatusCodes = new \DOMDocument();
|
$ianaHttpStatusCodes = new \DOMDocument();
|
||||||
|
|
||||||
libxml_set_streams_context(stream_context_create([
|
$context = stream_context_create([
|
||||||
'http' => [
|
'http' => [
|
||||||
'method' => 'GET',
|
'method' => 'GET',
|
||||||
'timeout' => 30,
|
'timeout' => 30,
|
||||||
|
'user_agent' => __METHOD__,
|
||||||
],
|
],
|
||||||
]));
|
]);
|
||||||
|
|
||||||
$ianaHttpStatusCodes->load('https://www.iana.org/assignments/http-status-codes/http-status-codes.xml');
|
$ianaHttpStatusCodes->loadXML(file_get_contents('https://www.iana.org/assignments/http-status-codes/http-status-codes.xml', false, $context));
|
||||||
if (!$ianaHttpStatusCodes->relaxNGValidate(__DIR__.'/schema/http-status-codes.rng')) {
|
if (!$ianaHttpStatusCodes->relaxNGValidate(__DIR__.'/schema/http-status-codes.rng')) {
|
||||||
self::fail('Invalid IANA\'s HTTP status code list.');
|
self::fail('Invalid IANA\'s HTTP status code list.');
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user