Remove some more PHP < 7.1.3 code
This commit is contained in:
parent
8e0d41a87b
commit
ff77cde0fd
@ -300,20 +300,7 @@ class Request
|
|||||||
*/
|
*/
|
||||||
public static function createFromGlobals()
|
public static function createFromGlobals()
|
||||||
{
|
{
|
||||||
// With the php's bug #66606, the php's built-in web server
|
$request = self::createRequestFromFactory($_GET, $_POST, array(), $_COOKIE, $_FILES, $_SERVER);
|
||||||
// stores the Content-Type and Content-Length header values in
|
|
||||||
// HTTP_CONTENT_TYPE and HTTP_CONTENT_LENGTH fields.
|
|
||||||
$server = $_SERVER;
|
|
||||||
if ('cli-server' === PHP_SAPI) {
|
|
||||||
if (array_key_exists('HTTP_CONTENT_LENGTH', $_SERVER)) {
|
|
||||||
$server['CONTENT_LENGTH'] = $_SERVER['HTTP_CONTENT_LENGTH'];
|
|
||||||
}
|
|
||||||
if (array_key_exists('HTTP_CONTENT_TYPE', $_SERVER)) {
|
|
||||||
$server['CONTENT_TYPE'] = $_SERVER['HTTP_CONTENT_TYPE'];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$request = self::createRequestFromFactory($_GET, $_POST, array(), $_COOKIE, $_FILES, $server);
|
|
||||||
|
|
||||||
if (0 === strpos($request->headers->get('CONTENT_TYPE'), 'application/x-www-form-urlencoded')
|
if (0 === strpos($request->headers->get('CONTENT_TYPE'), 'application/x-www-form-urlencoded')
|
||||||
&& in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET')), array('PUT', 'DELETE', 'PATCH'))
|
&& in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET')), array('PUT', 'DELETE', 'PATCH'))
|
||||||
|
@ -551,11 +551,7 @@ class InlineTest extends TestCase
|
|||||||
$expected = new \DateTime($yaml);
|
$expected = new \DateTime($yaml);
|
||||||
$expected->setTimeZone(new \DateTimeZone('UTC'));
|
$expected->setTimeZone(new \DateTimeZone('UTC'));
|
||||||
$expected->setDate($year, $month, $day);
|
$expected->setDate($year, $month, $day);
|
||||||
if (PHP_VERSION_ID >= 70100) {
|
$expected->setTime($hour, $minute, $second, 1000000 * ($second - (int) $second));
|
||||||
$expected->setTime($hour, $minute, $second, 1000000 * ($second - (int) $second));
|
|
||||||
} else {
|
|
||||||
$expected->setTime($hour, $minute, $second);
|
|
||||||
}
|
|
||||||
|
|
||||||
$expectedNested = array('nested' => array($expected));
|
$expectedNested = array('nested' => array($expected));
|
||||||
$yamlNested = "{nested: [$yaml]}";
|
$yamlNested = "{nested: [$yaml]}";
|
||||||
|
Reference in New Issue
Block a user