updated packages
This commit is contained in:
@@ -24,7 +24,7 @@ class AcceptHeader
|
||||
/**
|
||||
* @var AcceptHeaderItem[]
|
||||
*/
|
||||
private $items = array();
|
||||
private $items = [];
|
||||
|
||||
/**
|
||||
* @var bool
|
||||
|
||||
@@ -21,9 +21,9 @@ class AcceptHeaderItem
|
||||
private $value;
|
||||
private $quality = 1.0;
|
||||
private $index = 0;
|
||||
private $attributes = array();
|
||||
private $attributes = [];
|
||||
|
||||
public function __construct(string $value, array $attributes = array())
|
||||
public function __construct(string $value, array $attributes = [])
|
||||
{
|
||||
$this->value = $value;
|
||||
foreach ($attributes as $name => $value) {
|
||||
|
||||
@@ -44,7 +44,7 @@ class BinaryFileResponse extends Response
|
||||
* @param bool $autoEtag Whether the ETag header should be automatically set
|
||||
* @param bool $autoLastModified Whether the Last-Modified header should be automatically set
|
||||
*/
|
||||
public function __construct($file, int $status = 200, array $headers = array(), bool $public = true, string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true)
|
||||
public function __construct($file, int $status = 200, array $headers = [], bool $public = true, string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true)
|
||||
{
|
||||
parent::__construct(null, $status, $headers);
|
||||
|
||||
@@ -66,7 +66,7 @@ class BinaryFileResponse extends Response
|
||||
*
|
||||
* @return static
|
||||
*/
|
||||
public static function create($file = null, $status = 200, $headers = array(), $public = true, $contentDisposition = null, $autoEtag = false, $autoLastModified = true)
|
||||
public static function create($file = null, $status = 200, $headers = [], $public = true, $contentDisposition = null, $autoEtag = false, $autoLastModified = true)
|
||||
{
|
||||
return new static($file, $status, $headers, $public, $contentDisposition, $autoEtag, $autoLastModified);
|
||||
}
|
||||
@@ -234,7 +234,7 @@ class BinaryFileResponse extends Response
|
||||
if (!$request->headers->has('If-Range') || $this->hasValidIfRangeHeader($request->headers->get('If-Range'))) {
|
||||
$range = $request->headers->get('Range');
|
||||
|
||||
list($start, $end) = explode('-', substr($range, 6), 2) + array(0);
|
||||
list($start, $end) = explode('-', substr($range, 6), 2) + [0];
|
||||
|
||||
$end = ('' === $end) ? $fileSize - 1 : (int) $end;
|
||||
|
||||
@@ -300,7 +300,7 @@ class BinaryFileResponse extends Response
|
||||
fclose($out);
|
||||
fclose($file);
|
||||
|
||||
if ($this->deleteFileAfterSend) {
|
||||
if ($this->deleteFileAfterSend && file_exists($this->file->getPathname())) {
|
||||
unlink($this->file->getPathname());
|
||||
}
|
||||
|
||||
|
||||
4
vendor/symfony/http-foundation/CHANGELOG.md
vendored
4
vendor/symfony/http-foundation/CHANGELOG.md
vendored
@@ -190,10 +190,10 @@ CHANGELOG
|
||||
* Added `FlashBag`. Flashes expire when retrieved by `get()` or `all()`. This
|
||||
implementation is ESI compatible.
|
||||
* Added `AutoExpireFlashBag` (default) to replicate Symfony 2.0.x auto expire
|
||||
behaviour of messages auto expiring after one page page load. Messages must
|
||||
behavior of messages auto expiring after one page page load. Messages must
|
||||
be retrieved by `get()` or `all()`.
|
||||
* Added `Symfony\Component\HttpFoundation\Attribute\AttributeBag` to replicate
|
||||
attributes storage behaviour from 2.0.x (default).
|
||||
attributes storage behavior from 2.0.x (default).
|
||||
* Added `Symfony\Component\HttpFoundation\Attribute\NamespacedAttributeBag` for
|
||||
namespace session attributes.
|
||||
* Flash API can stores messages in an array so there may be multiple messages
|
||||
|
||||
6
vendor/symfony/http-foundation/Cookie.php
vendored
6
vendor/symfony/http-foundation/Cookie.php
vendored
@@ -42,7 +42,7 @@ class Cookie
|
||||
*/
|
||||
public static function fromString($cookie, $decode = false)
|
||||
{
|
||||
$data = array(
|
||||
$data = [
|
||||
'expires' => 0,
|
||||
'path' => '/',
|
||||
'domain' => null,
|
||||
@@ -50,7 +50,7 @@ class Cookie
|
||||
'httponly' => false,
|
||||
'raw' => !$decode,
|
||||
'samesite' => null,
|
||||
);
|
||||
];
|
||||
|
||||
$parts = HeaderUtils::split($cookie, ';=');
|
||||
$part = array_shift($parts);
|
||||
@@ -126,7 +126,7 @@ class Cookie
|
||||
$sameSite = strtolower($sameSite);
|
||||
}
|
||||
|
||||
if (!\in_array($sameSite, array(self::SAMESITE_LAX, self::SAMESITE_STRICT, null), true)) {
|
||||
if (!\in_array($sameSite, [self::SAMESITE_LAX, self::SAMESITE_STRICT, null], true)) {
|
||||
throw new \InvalidArgumentException('The "sameSite" parameter value is not valid.');
|
||||
}
|
||||
|
||||
|
||||
@@ -35,13 +35,13 @@ class ExpressionRequestMatcher extends RequestMatcher
|
||||
throw new \LogicException('Unable to match the request as the expression language is not available.');
|
||||
}
|
||||
|
||||
return $this->language->evaluate($this->expression, array(
|
||||
return $this->language->evaluate($this->expression, [
|
||||
'request' => $request,
|
||||
'method' => $request->getMethod(),
|
||||
'path' => rawurldecode($request->getPathInfo()),
|
||||
'host' => $request->getHost(),
|
||||
'ip' => $request->getClientIp(),
|
||||
'attributes' => $request->attributes->all(),
|
||||
)) && parent::matches($request);
|
||||
]) && parent::matches($request);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ class ExtensionGuesser implements ExtensionGuesserInterface
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $guessers = array();
|
||||
protected $guessers = [];
|
||||
|
||||
/**
|
||||
* Returns the singleton instance.
|
||||
|
||||
@@ -20,11 +20,11 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
|
||||
* A map of mime types and their default extensions.
|
||||
*
|
||||
* This list has been placed under the public domain by the Apache HTTPD project.
|
||||
* This list has been updated from upstream on 2013-04-23.
|
||||
* This list has been updated from upstream on 2019-01-14.
|
||||
*
|
||||
* @see http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
|
||||
* @see https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
|
||||
*/
|
||||
protected $defaultExtensions = array(
|
||||
protected $defaultExtensions = [
|
||||
'application/andrew-inset' => 'ez',
|
||||
'application/applixware' => 'aw',
|
||||
'application/atom+xml' => 'atom',
|
||||
@@ -618,7 +618,7 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
|
||||
'audio/adpcm' => 'adp',
|
||||
'audio/basic' => 'au',
|
||||
'audio/midi' => 'mid',
|
||||
'audio/mp4' => 'mp4a',
|
||||
'audio/mp4' => 'm4a',
|
||||
'audio/mpeg' => 'mpga',
|
||||
'audio/ogg' => 'oga',
|
||||
'audio/s3m' => 's3m',
|
||||
@@ -653,6 +653,11 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
|
||||
'chemical/x-cml' => 'cml',
|
||||
'chemical/x-csml' => 'csml',
|
||||
'chemical/x-xyz' => 'xyz',
|
||||
'font/collection' => 'ttc',
|
||||
'font/otf' => 'otf',
|
||||
'font/ttf' => 'ttf',
|
||||
'font/woff' => 'woff',
|
||||
'font/woff2' => 'woff2',
|
||||
'image/bmp' => 'bmp',
|
||||
'image/x-ms-bmp' => 'bmp',
|
||||
'image/cgm' => 'cgm',
|
||||
@@ -669,8 +674,8 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
|
||||
'image/tiff' => 'tiff',
|
||||
'image/vnd.adobe.photoshop' => 'psd',
|
||||
'image/vnd.dece.graphic' => 'uvi',
|
||||
'image/vnd.dvb.subtitle' => 'sub',
|
||||
'image/vnd.djvu' => 'djvu',
|
||||
'image/vnd.dvb.subtitle' => 'sub',
|
||||
'image/vnd.dwg' => 'dwg',
|
||||
'image/vnd.dxf' => 'dxf',
|
||||
'image/vnd.fastbidsheet' => 'fbs',
|
||||
@@ -732,8 +737,8 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
|
||||
'text/vcard' => 'vcard',
|
||||
'text/vnd.curl' => 'curl',
|
||||
'text/vnd.curl.dcurl' => 'dcurl',
|
||||
'text/vnd.curl.scurl' => 'scurl',
|
||||
'text/vnd.curl.mcurl' => 'mcurl',
|
||||
'text/vnd.curl.scurl' => 'scurl',
|
||||
'text/vnd.dvb.subtitle' => 'sub',
|
||||
'text/vnd.fly' => 'fly',
|
||||
'text/vnd.fmi.flexstor' => 'flx',
|
||||
@@ -747,10 +752,10 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
|
||||
'text/x-asm' => 's',
|
||||
'text/x-c' => 'c',
|
||||
'text/x-fortran' => 'f',
|
||||
'text/x-pascal' => 'p',
|
||||
'text/x-java-source' => 'java',
|
||||
'text/x-opml' => 'opml',
|
||||
'text/x-nfo' => 'nfo',
|
||||
'text/x-opml' => 'opml',
|
||||
'text/x-pascal' => 'p',
|
||||
'text/x-setext' => 'etx',
|
||||
'text/x-sfv' => 'sfv',
|
||||
'text/x-uuencode' => 'uu',
|
||||
@@ -796,13 +801,19 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
|
||||
'video/x-sgi-movie' => 'movie',
|
||||
'video/x-smv' => 'smv',
|
||||
'x-conference/x-cooltalk' => 'ice',
|
||||
);
|
||||
];
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function guess($mimeType)
|
||||
{
|
||||
return isset($this->defaultExtensions[$mimeType]) ? $this->defaultExtensions[$mimeType] : null;
|
||||
if (isset($this->defaultExtensions[$mimeType])) {
|
||||
return $this->defaultExtensions[$mimeType];
|
||||
}
|
||||
|
||||
$lcMimeType = strtolower($mimeType);
|
||||
|
||||
return isset($this->defaultExtensions[$lcMimeType]) ? $this->defaultExtensions[$lcMimeType] : null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $guessers = array();
|
||||
protected $guessers = [];
|
||||
|
||||
/**
|
||||
* Returns the singleton instance.
|
||||
|
||||
@@ -281,7 +281,7 @@ class UploadedFile extends File
|
||||
*/
|
||||
public function getErrorMessage()
|
||||
{
|
||||
static $errors = array(
|
||||
static $errors = [
|
||||
UPLOAD_ERR_INI_SIZE => 'The file "%s" exceeds your upload_max_filesize ini directive (limit is %d KiB).',
|
||||
UPLOAD_ERR_FORM_SIZE => 'The file "%s" exceeds the upload limit defined in your form.',
|
||||
UPLOAD_ERR_PARTIAL => 'The file "%s" was only partially uploaded.',
|
||||
@@ -289,7 +289,7 @@ class UploadedFile extends File
|
||||
UPLOAD_ERR_CANT_WRITE => 'The file "%s" could not be written on disk.',
|
||||
UPLOAD_ERR_NO_TMP_DIR => 'File could not be uploaded: missing temporary directory.',
|
||||
UPLOAD_ERR_EXTENSION => 'File upload was stopped by a PHP extension.',
|
||||
);
|
||||
];
|
||||
|
||||
$errorCode = $this->error;
|
||||
$maxFilesize = UPLOAD_ERR_INI_SIZE === $errorCode ? self::getMaxFilesize() / 1024 : 0;
|
||||
|
||||
16
vendor/symfony/http-foundation/FileBag.php
vendored
16
vendor/symfony/http-foundation/FileBag.php
vendored
@@ -21,12 +21,12 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
|
||||
*/
|
||||
class FileBag extends ParameterBag
|
||||
{
|
||||
private static $fileKeys = array('error', 'name', 'size', 'tmp_name', 'type');
|
||||
private static $fileKeys = ['error', 'name', 'size', 'tmp_name', 'type'];
|
||||
|
||||
/**
|
||||
* @param array $parameters An array of HTTP files
|
||||
*/
|
||||
public function __construct(array $parameters = array())
|
||||
public function __construct(array $parameters = [])
|
||||
{
|
||||
$this->replace($parameters);
|
||||
}
|
||||
@@ -34,9 +34,9 @@ class FileBag extends ParameterBag
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function replace(array $files = array())
|
||||
public function replace(array $files = [])
|
||||
{
|
||||
$this->parameters = array();
|
||||
$this->parameters = [];
|
||||
$this->add($files);
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ class FileBag extends ParameterBag
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function add(array $files = array())
|
||||
public function add(array $files = [])
|
||||
{
|
||||
foreach ($files as $key => $file) {
|
||||
$this->set($key, $file);
|
||||
@@ -87,7 +87,7 @@ class FileBag extends ParameterBag
|
||||
$file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['error']);
|
||||
}
|
||||
} else {
|
||||
$file = array_map(array($this, 'convertFileInformation'), $file);
|
||||
$file = array_map([$this, 'convertFileInformation'], $file);
|
||||
if (array_keys($keys) === $keys) {
|
||||
$file = array_filter($file);
|
||||
}
|
||||
@@ -130,13 +130,13 @@ class FileBag extends ParameterBag
|
||||
}
|
||||
|
||||
foreach ($data['name'] as $key => $name) {
|
||||
$files[$key] = $this->fixPhpFilesArray(array(
|
||||
$files[$key] = $this->fixPhpFilesArray([
|
||||
'error' => $data['error'][$key],
|
||||
'name' => $name,
|
||||
'type' => $data['type'][$key],
|
||||
'tmp_name' => $data['tmp_name'][$key],
|
||||
'size' => $data['size'][$key],
|
||||
));
|
||||
]);
|
||||
}
|
||||
|
||||
return $files;
|
||||
|
||||
26
vendor/symfony/http-foundation/HeaderBag.php
vendored
26
vendor/symfony/http-foundation/HeaderBag.php
vendored
@@ -18,13 +18,13 @@ namespace Symfony\Component\HttpFoundation;
|
||||
*/
|
||||
class HeaderBag implements \IteratorAggregate, \Countable
|
||||
{
|
||||
protected $headers = array();
|
||||
protected $cacheControl = array();
|
||||
protected $headers = [];
|
||||
protected $cacheControl = [];
|
||||
|
||||
/**
|
||||
* @param array $headers An array of HTTP headers
|
||||
*/
|
||||
public function __construct(array $headers = array())
|
||||
public function __construct(array $headers = [])
|
||||
{
|
||||
foreach ($headers as $key => $values) {
|
||||
$this->set($key, $values);
|
||||
@@ -80,9 +80,9 @@ class HeaderBag implements \IteratorAggregate, \Countable
|
||||
*
|
||||
* @param array $headers An array of HTTP headers
|
||||
*/
|
||||
public function replace(array $headers = array())
|
||||
public function replace(array $headers = [])
|
||||
{
|
||||
$this->headers = array();
|
||||
$this->headers = [];
|
||||
$this->add($headers);
|
||||
}
|
||||
|
||||
@@ -112,12 +112,12 @@ class HeaderBag implements \IteratorAggregate, \Countable
|
||||
$key = str_replace('_', '-', strtolower($key));
|
||||
$headers = $this->all();
|
||||
|
||||
if (!array_key_exists($key, $headers)) {
|
||||
if (!\array_key_exists($key, $headers)) {
|
||||
if (null === $default) {
|
||||
return $first ? null : array();
|
||||
return $first ? null : [];
|
||||
}
|
||||
|
||||
return $first ? $default : array($default);
|
||||
return $first ? $default : [$default];
|
||||
}
|
||||
|
||||
if ($first) {
|
||||
@@ -148,7 +148,7 @@ class HeaderBag implements \IteratorAggregate, \Countable
|
||||
}
|
||||
} else {
|
||||
if (true === $replace || !isset($this->headers[$key])) {
|
||||
$this->headers[$key] = array($values);
|
||||
$this->headers[$key] = [$values];
|
||||
} else {
|
||||
$this->headers[$key][] = $values;
|
||||
}
|
||||
@@ -168,7 +168,7 @@ class HeaderBag implements \IteratorAggregate, \Countable
|
||||
*/
|
||||
public function has($key)
|
||||
{
|
||||
return array_key_exists(str_replace('_', '-', strtolower($key)), $this->all());
|
||||
return \array_key_exists(str_replace('_', '-', strtolower($key)), $this->all());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -196,7 +196,7 @@ class HeaderBag implements \IteratorAggregate, \Countable
|
||||
unset($this->headers[$key]);
|
||||
|
||||
if ('cache-control' === $key) {
|
||||
$this->cacheControl = array();
|
||||
$this->cacheControl = [];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -245,7 +245,7 @@ class HeaderBag implements \IteratorAggregate, \Countable
|
||||
*/
|
||||
public function hasCacheControlDirective($key)
|
||||
{
|
||||
return array_key_exists($key, $this->cacheControl);
|
||||
return \array_key_exists($key, $this->cacheControl);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -257,7 +257,7 @@ class HeaderBag implements \IteratorAggregate, \Countable
|
||||
*/
|
||||
public function getCacheControlDirective($key)
|
||||
{
|
||||
return array_key_exists($key, $this->cacheControl) ? $this->cacheControl[$key] : null;
|
||||
return \array_key_exists($key, $this->cacheControl) ? $this->cacheControl[$key] : null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
20
vendor/symfony/http-foundation/HeaderUtils.php
vendored
20
vendor/symfony/http-foundation/HeaderUtils.php
vendored
@@ -34,7 +34,7 @@ class HeaderUtils
|
||||
* Example:
|
||||
*
|
||||
* HeaderUtils::split("da, en-gb;q=0.8", ",;")
|
||||
* // => array(array('da'), array('en-gb', 'q=0.8'))
|
||||
* // => ['da'], ['en-gb', 'q=0.8']]
|
||||
*
|
||||
* @param string $header HTTP header value
|
||||
* @param string $separators List of characters to split on, ordered by
|
||||
@@ -78,12 +78,12 @@ class HeaderUtils
|
||||
*
|
||||
* Example:
|
||||
*
|
||||
* HeaderUtils::combine(array(array("foo", "abc"), array("bar")))
|
||||
* // => array("foo" => "abc", "bar" => true)
|
||||
* HeaderUtils::combine([["foo", "abc"], ["bar"]])
|
||||
* // => ["foo" => "abc", "bar" => true]
|
||||
*/
|
||||
public static function combine(array $parts): array
|
||||
{
|
||||
$assoc = array();
|
||||
$assoc = [];
|
||||
foreach ($parts as $part) {
|
||||
$name = strtolower($part[0]);
|
||||
$value = $part[1] ?? true;
|
||||
@@ -102,12 +102,12 @@ class HeaderUtils
|
||||
*
|
||||
* Example:
|
||||
*
|
||||
* HeaderUtils::toString(array("foo" => "abc", "bar" => true, "baz" => "a b c"), ",")
|
||||
* HeaderUtils::toString(["foo" => "abc", "bar" => true, "baz" => "a b c"], ",")
|
||||
* // => 'foo=abc, bar, baz="a b c"'
|
||||
*/
|
||||
public static function toString(array $assoc, string $separator): string
|
||||
{
|
||||
$parts = array();
|
||||
$parts = [];
|
||||
foreach ($assoc as $name => $value) {
|
||||
if (true === $value) {
|
||||
$parts[] = $name;
|
||||
@@ -163,7 +163,7 @@ class HeaderUtils
|
||||
*/
|
||||
public static function makeDisposition(string $disposition, string $filename, string $filenameFallback = ''): string
|
||||
{
|
||||
if (!\in_array($disposition, array(self::DISPOSITION_ATTACHMENT, self::DISPOSITION_INLINE))) {
|
||||
if (!\in_array($disposition, [self::DISPOSITION_ATTACHMENT, self::DISPOSITION_INLINE])) {
|
||||
throw new \InvalidArgumentException(sprintf('The disposition must be either "%s" or "%s".', self::DISPOSITION_ATTACHMENT, self::DISPOSITION_INLINE));
|
||||
}
|
||||
|
||||
@@ -186,7 +186,7 @@ class HeaderUtils
|
||||
throw new \InvalidArgumentException('The filename and the fallback cannot contain the "/" and "\\" characters.');
|
||||
}
|
||||
|
||||
$params = array('filename' => $filenameFallback);
|
||||
$params = ['filename' => $filenameFallback];
|
||||
if ($filename !== $filenameFallback) {
|
||||
$params['filename*'] = "utf-8''".rawurlencode($filename);
|
||||
}
|
||||
@@ -200,7 +200,7 @@ class HeaderUtils
|
||||
$partSeparators = substr($separators, 1);
|
||||
|
||||
$i = 0;
|
||||
$partMatches = array();
|
||||
$partMatches = [];
|
||||
foreach ($matches as $match) {
|
||||
if (isset($match['separator']) && $match['separator'] === $separator) {
|
||||
++$i;
|
||||
@@ -209,7 +209,7 @@ class HeaderUtils
|
||||
}
|
||||
}
|
||||
|
||||
$parts = array();
|
||||
$parts = [];
|
||||
if ($partSeparators) {
|
||||
foreach ($partMatches as $matches) {
|
||||
$parts[] = self::groupParts($matches, $partSeparators);
|
||||
|
||||
4
vendor/symfony/http-foundation/IpUtils.php
vendored
4
vendor/symfony/http-foundation/IpUtils.php
vendored
@@ -18,7 +18,7 @@ namespace Symfony\Component\HttpFoundation;
|
||||
*/
|
||||
class IpUtils
|
||||
{
|
||||
private static $checkedIps = array();
|
||||
private static $checkedIps = [];
|
||||
|
||||
/**
|
||||
* This class should not be instantiated.
|
||||
@@ -38,7 +38,7 @@ class IpUtils
|
||||
public static function checkIp($requestIp, $ips)
|
||||
{
|
||||
if (!\is_array($ips)) {
|
||||
$ips = array($ips);
|
||||
$ips = [$ips];
|
||||
}
|
||||
|
||||
$method = substr_count($requestIp, ':') > 1 ? 'checkIp6' : 'checkIp4';
|
||||
|
||||
12
vendor/symfony/http-foundation/JsonResponse.php
vendored
12
vendor/symfony/http-foundation/JsonResponse.php
vendored
@@ -39,7 +39,7 @@ class JsonResponse extends Response
|
||||
* @param array $headers An array of response headers
|
||||
* @param bool $json If the data is already a JSON string
|
||||
*/
|
||||
public function __construct($data = null, int $status = 200, array $headers = array(), bool $json = false)
|
||||
public function __construct($data = null, int $status = 200, array $headers = [], bool $json = false)
|
||||
{
|
||||
parent::__construct('', $status, $headers);
|
||||
|
||||
@@ -64,7 +64,7 @@ class JsonResponse extends Response
|
||||
*
|
||||
* @return static
|
||||
*/
|
||||
public static function create($data = null, $status = 200, $headers = array())
|
||||
public static function create($data = null, $status = 200, $headers = [])
|
||||
{
|
||||
return new static($data, $status, $headers);
|
||||
}
|
||||
@@ -72,7 +72,7 @@ class JsonResponse extends Response
|
||||
/**
|
||||
* Make easier the creation of JsonResponse from raw json.
|
||||
*/
|
||||
public static function fromJsonString($data = null, $status = 200, $headers = array())
|
||||
public static function fromJsonString($data = null, $status = 200, $headers = [])
|
||||
{
|
||||
return new static($data, $status, $headers, true);
|
||||
}
|
||||
@@ -94,11 +94,11 @@ class JsonResponse extends Response
|
||||
// JsonpCallbackValidator is released under the MIT License. See https://github.com/willdurand/JsonpCallbackValidator/blob/v1.1.0/LICENSE for details.
|
||||
// (c) William Durand <william.durand1@gmail.com>
|
||||
$pattern = '/^[$_\p{L}][$_\p{L}\p{Mn}\p{Mc}\p{Nd}\p{Pc}\x{200C}\x{200D}]*(?:\[(?:"(?:\\\.|[^"\\\])*"|\'(?:\\\.|[^\'\\\])*\'|\d+)\])*?$/u';
|
||||
$reserved = array(
|
||||
$reserved = [
|
||||
'break', 'do', 'instanceof', 'typeof', 'case', 'else', 'new', 'var', 'catch', 'finally', 'return', 'void', 'continue', 'for', 'switch', 'while',
|
||||
'debugger', 'function', 'this', 'with', 'default', 'if', 'throw', 'delete', 'in', 'try', 'class', 'enum', 'extends', 'super', 'const', 'export',
|
||||
'import', 'implements', 'let', 'private', 'public', 'yield', 'interface', 'package', 'protected', 'static', 'null', 'true', 'false',
|
||||
);
|
||||
];
|
||||
$parts = explode('.', $callback);
|
||||
foreach ($parts as $part) {
|
||||
if (!preg_match($pattern, $part) || \in_array($part, $reserved, true)) {
|
||||
@@ -137,7 +137,7 @@ class JsonResponse extends Response
|
||||
*
|
||||
* @throws \InvalidArgumentException
|
||||
*/
|
||||
public function setData($data = array())
|
||||
public function setData($data = [])
|
||||
{
|
||||
try {
|
||||
$data = json_encode($data, $this->encodingOptions);
|
||||
|
||||
16
vendor/symfony/http-foundation/ParameterBag.php
vendored
16
vendor/symfony/http-foundation/ParameterBag.php
vendored
@@ -26,7 +26,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
/**
|
||||
* @param array $parameters An array of parameters
|
||||
*/
|
||||
public function __construct(array $parameters = array())
|
||||
public function __construct(array $parameters = [])
|
||||
{
|
||||
$this->parameters = $parameters;
|
||||
}
|
||||
@@ -56,7 +56,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
*
|
||||
* @param array $parameters An array of parameters
|
||||
*/
|
||||
public function replace(array $parameters = array())
|
||||
public function replace(array $parameters = [])
|
||||
{
|
||||
$this->parameters = $parameters;
|
||||
}
|
||||
@@ -66,7 +66,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
*
|
||||
* @param array $parameters An array of parameters
|
||||
*/
|
||||
public function add(array $parameters = array())
|
||||
public function add(array $parameters = [])
|
||||
{
|
||||
$this->parameters = array_replace($this->parameters, $parameters);
|
||||
}
|
||||
@@ -81,7 +81,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
*/
|
||||
public function get($key, $default = null)
|
||||
{
|
||||
return array_key_exists($key, $this->parameters) ? $this->parameters[$key] : $default;
|
||||
return \array_key_exists($key, $this->parameters) ? $this->parameters[$key] : $default;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -104,7 +104,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
*/
|
||||
public function has($key)
|
||||
{
|
||||
return array_key_exists($key, $this->parameters);
|
||||
return \array_key_exists($key, $this->parameters);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -154,7 +154,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
public function getDigits($key, $default = '')
|
||||
{
|
||||
// we need to remove - and + because they're allowed in the filter
|
||||
return str_replace(array('-', '+'), '', $this->filter($key, $default, FILTER_SANITIZE_NUMBER_INT));
|
||||
return str_replace(['-', '+'], '', $this->filter($key, $default, FILTER_SANITIZE_NUMBER_INT));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -195,13 +195,13 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function filter($key, $default = null, $filter = FILTER_DEFAULT, $options = array())
|
||||
public function filter($key, $default = null, $filter = FILTER_DEFAULT, $options = [])
|
||||
{
|
||||
$value = $this->get($key, $default);
|
||||
|
||||
// Always turn $options into an array - this allows filter_var option shortcuts.
|
||||
if (!\is_array($options) && $options) {
|
||||
$options = array('flags' => $options);
|
||||
$options = ['flags' => $options];
|
||||
}
|
||||
|
||||
// Add a convenience check for arrays.
|
||||
|
||||
@@ -32,7 +32,7 @@ class RedirectResponse extends Response
|
||||
*
|
||||
* @see http://tools.ietf.org/html/rfc2616#section-10.3
|
||||
*/
|
||||
public function __construct(?string $url, int $status = 302, array $headers = array())
|
||||
public function __construct(?string $url, int $status = 302, array $headers = [])
|
||||
{
|
||||
parent::__construct('', $status, $headers);
|
||||
|
||||
@@ -42,7 +42,7 @@ class RedirectResponse extends Response
|
||||
throw new \InvalidArgumentException(sprintf('The HTTP status code is not a redirect ("%s" given).', $status));
|
||||
}
|
||||
|
||||
if (301 == $status && !array_key_exists('cache-control', $headers)) {
|
||||
if (301 == $status && !\array_key_exists('cache-control', $headers)) {
|
||||
$this->headers->remove('cache-control');
|
||||
}
|
||||
}
|
||||
@@ -56,7 +56,7 @@ class RedirectResponse extends Response
|
||||
*
|
||||
* @return static
|
||||
*/
|
||||
public static function create($url = '', $status = 302, $headers = array())
|
||||
public static function create($url = '', $status = 302, $headers = [])
|
||||
{
|
||||
return new static($url, $status, $headers);
|
||||
}
|
||||
|
||||
149
vendor/symfony/http-foundation/Request.php
vendored
149
vendor/symfony/http-foundation/Request.php
vendored
@@ -52,17 +52,17 @@ class Request
|
||||
/**
|
||||
* @var string[]
|
||||
*/
|
||||
protected static $trustedProxies = array();
|
||||
protected static $trustedProxies = [];
|
||||
|
||||
/**
|
||||
* @var string[]
|
||||
*/
|
||||
protected static $trustedHostPatterns = array();
|
||||
protected static $trustedHostPatterns = [];
|
||||
|
||||
/**
|
||||
* @var string[]
|
||||
*/
|
||||
protected static $trustedHosts = array();
|
||||
protected static $trustedHosts = [];
|
||||
|
||||
protected static $httpMethodParameterOverride = false;
|
||||
|
||||
@@ -197,12 +197,12 @@ class Request
|
||||
|
||||
private static $trustedHeaderSet = -1;
|
||||
|
||||
private static $forwardedParams = array(
|
||||
private static $forwardedParams = [
|
||||
self::HEADER_X_FORWARDED_FOR => 'for',
|
||||
self::HEADER_X_FORWARDED_HOST => 'host',
|
||||
self::HEADER_X_FORWARDED_PROTO => 'proto',
|
||||
self::HEADER_X_FORWARDED_PORT => 'host',
|
||||
);
|
||||
];
|
||||
|
||||
/**
|
||||
* Names for headers that can be trusted when
|
||||
@@ -213,13 +213,13 @@ class Request
|
||||
* The other headers are non-standard, but widely used
|
||||
* by popular reverse proxies (like Apache mod_proxy or Amazon EC2).
|
||||
*/
|
||||
private static $trustedHeaders = array(
|
||||
private static $trustedHeaders = [
|
||||
self::HEADER_FORWARDED => 'FORWARDED',
|
||||
self::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
|
||||
self::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
|
||||
self::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
|
||||
self::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
|
||||
);
|
||||
];
|
||||
|
||||
/**
|
||||
* @param array $query The GET parameters
|
||||
@@ -230,7 +230,7 @@ class Request
|
||||
* @param array $server The SERVER parameters
|
||||
* @param string|resource|null $content The raw body data
|
||||
*/
|
||||
public function __construct(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
|
||||
public function __construct(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null)
|
||||
{
|
||||
$this->initialize($query, $request, $attributes, $cookies, $files, $server, $content);
|
||||
}
|
||||
@@ -248,7 +248,7 @@ class Request
|
||||
* @param array $server The SERVER parameters
|
||||
* @param string|resource|null $content The raw body data
|
||||
*/
|
||||
public function initialize(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
|
||||
public function initialize(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null)
|
||||
{
|
||||
$this->request = new ParameterBag($request);
|
||||
$this->query = new ParameterBag($query);
|
||||
@@ -278,10 +278,10 @@ class Request
|
||||
*/
|
||||
public static function createFromGlobals()
|
||||
{
|
||||
$request = self::createRequestFromFactory($_GET, $_POST, array(), $_COOKIE, $_FILES, $_SERVER);
|
||||
$request = self::createRequestFromFactory($_GET, $_POST, [], $_COOKIE, $_FILES, $_SERVER);
|
||||
|
||||
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')), ['PUT', 'DELETE', 'PATCH'])
|
||||
) {
|
||||
parse_str($request->getContent(), $data);
|
||||
$request->request = new ParameterBag($data);
|
||||
@@ -306,9 +306,9 @@ class Request
|
||||
*
|
||||
* @return static
|
||||
*/
|
||||
public static function create($uri, $method = 'GET', $parameters = array(), $cookies = array(), $files = array(), $server = array(), $content = null)
|
||||
public static function create($uri, $method = 'GET', $parameters = [], $cookies = [], $files = [], $server = [], $content = null)
|
||||
{
|
||||
$server = array_replace(array(
|
||||
$server = array_replace([
|
||||
'SERVER_NAME' => 'localhost',
|
||||
'SERVER_PORT' => 80,
|
||||
'HTTP_HOST' => 'localhost',
|
||||
@@ -321,7 +321,7 @@ class Request
|
||||
'SCRIPT_FILENAME' => '',
|
||||
'SERVER_PROTOCOL' => 'HTTP/1.1',
|
||||
'REQUEST_TIME' => time(),
|
||||
), $server);
|
||||
], $server);
|
||||
|
||||
$server['PATH_INFO'] = '';
|
||||
$server['REQUEST_METHOD'] = strtoupper($method);
|
||||
@@ -369,10 +369,10 @@ class Request
|
||||
// no break
|
||||
case 'PATCH':
|
||||
$request = $parameters;
|
||||
$query = array();
|
||||
$query = [];
|
||||
break;
|
||||
default:
|
||||
$request = array();
|
||||
$request = [];
|
||||
$query = $parameters;
|
||||
break;
|
||||
}
|
||||
@@ -395,7 +395,7 @@ class Request
|
||||
$server['REQUEST_URI'] = $components['path'].('' !== $queryString ? '?'.$queryString : '');
|
||||
$server['QUERY_STRING'] = $queryString;
|
||||
|
||||
return self::createRequestFromFactory($query, $request, array(), $cookies, $files, $server, $content);
|
||||
return self::createRequestFromFactory($query, $request, [], $cookies, $files, $server, $content);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -499,7 +499,7 @@ class Request
|
||||
}
|
||||
|
||||
$cookieHeader = '';
|
||||
$cookies = array();
|
||||
$cookies = [];
|
||||
|
||||
foreach ($this->cookies as $k => $v) {
|
||||
$cookies[] = $k.'='.$v;
|
||||
@@ -533,19 +533,19 @@ class Request
|
||||
|
||||
foreach ($this->headers->all() as $key => $value) {
|
||||
$key = strtoupper(str_replace('-', '_', $key));
|
||||
if (\in_array($key, array('CONTENT_TYPE', 'CONTENT_LENGTH'))) {
|
||||
if (\in_array($key, ['CONTENT_TYPE', 'CONTENT_LENGTH'])) {
|
||||
$_SERVER[$key] = implode(', ', $value);
|
||||
} else {
|
||||
$_SERVER['HTTP_'.$key] = implode(', ', $value);
|
||||
}
|
||||
}
|
||||
|
||||
$request = array('g' => $_GET, 'p' => $_POST, 'c' => $_COOKIE);
|
||||
$request = ['g' => $_GET, 'p' => $_POST, 'c' => $_COOKIE];
|
||||
|
||||
$requestOrder = ini_get('request_order') ?: ini_get('variables_order');
|
||||
$requestOrder = preg_replace('#[^cgp]#', '', strtolower($requestOrder)) ?: 'gp';
|
||||
|
||||
$_REQUEST = array(array());
|
||||
$_REQUEST = [[]];
|
||||
|
||||
foreach (str_split($requestOrder) as $order) {
|
||||
$_REQUEST[] = $request[$order];
|
||||
@@ -603,7 +603,7 @@ class Request
|
||||
return sprintf('{%s}i', $hostPattern);
|
||||
}, $hostPatterns);
|
||||
// we need to reset trusted hosts on trusted host patterns change
|
||||
self::$trustedHosts = array();
|
||||
self::$trustedHosts = [];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -777,10 +777,10 @@ class Request
|
||||
$ip = $this->server->get('REMOTE_ADDR');
|
||||
|
||||
if (!$this->isFromTrustedProxy()) {
|
||||
return array($ip);
|
||||
return [$ip];
|
||||
}
|
||||
|
||||
return $this->getTrustedValues(self::HEADER_X_FORWARDED_FOR, $ip) ?: array($ip);
|
||||
return $this->getTrustedValues(self::HEADER_X_FORWARDED_FOR, $ip) ?: [$ip];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1114,7 +1114,7 @@ class Request
|
||||
public function isSecure()
|
||||
{
|
||||
if ($this->isFromTrustedProxy() && $proto = $this->getTrustedValues(self::HEADER_X_FORWARDED_PROTO)) {
|
||||
return \in_array(strtolower($proto[0]), array('https', 'on', 'ssl', '1'), true);
|
||||
return \in_array(strtolower($proto[0]), ['https', 'on', 'ssl', '1'], true);
|
||||
}
|
||||
|
||||
$https = $this->server->get('HTTPS');
|
||||
@@ -1214,22 +1214,37 @@ class Request
|
||||
*/
|
||||
public function getMethod()
|
||||
{
|
||||
if (null === $this->method) {
|
||||
$this->method = strtoupper($this->server->get('REQUEST_METHOD', 'GET'));
|
||||
|
||||
if ('POST' === $this->method) {
|
||||
if ($method = $this->headers->get('X-HTTP-METHOD-OVERRIDE')) {
|
||||
$this->method = strtoupper($method);
|
||||
} elseif (self::$httpMethodParameterOverride) {
|
||||
$method = $this->request->get('_method', $this->query->get('_method', 'POST'));
|
||||
if (\is_string($method)) {
|
||||
$this->method = strtoupper($method);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (null !== $this->method) {
|
||||
return $this->method;
|
||||
}
|
||||
|
||||
return $this->method;
|
||||
$this->method = strtoupper($this->server->get('REQUEST_METHOD', 'GET'));
|
||||
|
||||
if ('POST' !== $this->method) {
|
||||
return $this->method;
|
||||
}
|
||||
|
||||
$method = $this->headers->get('X-HTTP-METHOD-OVERRIDE');
|
||||
|
||||
if (!$method && self::$httpMethodParameterOverride) {
|
||||
$method = $this->request->get('_method', $this->query->get('_method', 'POST'));
|
||||
}
|
||||
|
||||
if (!\is_string($method)) {
|
||||
return $this->method;
|
||||
}
|
||||
|
||||
$method = strtoupper($method);
|
||||
|
||||
if (\in_array($method, ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'CONNECT', 'OPTIONS', 'PATCH', 'PURGE', 'TRACE'], true)) {
|
||||
return $this->method = $method;
|
||||
}
|
||||
|
||||
if (!preg_match('/^[A-Z]++$/D', $method)) {
|
||||
throw new SuspiciousOperationException(sprintf('Invalid method override "%s".', $method));
|
||||
}
|
||||
|
||||
return $this->method = $method;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1273,7 +1288,7 @@ class Request
|
||||
static::initializeFormats();
|
||||
}
|
||||
|
||||
return isset(static::$formats[$format]) ? static::$formats[$format] : array();
|
||||
return isset(static::$formats[$format]) ? static::$formats[$format] : [];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1316,7 +1331,7 @@ class Request
|
||||
static::initializeFormats();
|
||||
}
|
||||
|
||||
static::$formats[$format] = \is_array($mimeTypes) ? $mimeTypes : array($mimeTypes);
|
||||
static::$formats[$format] = \is_array($mimeTypes) ? $mimeTypes : [$mimeTypes];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1330,7 +1345,7 @@ class Request
|
||||
*
|
||||
* @param string|null $default The default format
|
||||
*
|
||||
* @return string The request format
|
||||
* @return string|null The request format
|
||||
*/
|
||||
public function getRequestFormat($default = 'html')
|
||||
{
|
||||
@@ -1433,7 +1448,7 @@ class Request
|
||||
throw new \BadMethodCallException('Checking only for cacheable HTTP methods with Symfony\Component\HttpFoundation\Request::isMethodSafe() is not supported.');
|
||||
}
|
||||
|
||||
return \in_array($this->getMethod(), array('GET', 'HEAD', 'OPTIONS', 'TRACE'));
|
||||
return \in_array($this->getMethod(), ['GET', 'HEAD', 'OPTIONS', 'TRACE']);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1443,7 +1458,7 @@ class Request
|
||||
*/
|
||||
public function isMethodIdempotent()
|
||||
{
|
||||
return \in_array($this->getMethod(), array('HEAD', 'GET', 'PUT', 'DELETE', 'TRACE', 'OPTIONS', 'PURGE'));
|
||||
return \in_array($this->getMethod(), ['HEAD', 'GET', 'PUT', 'DELETE', 'TRACE', 'OPTIONS', 'PURGE']);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1455,7 +1470,7 @@ class Request
|
||||
*/
|
||||
public function isMethodCacheable()
|
||||
{
|
||||
return \in_array($this->getMethod(), array('GET', 'HEAD'));
|
||||
return \in_array($this->getMethod(), ['GET', 'HEAD']);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1566,7 +1581,7 @@ class Request
|
||||
return $locales[0];
|
||||
}
|
||||
|
||||
$extendedPreferredLanguages = array();
|
||||
$extendedPreferredLanguages = [];
|
||||
foreach ($preferredLanguages as $language) {
|
||||
$extendedPreferredLanguages[] = $language;
|
||||
if (false !== $position = strpos($language, '_')) {
|
||||
@@ -1594,7 +1609,7 @@ class Request
|
||||
}
|
||||
|
||||
$languages = AcceptHeader::fromString($this->headers->get('Accept-Language'))->all();
|
||||
$this->languages = array();
|
||||
$this->languages = [];
|
||||
foreach ($languages as $lang => $acceptHeaderItem) {
|
||||
if (false !== strpos($lang, '-')) {
|
||||
$codes = explode('-', $lang);
|
||||
@@ -1864,19 +1879,19 @@ class Request
|
||||
*/
|
||||
protected static function initializeFormats()
|
||||
{
|
||||
static::$formats = array(
|
||||
'html' => array('text/html', 'application/xhtml+xml'),
|
||||
'txt' => array('text/plain'),
|
||||
'js' => array('application/javascript', 'application/x-javascript', 'text/javascript'),
|
||||
'css' => array('text/css'),
|
||||
'json' => array('application/json', 'application/x-json'),
|
||||
'jsonld' => array('application/ld+json'),
|
||||
'xml' => array('text/xml', 'application/xml', 'application/x-xml'),
|
||||
'rdf' => array('application/rdf+xml'),
|
||||
'atom' => array('application/atom+xml'),
|
||||
'rss' => array('application/rss+xml'),
|
||||
'form' => array('application/x-www-form-urlencoded'),
|
||||
);
|
||||
static::$formats = [
|
||||
'html' => ['text/html', 'application/xhtml+xml'],
|
||||
'txt' => ['text/plain'],
|
||||
'js' => ['application/javascript', 'application/x-javascript', 'text/javascript'],
|
||||
'css' => ['text/css'],
|
||||
'json' => ['application/json', 'application/x-json'],
|
||||
'jsonld' => ['application/ld+json'],
|
||||
'xml' => ['text/xml', 'application/xml', 'application/x-xml'],
|
||||
'rdf' => ['application/rdf+xml'],
|
||||
'atom' => ['application/atom+xml'],
|
||||
'rss' => ['application/rss+xml'],
|
||||
'form' => ['application/x-www-form-urlencoded'],
|
||||
];
|
||||
}
|
||||
|
||||
private function setPhpDefaultLocale(string $locale)
|
||||
@@ -1913,7 +1928,7 @@ class Request
|
||||
return false;
|
||||
}
|
||||
|
||||
private static function createRequestFromFactory(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
|
||||
private static function createRequestFromFactory(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null)
|
||||
{
|
||||
if (self::$requestFactory) {
|
||||
$request = (self::$requestFactory)($query, $request, $attributes, $cookies, $files, $server, $content);
|
||||
@@ -1943,8 +1958,8 @@ class Request
|
||||
|
||||
private function getTrustedValues($type, $ip = null)
|
||||
{
|
||||
$clientValues = array();
|
||||
$forwardedValues = array();
|
||||
$clientValues = [];
|
||||
$forwardedValues = [];
|
||||
|
||||
if ((self::$trustedHeaderSet & $type) && $this->headers->has(self::$trustedHeaders[$type])) {
|
||||
foreach (explode(',', $this->headers->get(self::$trustedHeaders[$type])) as $v) {
|
||||
@@ -1955,7 +1970,7 @@ class Request
|
||||
if ((self::$trustedHeaderSet & self::HEADER_FORWARDED) && $this->headers->has(self::$trustedHeaders[self::HEADER_FORWARDED])) {
|
||||
$forwarded = $this->headers->get(self::$trustedHeaders[self::HEADER_FORWARDED]);
|
||||
$parts = HeaderUtils::split($forwarded, ',;=');
|
||||
$forwardedValues = array();
|
||||
$forwardedValues = [];
|
||||
$param = self::$forwardedParams[$type];
|
||||
foreach ($parts as $subParts) {
|
||||
if (null === $v = HeaderUtils::combine($subParts)[$param] ?? null) {
|
||||
@@ -1985,7 +2000,7 @@ class Request
|
||||
}
|
||||
|
||||
if (!$this->isForwardedValid) {
|
||||
return null !== $ip ? array('0.0.0.0', $ip) : array();
|
||||
return null !== $ip ? ['0.0.0.0', $ip] : [];
|
||||
}
|
||||
$this->isForwardedValid = false;
|
||||
|
||||
@@ -1995,7 +2010,7 @@ class Request
|
||||
private function normalizeAndFilterClientIps(array $clientIps, $ip)
|
||||
{
|
||||
if (!$clientIps) {
|
||||
return array();
|
||||
return [];
|
||||
}
|
||||
$clientIps[] = $ip; // Complete the IP chain with the IP the request actually came from
|
||||
$firstTrustedIp = null;
|
||||
@@ -2031,6 +2046,6 @@ class Request
|
||||
}
|
||||
|
||||
// Now the IP chain contains only untrusted proxies and the client IP
|
||||
return $clientIps ? array_reverse($clientIps) : array($firstTrustedIp);
|
||||
return $clientIps ? array_reverse($clientIps) : [$firstTrustedIp];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,22 +36,22 @@ class RequestMatcher implements RequestMatcherInterface
|
||||
/**
|
||||
* @var string[]
|
||||
*/
|
||||
private $methods = array();
|
||||
private $methods = [];
|
||||
|
||||
/**
|
||||
* @var string[]
|
||||
*/
|
||||
private $ips = array();
|
||||
private $ips = [];
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
private $attributes = array();
|
||||
private $attributes = [];
|
||||
|
||||
/**
|
||||
* @var string[]
|
||||
*/
|
||||
private $schemes = array();
|
||||
private $schemes = [];
|
||||
|
||||
/**
|
||||
* @param string|null $path
|
||||
@@ -61,7 +61,7 @@ class RequestMatcher implements RequestMatcherInterface
|
||||
* @param array $attributes
|
||||
* @param string|string[]|null $schemes
|
||||
*/
|
||||
public function __construct(string $path = null, string $host = null, $methods = null, $ips = null, array $attributes = array(), $schemes = null, int $port = null)
|
||||
public function __construct(string $path = null, string $host = null, $methods = null, $ips = null, array $attributes = [], $schemes = null, int $port = null)
|
||||
{
|
||||
$this->matchPath($path);
|
||||
$this->matchHost($host);
|
||||
@@ -82,7 +82,7 @@ class RequestMatcher implements RequestMatcherInterface
|
||||
*/
|
||||
public function matchScheme($scheme)
|
||||
{
|
||||
$this->schemes = null !== $scheme ? array_map('strtolower', (array) $scheme) : array();
|
||||
$this->schemes = null !== $scheme ? array_map('strtolower', (array) $scheme) : [];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -132,7 +132,7 @@ class RequestMatcher implements RequestMatcherInterface
|
||||
*/
|
||||
public function matchIps($ips)
|
||||
{
|
||||
$this->ips = null !== $ips ? (array) $ips : array();
|
||||
$this->ips = null !== $ips ? (array) $ips : [];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -142,7 +142,7 @@ class RequestMatcher implements RequestMatcherInterface
|
||||
*/
|
||||
public function matchMethod($method)
|
||||
{
|
||||
$this->methods = null !== $method ? array_map('strtoupper', (array) $method) : array();
|
||||
$this->methods = null !== $method ? array_map('strtoupper', (array) $method) : [];
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -21,7 +21,7 @@ class RequestStack
|
||||
/**
|
||||
* @var Request[]
|
||||
*/
|
||||
private $requests = array();
|
||||
private $requests = [];
|
||||
|
||||
/**
|
||||
* Pushes a Request on the stack.
|
||||
|
||||
32
vendor/symfony/http-foundation/Response.php
vendored
32
vendor/symfony/http-foundation/Response.php
vendored
@@ -128,7 +128,7 @@ class Response
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $statusTexts = array(
|
||||
public static $statusTexts = [
|
||||
100 => 'Continue',
|
||||
101 => 'Switching Protocols',
|
||||
102 => 'Processing', // RFC2518
|
||||
@@ -191,12 +191,12 @@ class Response
|
||||
508 => 'Loop Detected', // RFC5842
|
||||
510 => 'Not Extended', // RFC2774
|
||||
511 => 'Network Authentication Required', // RFC6585
|
||||
);
|
||||
];
|
||||
|
||||
/**
|
||||
* @throws \InvalidArgumentException When the HTTP status code is not valid
|
||||
*/
|
||||
public function __construct($content = '', int $status = 200, array $headers = array())
|
||||
public function __construct($content = '', int $status = 200, array $headers = [])
|
||||
{
|
||||
$this->headers = new ResponseHeaderBag($headers);
|
||||
$this->setContent($content);
|
||||
@@ -218,7 +218,7 @@ class Response
|
||||
*
|
||||
* @return static
|
||||
*/
|
||||
public static function create($content = '', $status = 200, $headers = array())
|
||||
public static function create($content = '', $status = 200, $headers = [])
|
||||
{
|
||||
return new static($content, $status, $headers);
|
||||
}
|
||||
@@ -306,9 +306,9 @@ class Response
|
||||
}
|
||||
|
||||
// Check if we need to send extra expire info headers
|
||||
if ('1.0' == $this->getProtocolVersion() && false !== strpos($this->headers->get('Cache-Control'), 'no-cache')) {
|
||||
$this->headers->set('pragma', 'no-cache');
|
||||
$this->headers->set('expires', -1);
|
||||
if ('1.0' == $this->getProtocolVersion() && false !== strpos($headers->get('Cache-Control'), 'no-cache')) {
|
||||
$headers->set('pragma', 'no-cache');
|
||||
$headers->set('expires', -1);
|
||||
}
|
||||
|
||||
$this->ensureIEOverSSLCompatibility($request);
|
||||
@@ -377,7 +377,7 @@ class Response
|
||||
|
||||
if (\function_exists('fastcgi_finish_request')) {
|
||||
fastcgi_finish_request();
|
||||
} elseif (!\in_array(\PHP_SAPI, array('cli', 'phpdbg'), true)) {
|
||||
} elseif (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
|
||||
static::closeOutputBuffers(0, true);
|
||||
}
|
||||
|
||||
@@ -397,7 +397,7 @@ class Response
|
||||
*/
|
||||
public function setContent($content)
|
||||
{
|
||||
if (null !== $content && !\is_string($content) && !is_numeric($content) && !\is_callable(array($content, '__toString'))) {
|
||||
if (null !== $content && !\is_string($content) && !is_numeric($content) && !\is_callable([$content, '__toString'])) {
|
||||
throw new \UnexpectedValueException(sprintf('The Response content must be a string or object implementing __toString(), "%s" given.', \gettype($content)));
|
||||
}
|
||||
|
||||
@@ -529,7 +529,7 @@ class Response
|
||||
*/
|
||||
public function isCacheable(): bool
|
||||
{
|
||||
if (!\in_array($this->statusCode, array(200, 203, 300, 301, 302, 404, 410))) {
|
||||
if (!\in_array($this->statusCode, [200, 203, 300, 301, 302, 404, 410])) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -939,7 +939,7 @@ class Response
|
||||
*/
|
||||
public function setCache(array $options)
|
||||
{
|
||||
if ($diff = array_diff(array_keys($options), array('etag', 'last_modified', 'max_age', 's_maxage', 'private', 'public', 'immutable'))) {
|
||||
if ($diff = array_diff(array_keys($options), ['etag', 'last_modified', 'max_age', 's_maxage', 'private', 'public', 'immutable'])) {
|
||||
throw new \InvalidArgumentException(sprintf('Response does not support the following options: "%s".', implode('", "', $diff)));
|
||||
}
|
||||
|
||||
@@ -1000,7 +1000,7 @@ class Response
|
||||
$this->setContent(null);
|
||||
|
||||
// remove headers that MUST NOT be included with 304 Not Modified responses
|
||||
foreach (array('Allow', 'Content-Encoding', 'Content-Language', 'Content-Length', 'Content-MD5', 'Content-Type', 'Last-Modified') as $header) {
|
||||
foreach (['Allow', 'Content-Encoding', 'Content-Language', 'Content-Length', 'Content-MD5', 'Content-Type', 'Last-Modified'] as $header) {
|
||||
$this->headers->remove($header);
|
||||
}
|
||||
|
||||
@@ -1025,10 +1025,10 @@ class Response
|
||||
public function getVary(): array
|
||||
{
|
||||
if (!$vary = $this->headers->get('Vary', null, false)) {
|
||||
return array();
|
||||
return [];
|
||||
}
|
||||
|
||||
$ret = array();
|
||||
$ret = [];
|
||||
foreach ($vary as $item) {
|
||||
$ret = array_merge($ret, preg_split('/[\s,]+/', $item));
|
||||
}
|
||||
@@ -1188,7 +1188,7 @@ class Response
|
||||
*/
|
||||
public function isRedirect(string $location = null): bool
|
||||
{
|
||||
return \in_array($this->statusCode, array(201, 301, 302, 303, 307, 308)) && (null === $location ?: $location == $this->headers->get('Location'));
|
||||
return \in_array($this->statusCode, [201, 301, 302, 303, 307, 308]) && (null === $location ?: $location == $this->headers->get('Location'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1198,7 +1198,7 @@ class Response
|
||||
*/
|
||||
public function isEmpty(): bool
|
||||
{
|
||||
return \in_array($this->statusCode, array(204, 304));
|
||||
return \in_array($this->statusCode, [204, 304]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -24,11 +24,11 @@ class ResponseHeaderBag extends HeaderBag
|
||||
const DISPOSITION_ATTACHMENT = 'attachment';
|
||||
const DISPOSITION_INLINE = 'inline';
|
||||
|
||||
protected $computedCacheControl = array();
|
||||
protected $cookies = array();
|
||||
protected $headerNames = array();
|
||||
protected $computedCacheControl = [];
|
||||
protected $cookies = [];
|
||||
protected $headerNames = [];
|
||||
|
||||
public function __construct(array $headers = array())
|
||||
public function __construct(array $headers = [])
|
||||
{
|
||||
parent::__construct($headers);
|
||||
|
||||
@@ -49,7 +49,7 @@ class ResponseHeaderBag extends HeaderBag
|
||||
*/
|
||||
public function allPreserveCase()
|
||||
{
|
||||
$headers = array();
|
||||
$headers = [];
|
||||
foreach ($this->all() as $name => $value) {
|
||||
$headers[isset($this->headerNames[$name]) ? $this->headerNames[$name] : $name] = $value;
|
||||
}
|
||||
@@ -70,9 +70,9 @@ class ResponseHeaderBag extends HeaderBag
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function replace(array $headers = array())
|
||||
public function replace(array $headers = [])
|
||||
{
|
||||
$this->headerNames = array();
|
||||
$this->headerNames = [];
|
||||
|
||||
parent::replace($headers);
|
||||
|
||||
@@ -107,7 +107,7 @@ class ResponseHeaderBag extends HeaderBag
|
||||
|
||||
if ('set-cookie' === $uniqueKey) {
|
||||
if ($replace) {
|
||||
$this->cookies = array();
|
||||
$this->cookies = [];
|
||||
}
|
||||
foreach ((array) $values as $cookie) {
|
||||
$this->setCookie(Cookie::fromString($cookie));
|
||||
@@ -122,9 +122,9 @@ class ResponseHeaderBag extends HeaderBag
|
||||
parent::set($key, $values, $replace);
|
||||
|
||||
// ensure the cache-control header has sensible defaults
|
||||
if (\in_array($uniqueKey, array('cache-control', 'etag', 'last-modified', 'expires'), true)) {
|
||||
if (\in_array($uniqueKey, ['cache-control', 'etag', 'last-modified', 'expires'], true)) {
|
||||
$computed = $this->computeCacheControlValue();
|
||||
$this->headers['cache-control'] = array($computed);
|
||||
$this->headers['cache-control'] = [$computed];
|
||||
$this->headerNames['cache-control'] = 'Cache-Control';
|
||||
$this->computedCacheControl = $this->parseCacheControl($computed);
|
||||
}
|
||||
@@ -139,7 +139,7 @@ class ResponseHeaderBag extends HeaderBag
|
||||
unset($this->headerNames[$uniqueKey]);
|
||||
|
||||
if ('set-cookie' === $uniqueKey) {
|
||||
$this->cookies = array();
|
||||
$this->cookies = [];
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -147,7 +147,7 @@ class ResponseHeaderBag extends HeaderBag
|
||||
parent::remove($key);
|
||||
|
||||
if ('cache-control' === $uniqueKey) {
|
||||
$this->computedCacheControl = array();
|
||||
$this->computedCacheControl = [];
|
||||
}
|
||||
|
||||
if ('date' === $uniqueKey) {
|
||||
@@ -160,7 +160,7 @@ class ResponseHeaderBag extends HeaderBag
|
||||
*/
|
||||
public function hasCacheControlDirective($key)
|
||||
{
|
||||
return array_key_exists($key, $this->computedCacheControl);
|
||||
return \array_key_exists($key, $this->computedCacheControl);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -168,7 +168,7 @@ class ResponseHeaderBag extends HeaderBag
|
||||
*/
|
||||
public function getCacheControlDirective($key)
|
||||
{
|
||||
return array_key_exists($key, $this->computedCacheControl) ? $this->computedCacheControl[$key] : null;
|
||||
return \array_key_exists($key, $this->computedCacheControl) ? $this->computedCacheControl[$key] : null;
|
||||
}
|
||||
|
||||
public function setCookie(Cookie $cookie)
|
||||
@@ -216,15 +216,15 @@ class ResponseHeaderBag extends HeaderBag
|
||||
*/
|
||||
public function getCookies($format = self::COOKIES_FLAT)
|
||||
{
|
||||
if (!\in_array($format, array(self::COOKIES_FLAT, self::COOKIES_ARRAY))) {
|
||||
throw new \InvalidArgumentException(sprintf('Format "%s" invalid (%s).', $format, implode(', ', array(self::COOKIES_FLAT, self::COOKIES_ARRAY))));
|
||||
if (!\in_array($format, [self::COOKIES_FLAT, self::COOKIES_ARRAY])) {
|
||||
throw new \InvalidArgumentException(sprintf('Format "%s" invalid (%s).', $format, implode(', ', [self::COOKIES_FLAT, self::COOKIES_ARRAY])));
|
||||
}
|
||||
|
||||
if (self::COOKIES_ARRAY === $format) {
|
||||
return $this->cookies;
|
||||
}
|
||||
|
||||
$flattenedCookies = array();
|
||||
$flattenedCookies = [];
|
||||
foreach ($this->cookies as $path) {
|
||||
foreach ($path as $cookies) {
|
||||
foreach ($cookies as $cookie) {
|
||||
|
||||
4
vendor/symfony/http-foundation/ServerBag.php
vendored
4
vendor/symfony/http-foundation/ServerBag.php
vendored
@@ -27,8 +27,8 @@ class ServerBag extends ParameterBag
|
||||
*/
|
||||
public function getHeaders()
|
||||
{
|
||||
$headers = array();
|
||||
$contentHeaders = array('CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true);
|
||||
$headers = [];
|
||||
$contentHeaders = ['CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true];
|
||||
foreach ($this->parameters as $key => $value) {
|
||||
if (0 === strpos($key, 'HTTP_')) {
|
||||
$headers[substr($key, 5)] = $value;
|
||||
|
||||
@@ -19,7 +19,7 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
|
||||
private $name = 'attributes';
|
||||
private $storageKey;
|
||||
|
||||
protected $attributes = array();
|
||||
protected $attributes = [];
|
||||
|
||||
/**
|
||||
* @param string $storageKey The key used to store attributes in the session
|
||||
@@ -63,7 +63,7 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
|
||||
*/
|
||||
public function has($name)
|
||||
{
|
||||
return array_key_exists($name, $this->attributes);
|
||||
return \array_key_exists($name, $this->attributes);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -71,7 +71,7 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
|
||||
*/
|
||||
public function get($name, $default = null)
|
||||
{
|
||||
return array_key_exists($name, $this->attributes) ? $this->attributes[$name] : $default;
|
||||
return \array_key_exists($name, $this->attributes) ? $this->attributes[$name] : $default;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -95,7 +95,7 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
|
||||
*/
|
||||
public function replace(array $attributes)
|
||||
{
|
||||
$this->attributes = array();
|
||||
$this->attributes = [];
|
||||
foreach ($attributes as $key => $value) {
|
||||
$this->set($key, $value);
|
||||
}
|
||||
@@ -107,7 +107,7 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
|
||||
public function remove($name)
|
||||
{
|
||||
$retval = null;
|
||||
if (array_key_exists($name, $this->attributes)) {
|
||||
if (\array_key_exists($name, $this->attributes)) {
|
||||
$retval = $this->attributes[$name];
|
||||
unset($this->attributes[$name]);
|
||||
}
|
||||
@@ -121,7 +121,7 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
|
||||
public function clear()
|
||||
{
|
||||
$return = $this->attributes;
|
||||
$this->attributes = array();
|
||||
$this->attributes = [];
|
||||
|
||||
return $return;
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ class NamespacedAttributeBag extends AttributeBag
|
||||
return false;
|
||||
}
|
||||
|
||||
return array_key_exists($name, $attributes);
|
||||
return \array_key_exists($name, $attributes);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -60,7 +60,7 @@ class NamespacedAttributeBag extends AttributeBag
|
||||
return $default;
|
||||
}
|
||||
|
||||
return array_key_exists($name, $attributes) ? $attributes[$name] : $default;
|
||||
return \array_key_exists($name, $attributes) ? $attributes[$name] : $default;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -81,7 +81,7 @@ class NamespacedAttributeBag extends AttributeBag
|
||||
$retval = null;
|
||||
$attributes = &$this->resolveAttributePath($name);
|
||||
$name = $this->resolveKey($name);
|
||||
if (null !== $attributes && array_key_exists($name, $attributes)) {
|
||||
if (null !== $attributes && \array_key_exists($name, $attributes)) {
|
||||
$retval = $attributes[$name];
|
||||
unset($attributes[$name]);
|
||||
}
|
||||
@@ -115,7 +115,7 @@ class NamespacedAttributeBag extends AttributeBag
|
||||
return $array;
|
||||
}
|
||||
|
||||
$array[$parts[0]] = array();
|
||||
$array[$parts[0]] = [];
|
||||
|
||||
return $array;
|
||||
}
|
||||
@@ -123,14 +123,14 @@ class NamespacedAttributeBag extends AttributeBag
|
||||
unset($parts[\count($parts) - 1]);
|
||||
|
||||
foreach ($parts as $part) {
|
||||
if (null !== $array && !array_key_exists($part, $array)) {
|
||||
if (null !== $array && !\array_key_exists($part, $array)) {
|
||||
if (!$writeContext) {
|
||||
$null = null;
|
||||
|
||||
return $null;
|
||||
}
|
||||
|
||||
$array[$part] = array();
|
||||
$array[$part] = [];
|
||||
}
|
||||
|
||||
$array = &$array[$part];
|
||||
|
||||
@@ -19,7 +19,7 @@ namespace Symfony\Component\HttpFoundation\Session\Flash;
|
||||
class AutoExpireFlashBag implements FlashBagInterface
|
||||
{
|
||||
private $name = 'flashes';
|
||||
private $flashes = array('display' => array(), 'new' => array());
|
||||
private $flashes = ['display' => [], 'new' => []];
|
||||
private $storageKey;
|
||||
|
||||
/**
|
||||
@@ -53,8 +53,8 @@ class AutoExpireFlashBag implements FlashBagInterface
|
||||
// The logic: messages from the last request will be stored in new, so we move them to previous
|
||||
// This request we will show what is in 'display'. What is placed into 'new' this time round will
|
||||
// be moved to display next time round.
|
||||
$this->flashes['display'] = array_key_exists('new', $this->flashes) ? $this->flashes['new'] : array();
|
||||
$this->flashes['new'] = array();
|
||||
$this->flashes['display'] = \array_key_exists('new', $this->flashes) ? $this->flashes['new'] : [];
|
||||
$this->flashes['new'] = [];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -68,7 +68,7 @@ class AutoExpireFlashBag implements FlashBagInterface
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function peek($type, array $default = array())
|
||||
public function peek($type, array $default = [])
|
||||
{
|
||||
return $this->has($type) ? $this->flashes['display'][$type] : $default;
|
||||
}
|
||||
@@ -78,13 +78,13 @@ class AutoExpireFlashBag implements FlashBagInterface
|
||||
*/
|
||||
public function peekAll()
|
||||
{
|
||||
return array_key_exists('display', $this->flashes) ? (array) $this->flashes['display'] : array();
|
||||
return \array_key_exists('display', $this->flashes) ? (array) $this->flashes['display'] : [];
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function get($type, array $default = array())
|
||||
public function get($type, array $default = [])
|
||||
{
|
||||
$return = $default;
|
||||
|
||||
@@ -106,7 +106,7 @@ class AutoExpireFlashBag implements FlashBagInterface
|
||||
public function all()
|
||||
{
|
||||
$return = $this->flashes['display'];
|
||||
$this->flashes['display'] = array();
|
||||
$this->flashes['display'] = [];
|
||||
|
||||
return $return;
|
||||
}
|
||||
@@ -132,7 +132,7 @@ class AutoExpireFlashBag implements FlashBagInterface
|
||||
*/
|
||||
public function has($type)
|
||||
{
|
||||
return array_key_exists($type, $this->flashes['display']) && $this->flashes['display'][$type];
|
||||
return \array_key_exists($type, $this->flashes['display']) && $this->flashes['display'][$type];
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -19,7 +19,7 @@ namespace Symfony\Component\HttpFoundation\Session\Flash;
|
||||
class FlashBag implements FlashBagInterface
|
||||
{
|
||||
private $name = 'flashes';
|
||||
private $flashes = array();
|
||||
private $flashes = [];
|
||||
private $storageKey;
|
||||
|
||||
/**
|
||||
@@ -62,7 +62,7 @@ class FlashBag implements FlashBagInterface
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function peek($type, array $default = array())
|
||||
public function peek($type, array $default = [])
|
||||
{
|
||||
return $this->has($type) ? $this->flashes[$type] : $default;
|
||||
}
|
||||
@@ -78,7 +78,7 @@ class FlashBag implements FlashBagInterface
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function get($type, array $default = array())
|
||||
public function get($type, array $default = [])
|
||||
{
|
||||
if (!$this->has($type)) {
|
||||
return $default;
|
||||
@@ -97,7 +97,7 @@ class FlashBag implements FlashBagInterface
|
||||
public function all()
|
||||
{
|
||||
$return = $this->peekAll();
|
||||
$this->flashes = array();
|
||||
$this->flashes = [];
|
||||
|
||||
return $return;
|
||||
}
|
||||
@@ -123,7 +123,7 @@ class FlashBag implements FlashBagInterface
|
||||
*/
|
||||
public function has($type)
|
||||
{
|
||||
return array_key_exists($type, $this->flashes) && $this->flashes[$type];
|
||||
return \array_key_exists($type, $this->flashes) && $this->flashes[$type];
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -44,7 +44,7 @@ interface FlashBagInterface extends SessionBagInterface
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function peek($type, array $default = array());
|
||||
public function peek($type, array $default = []);
|
||||
|
||||
/**
|
||||
* Gets all flash messages.
|
||||
@@ -61,7 +61,7 @@ interface FlashBagInterface extends SessionBagInterface
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function get($type, array $default = array());
|
||||
public function get($type, array $default = []);
|
||||
|
||||
/**
|
||||
* Gets and clears flashes from the stack.
|
||||
|
||||
@@ -28,7 +28,7 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable
|
||||
|
||||
private $flashName;
|
||||
private $attributeName;
|
||||
private $data = array();
|
||||
private $data = [];
|
||||
private $usageIndex = 0;
|
||||
|
||||
/**
|
||||
|
||||
@@ -30,7 +30,7 @@ final class SessionUtils
|
||||
$sessionCookie = null;
|
||||
$sessionCookiePrefix = sprintf(' %s=', urlencode($sessionName));
|
||||
$sessionCookieWithId = sprintf('%s%s;', $sessionCookiePrefix, urlencode($sessionId));
|
||||
$otherCookies = array();
|
||||
$otherCookies = [];
|
||||
foreach (headers_list() as $h) {
|
||||
if (0 !== stripos($h, 'Set-Cookie:')) {
|
||||
continue;
|
||||
|
||||
@@ -104,7 +104,7 @@ abstract class AbstractSessionHandler implements \SessionHandlerInterface, \Sess
|
||||
{
|
||||
if (null === $this->igbinaryEmptyData) {
|
||||
// see https://github.com/igbinary/igbinary/issues/146
|
||||
$this->igbinaryEmptyData = \function_exists('igbinary_serialize') ? igbinary_serialize(array()) : '';
|
||||
$this->igbinaryEmptyData = \function_exists('igbinary_serialize') ? igbinary_serialize([]) : '';
|
||||
}
|
||||
if ('' === $data || $this->igbinaryEmptyData === $data) {
|
||||
return $this->destroy($sessionId);
|
||||
|
||||
@@ -45,11 +45,11 @@ class MemcachedSessionHandler extends AbstractSessionHandler
|
||||
*
|
||||
* @throws \InvalidArgumentException When unsupported options are passed
|
||||
*/
|
||||
public function __construct(\Memcached $memcached, array $options = array())
|
||||
public function __construct(\Memcached $memcached, array $options = [])
|
||||
{
|
||||
$this->memcached = $memcached;
|
||||
|
||||
if ($diff = array_diff(array_keys($options), array('prefix', 'expiretime'))) {
|
||||
if ($diff = array_diff(array_keys($options), ['prefix', 'expiretime'])) {
|
||||
throw new \InvalidArgumentException(sprintf('The following options are not supported "%s"', implode(', ', $diff)));
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ class MemcachedSessionHandler extends AbstractSessionHandler
|
||||
*/
|
||||
public function close()
|
||||
{
|
||||
return true;
|
||||
return $this->memcached->quit();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -74,12 +74,12 @@ class MongoDbSessionHandler extends AbstractSessionHandler
|
||||
|
||||
$this->mongo = $mongo;
|
||||
|
||||
$this->options = array_merge(array(
|
||||
$this->options = array_merge([
|
||||
'id_field' => '_id',
|
||||
'data_field' => 'data',
|
||||
'time_field' => 'time',
|
||||
'expiry_field' => 'expires_at',
|
||||
), $options);
|
||||
], $options);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -95,9 +95,9 @@ class MongoDbSessionHandler extends AbstractSessionHandler
|
||||
*/
|
||||
protected function doDestroy($sessionId)
|
||||
{
|
||||
$this->getCollection()->deleteOne(array(
|
||||
$this->getCollection()->deleteOne([
|
||||
$this->options['id_field'] => $sessionId,
|
||||
));
|
||||
]);
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -107,9 +107,9 @@ class MongoDbSessionHandler extends AbstractSessionHandler
|
||||
*/
|
||||
public function gc($maxlifetime)
|
||||
{
|
||||
$this->getCollection()->deleteMany(array(
|
||||
$this->options['expiry_field'] => array('$lt' => new \MongoDB\BSON\UTCDateTime()),
|
||||
));
|
||||
$this->getCollection()->deleteMany([
|
||||
$this->options['expiry_field'] => ['$lt' => new \MongoDB\BSON\UTCDateTime()],
|
||||
]);
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -121,16 +121,16 @@ class MongoDbSessionHandler extends AbstractSessionHandler
|
||||
{
|
||||
$expiry = new \MongoDB\BSON\UTCDateTime((time() + (int) ini_get('session.gc_maxlifetime')) * 1000);
|
||||
|
||||
$fields = array(
|
||||
$fields = [
|
||||
$this->options['time_field'] => new \MongoDB\BSON\UTCDateTime(),
|
||||
$this->options['expiry_field'] => $expiry,
|
||||
$this->options['data_field'] => new \MongoDB\BSON\Binary($data, \MongoDB\BSON\Binary::TYPE_OLD_BINARY),
|
||||
);
|
||||
];
|
||||
|
||||
$this->getCollection()->updateOne(
|
||||
array($this->options['id_field'] => $sessionId),
|
||||
array('$set' => $fields),
|
||||
array('upsert' => true)
|
||||
[$this->options['id_field'] => $sessionId],
|
||||
['$set' => $fields],
|
||||
['upsert' => true]
|
||||
);
|
||||
|
||||
return true;
|
||||
@@ -144,11 +144,11 @@ class MongoDbSessionHandler extends AbstractSessionHandler
|
||||
$expiry = new \MongoDB\BSON\UTCDateTime((time() + (int) ini_get('session.gc_maxlifetime')) * 1000);
|
||||
|
||||
$this->getCollection()->updateOne(
|
||||
array($this->options['id_field'] => $sessionId),
|
||||
array('$set' => array(
|
||||
[$this->options['id_field'] => $sessionId],
|
||||
['$set' => [
|
||||
$this->options['time_field'] => new \MongoDB\BSON\UTCDateTime(),
|
||||
$this->options['expiry_field'] => $expiry,
|
||||
))
|
||||
]]
|
||||
);
|
||||
|
||||
return true;
|
||||
@@ -159,10 +159,10 @@ class MongoDbSessionHandler extends AbstractSessionHandler
|
||||
*/
|
||||
protected function doRead($sessionId)
|
||||
{
|
||||
$dbData = $this->getCollection()->findOne(array(
|
||||
$dbData = $this->getCollection()->findOne([
|
||||
$this->options['id_field'] => $sessionId,
|
||||
$this->options['expiry_field'] => array('$gte' => new \MongoDB\BSON\UTCDateTime()),
|
||||
));
|
||||
$this->options['expiry_field'] => ['$gte' => new \MongoDB\BSON\UTCDateTime()],
|
||||
]);
|
||||
|
||||
if (null === $dbData) {
|
||||
return '';
|
||||
|
||||
@@ -118,7 +118,7 @@ class PdoSessionHandler extends AbstractSessionHandler
|
||||
/**
|
||||
* @var array Connection options when lazy-connect
|
||||
*/
|
||||
private $connectionOptions = array();
|
||||
private $connectionOptions = [];
|
||||
|
||||
/**
|
||||
* @var int The strategy for locking, see constants
|
||||
@@ -130,7 +130,7 @@ class PdoSessionHandler extends AbstractSessionHandler
|
||||
*
|
||||
* @var \PDOStatement[] An array of statements to release advisory locks
|
||||
*/
|
||||
private $unlockStatements = array();
|
||||
private $unlockStatements = [];
|
||||
|
||||
/**
|
||||
* @var bool True when the current session exists but expired according to session.gc_maxlifetime
|
||||
@@ -161,7 +161,7 @@ class PdoSessionHandler extends AbstractSessionHandler
|
||||
* * db_time_col: The column where to store the timestamp [default: sess_time]
|
||||
* * db_username: The username when lazy-connect [default: '']
|
||||
* * db_password: The password when lazy-connect [default: '']
|
||||
* * db_connection_options: An array of driver-specific connection options [default: array()]
|
||||
* * db_connection_options: An array of driver-specific connection options [default: []]
|
||||
* * lock_mode: The strategy for locking, see constants [default: LOCK_TRANSACTIONAL]
|
||||
*
|
||||
* @param \PDO|string|null $pdoOrDsn A \PDO instance or DSN string or URL string or null
|
||||
@@ -169,7 +169,7 @@ class PdoSessionHandler extends AbstractSessionHandler
|
||||
*
|
||||
* @throws \InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
|
||||
*/
|
||||
public function __construct($pdoOrDsn = null, array $options = array())
|
||||
public function __construct($pdoOrDsn = null, array $options = [])
|
||||
{
|
||||
if ($pdoOrDsn instanceof \PDO) {
|
||||
if (\PDO::ERRMODE_EXCEPTION !== $pdoOrDsn->getAttribute(\PDO::ATTR_ERRMODE)) {
|
||||
@@ -468,13 +468,13 @@ class PdoSessionHandler extends AbstractSessionHandler
|
||||
throw new \InvalidArgumentException('URLs without scheme are not supported to configure the PdoSessionHandler');
|
||||
}
|
||||
|
||||
$driverAliasMap = array(
|
||||
$driverAliasMap = [
|
||||
'mssql' => 'sqlsrv',
|
||||
'mysql2' => 'mysql', // Amazon RDS, for some weird reason
|
||||
'postgres' => 'pgsql',
|
||||
'postgresql' => 'pgsql',
|
||||
'sqlite3' => 'sqlite',
|
||||
);
|
||||
];
|
||||
|
||||
$driver = isset($driverAliasMap[$params['scheme']]) ? $driverAliasMap[$params['scheme']] : $params['scheme'];
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ class RedisSessionHandler extends AbstractSessionHandler
|
||||
*
|
||||
* @throws \InvalidArgumentException When unsupported client or options are passed
|
||||
*/
|
||||
public function __construct($redis, array $options = array())
|
||||
public function __construct($redis, array $options = [])
|
||||
{
|
||||
if (
|
||||
!$redis instanceof \Redis &&
|
||||
@@ -52,7 +52,7 @@ class RedisSessionHandler extends AbstractSessionHandler
|
||||
throw new \InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, \is_object($redis) ? \get_class($redis) : \gettype($redis)));
|
||||
}
|
||||
|
||||
if ($diff = array_diff(array_keys($options), array('prefix'))) {
|
||||
if ($diff = array_diff(array_keys($options), ['prefix'])) {
|
||||
throw new \InvalidArgumentException(sprintf('The following options are not supported "%s"', implode(', ', $diff)));
|
||||
}
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ class MetadataBag implements SessionBagInterface
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
protected $meta = array(self::CREATED => 0, self::UPDATED => 0, self::LIFETIME => 0);
|
||||
protected $meta = [self::CREATED => 0, self::UPDATED => 0, self::LIFETIME => 0];
|
||||
|
||||
/**
|
||||
* Unix timestamp.
|
||||
|
||||
@@ -50,7 +50,7 @@ class MockArraySessionStorage implements SessionStorageInterface
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
protected $data = array();
|
||||
protected $data = [];
|
||||
|
||||
/**
|
||||
* @var MetadataBag
|
||||
@@ -60,7 +60,7 @@ class MockArraySessionStorage implements SessionStorageInterface
|
||||
/**
|
||||
* @var array|SessionBagInterface[]
|
||||
*/
|
||||
protected $bags = array();
|
||||
protected $bags = [];
|
||||
|
||||
public function __construct(string $name = 'MOCKSESSID', MetadataBag $metaBag = null)
|
||||
{
|
||||
@@ -166,7 +166,7 @@ class MockArraySessionStorage implements SessionStorageInterface
|
||||
}
|
||||
|
||||
// clear out the session
|
||||
$this->data = array();
|
||||
$this->data = [];
|
||||
|
||||
// reconnect the bags to the session
|
||||
$this->loadSession();
|
||||
@@ -238,11 +238,11 @@ class MockArraySessionStorage implements SessionStorageInterface
|
||||
|
||||
protected function loadSession()
|
||||
{
|
||||
$bags = array_merge($this->bags, array($this->metadataBag));
|
||||
$bags = array_merge($this->bags, [$this->metadataBag]);
|
||||
|
||||
foreach ($bags as $bag) {
|
||||
$key = $bag->getStorageKey();
|
||||
$this->data[$key] = isset($this->data[$key]) ? $this->data[$key] : array();
|
||||
$this->data[$key] = isset($this->data[$key]) ? $this->data[$key] : [];
|
||||
$bag->initialize($this->data[$key]);
|
||||
}
|
||||
|
||||
|
||||
@@ -98,7 +98,7 @@ class MockFileSessionStorage extends MockArraySessionStorage
|
||||
unset($data[$key]);
|
||||
}
|
||||
}
|
||||
if (array($key = $this->metadataBag->getStorageKey()) === array_keys($data)) {
|
||||
if ([$key = $this->metadataBag->getStorageKey()] === array_keys($data)) {
|
||||
unset($data[$key]);
|
||||
}
|
||||
|
||||
@@ -145,7 +145,7 @@ class MockFileSessionStorage extends MockArraySessionStorage
|
||||
private function read()
|
||||
{
|
||||
$filePath = $this->getFilePath();
|
||||
$this->data = is_readable($filePath) && is_file($filePath) ? unserialize(file_get_contents($filePath)) : array();
|
||||
$this->data = is_readable($filePath) && is_file($filePath) ? unserialize(file_get_contents($filePath)) : [];
|
||||
|
||||
$this->loadSession();
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ class NativeSessionStorage implements SessionStorageInterface
|
||||
/**
|
||||
* @var SessionBagInterface[]
|
||||
*/
|
||||
protected $bags = array();
|
||||
protected $bags = [];
|
||||
|
||||
/**
|
||||
* @var bool
|
||||
@@ -101,15 +101,15 @@ class NativeSessionStorage implements SessionStorageInterface
|
||||
* @param \SessionHandlerInterface|null $handler
|
||||
* @param MetadataBag $metaBag MetadataBag
|
||||
*/
|
||||
public function __construct(array $options = array(), $handler = null, MetadataBag $metaBag = null)
|
||||
public function __construct(array $options = [], $handler = null, MetadataBag $metaBag = null)
|
||||
{
|
||||
$options += array(
|
||||
$options += [
|
||||
'cache_limiter' => '',
|
||||
'cache_expire' => 0,
|
||||
'use_cookies' => 1,
|
||||
'lazy_write' => 1,
|
||||
'use_strict_mode' => 1,
|
||||
);
|
||||
];
|
||||
|
||||
session_register_shutdown();
|
||||
|
||||
@@ -244,7 +244,7 @@ class NativeSessionStorage implements SessionStorageInterface
|
||||
unset($_SESSION[$key]);
|
||||
}
|
||||
}
|
||||
if (array($key = $this->metadataBag->getStorageKey()) === array_keys($_SESSION)) {
|
||||
if ([$key = $this->metadataBag->getStorageKey()] === array_keys($_SESSION)) {
|
||||
unset($_SESSION[$key]);
|
||||
}
|
||||
|
||||
@@ -280,7 +280,7 @@ class NativeSessionStorage implements SessionStorageInterface
|
||||
}
|
||||
|
||||
// clear out the session
|
||||
$_SESSION = array();
|
||||
$_SESSION = [];
|
||||
|
||||
// reconnect the bags to the session
|
||||
$this->loadSession();
|
||||
@@ -349,7 +349,7 @@ class NativeSessionStorage implements SessionStorageInterface
|
||||
* For convenience we omit 'session.' from the beginning of the keys.
|
||||
* Explicitly ignores other ini keys.
|
||||
*
|
||||
* @param array $options Session ini directives array(key => value)
|
||||
* @param array $options Session ini directives [key => value]
|
||||
*
|
||||
* @see http://php.net/session.configuration
|
||||
*/
|
||||
@@ -359,7 +359,7 @@ class NativeSessionStorage implements SessionStorageInterface
|
||||
return;
|
||||
}
|
||||
|
||||
$validOptions = array_flip(array(
|
||||
$validOptions = array_flip([
|
||||
'cache_expire', 'cache_limiter', 'cookie_domain', 'cookie_httponly',
|
||||
'cookie_lifetime', 'cookie_path', 'cookie_secure', 'cookie_samesite',
|
||||
'gc_divisor', 'gc_maxlifetime', 'gc_probability',
|
||||
@@ -369,7 +369,7 @@ class NativeSessionStorage implements SessionStorageInterface
|
||||
'upload_progress.cleanup', 'upload_progress.prefix', 'upload_progress.name',
|
||||
'upload_progress.freq', 'upload_progress.min_freq', 'url_rewriter.tags',
|
||||
'sid_length', 'sid_bits_per_character', 'trans_sid_hosts', 'trans_sid_tags',
|
||||
));
|
||||
]);
|
||||
|
||||
foreach ($options as $key => $value) {
|
||||
if (isset($validOptions[$key])) {
|
||||
@@ -445,11 +445,11 @@ class NativeSessionStorage implements SessionStorageInterface
|
||||
$session = &$_SESSION;
|
||||
}
|
||||
|
||||
$bags = array_merge($this->bags, array($this->metadataBag));
|
||||
$bags = array_merge($this->bags, [$this->metadataBag]);
|
||||
|
||||
foreach ($bags as $bag) {
|
||||
$key = $bag->getStorageKey();
|
||||
$session[$key] = isset($session[$key]) ? $session[$key] : array();
|
||||
$session[$key] = isset($session[$key]) ? $session[$key] : [];
|
||||
$bag->initialize($session[$key]);
|
||||
}
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ class StreamedResponse extends Response
|
||||
* @param int $status The response status code
|
||||
* @param array $headers An array of response headers
|
||||
*/
|
||||
public function __construct(callable $callback = null, int $status = 200, array $headers = array())
|
||||
public function __construct(callable $callback = null, int $status = 200, array $headers = [])
|
||||
{
|
||||
parent::__construct(null, $status, $headers);
|
||||
|
||||
@@ -55,7 +55,7 @@ class StreamedResponse extends Response
|
||||
*
|
||||
* @return static
|
||||
*/
|
||||
public static function create($callback = null, $status = 200, $headers = array())
|
||||
public static function create($callback = null, $status = 200, $headers = [])
|
||||
{
|
||||
return new static($callback, $status, $headers);
|
||||
}
|
||||
|
||||
@@ -28,24 +28,24 @@ class AcceptHeaderItemTest extends TestCase
|
||||
|
||||
public function provideFromStringData()
|
||||
{
|
||||
return array(
|
||||
array(
|
||||
return [
|
||||
[
|
||||
'text/html',
|
||||
'text/html', array(),
|
||||
),
|
||||
array(
|
||||
'text/html', [],
|
||||
],
|
||||
[
|
||||
'"this;should,not=matter"',
|
||||
'this;should,not=matter', array(),
|
||||
),
|
||||
array(
|
||||
'this;should,not=matter', [],
|
||||
],
|
||||
[
|
||||
"text/plain; charset=utf-8;param=\"this;should,not=matter\";\tfootnotes=true",
|
||||
'text/plain', array('charset' => 'utf-8', 'param' => 'this;should,not=matter', 'footnotes' => 'true'),
|
||||
),
|
||||
array(
|
||||
'text/plain', ['charset' => 'utf-8', 'param' => 'this;should,not=matter', 'footnotes' => 'true'],
|
||||
],
|
||||
[
|
||||
'"this;should,not=matter";charset=utf-8',
|
||||
'this;should,not=matter', array('charset' => 'utf-8'),
|
||||
),
|
||||
);
|
||||
'this;should,not=matter', ['charset' => 'utf-8'],
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -59,21 +59,21 @@ class AcceptHeaderItemTest extends TestCase
|
||||
|
||||
public function provideToStringData()
|
||||
{
|
||||
return array(
|
||||
array(
|
||||
'text/html', array(),
|
||||
return [
|
||||
[
|
||||
'text/html', [],
|
||||
'text/html',
|
||||
),
|
||||
array(
|
||||
'text/plain', array('charset' => 'utf-8', 'param' => 'this;should,not=matter', 'footnotes' => 'true'),
|
||||
],
|
||||
[
|
||||
'text/plain', ['charset' => 'utf-8', 'param' => 'this;should,not=matter', 'footnotes' => 'true'],
|
||||
'text/plain; charset=utf-8; param="this;should,not=matter"; footnotes=true',
|
||||
),
|
||||
);
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
public function testValue()
|
||||
{
|
||||
$item = new AcceptHeaderItem('value', array());
|
||||
$item = new AcceptHeaderItem('value', []);
|
||||
$this->assertEquals('value', $item->getValue());
|
||||
|
||||
$item->setValue('new value');
|
||||
@@ -85,7 +85,7 @@ class AcceptHeaderItemTest extends TestCase
|
||||
|
||||
public function testQuality()
|
||||
{
|
||||
$item = new AcceptHeaderItem('value', array());
|
||||
$item = new AcceptHeaderItem('value', []);
|
||||
$this->assertEquals(1.0, $item->getQuality());
|
||||
|
||||
$item->setQuality(0.5);
|
||||
@@ -98,14 +98,14 @@ class AcceptHeaderItemTest extends TestCase
|
||||
|
||||
public function testAttribute()
|
||||
{
|
||||
$item = new AcceptHeaderItem('value', array());
|
||||
$this->assertEquals(array(), $item->getAttributes());
|
||||
$item = new AcceptHeaderItem('value', []);
|
||||
$this->assertEquals([], $item->getAttributes());
|
||||
$this->assertFalse($item->hasAttribute('test'));
|
||||
$this->assertNull($item->getAttribute('test'));
|
||||
$this->assertEquals('default', $item->getAttribute('test', 'default'));
|
||||
|
||||
$item->setAttribute('test', 'value');
|
||||
$this->assertEquals(array('test' => 'value'), $item->getAttributes());
|
||||
$this->assertEquals(['test' => 'value'], $item->getAttributes());
|
||||
$this->assertTrue($item->hasAttribute('test'));
|
||||
$this->assertEquals('value', $item->getAttribute('test'));
|
||||
$this->assertEquals('value', $item->getAttribute('test', 'default'));
|
||||
|
||||
@@ -39,13 +39,13 @@ class AcceptHeaderTest extends TestCase
|
||||
|
||||
public function provideFromStringData()
|
||||
{
|
||||
return array(
|
||||
array('', array()),
|
||||
array('gzip', array(new AcceptHeaderItem('gzip'))),
|
||||
array('gzip,deflate,sdch', array(new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch'))),
|
||||
array("gzip, deflate\t,sdch", array(new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch'))),
|
||||
array('"this;should,not=matter"', array(new AcceptHeaderItem('this;should,not=matter'))),
|
||||
);
|
||||
return [
|
||||
['', []],
|
||||
['gzip', [new AcceptHeaderItem('gzip')]],
|
||||
['gzip,deflate,sdch', [new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')]],
|
||||
["gzip, deflate\t,sdch", [new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')]],
|
||||
['"this;should,not=matter"', [new AcceptHeaderItem('this;should,not=matter')]],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -59,12 +59,12 @@ class AcceptHeaderTest extends TestCase
|
||||
|
||||
public function provideToStringData()
|
||||
{
|
||||
return array(
|
||||
array(array(), ''),
|
||||
array(array(new AcceptHeaderItem('gzip')), 'gzip'),
|
||||
array(array(new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')), 'gzip,deflate,sdch'),
|
||||
array(array(new AcceptHeaderItem('this;should,not=matter')), 'this;should,not=matter'),
|
||||
);
|
||||
return [
|
||||
[[], ''],
|
||||
[[new AcceptHeaderItem('gzip')], 'gzip'],
|
||||
[[new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')], 'gzip,deflate,sdch'],
|
||||
[[new AcceptHeaderItem('this;should,not=matter')], 'this;should,not=matter'],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -78,9 +78,9 @@ class AcceptHeaderTest extends TestCase
|
||||
|
||||
public function provideFilterData()
|
||||
{
|
||||
return array(
|
||||
array('fr-FR,fr;q=0.8,en-US;q=0.6,en;q=0.4', '/fr.*/', array('fr-FR', 'fr')),
|
||||
);
|
||||
return [
|
||||
['fr-FR,fr;q=0.8,en-US;q=0.6,en;q=0.4', '/fr.*/', ['fr-FR', 'fr']],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -94,11 +94,11 @@ class AcceptHeaderTest extends TestCase
|
||||
|
||||
public function provideSortingData()
|
||||
{
|
||||
return array(
|
||||
'quality has priority' => array('*;q=0.3,ISO-8859-1,utf-8;q=0.7', array('ISO-8859-1', 'utf-8', '*')),
|
||||
'order matters when q is equal' => array('*;q=0.3,ISO-8859-1;q=0.7,utf-8;q=0.7', array('ISO-8859-1', 'utf-8', '*')),
|
||||
'order matters when q is equal2' => array('*;q=0.3,utf-8;q=0.7,ISO-8859-1;q=0.7', array('utf-8', 'ISO-8859-1', '*')),
|
||||
);
|
||||
return [
|
||||
'quality has priority' => ['*;q=0.3,ISO-8859-1,utf-8;q=0.7', ['ISO-8859-1', 'utf-8', '*']],
|
||||
'order matters when q is equal' => ['*;q=0.3,ISO-8859-1;q=0.7,utf-8;q=0.7', ['ISO-8859-1', 'utf-8', '*']],
|
||||
'order matters when q is equal2' => ['*;q=0.3,utf-8;q=0.7,ISO-8859-1;q=0.7', ['utf-8', 'ISO-8859-1', '*']],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -112,19 +112,19 @@ class AcceptHeaderTest extends TestCase
|
||||
|
||||
public function provideDefaultValueData()
|
||||
{
|
||||
yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, *;q=0.3', 'text/xml', 0.3);
|
||||
yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', 'text/xml', 0.3);
|
||||
yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', 'text/html', 1.0);
|
||||
yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', 'text/plain', 0.5);
|
||||
yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', '*', 0.3);
|
||||
yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*', '*', 1.0);
|
||||
yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*', 'text/xml', 1.0);
|
||||
yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*', 'text/*', 1.0);
|
||||
yield array('text/plain;q=0.5, text/html, text/*;q=0.8, */*', 'text/*', 0.8);
|
||||
yield array('text/plain;q=0.5, text/html, text/*;q=0.8, */*', 'text/html', 1.0);
|
||||
yield array('text/plain;q=0.5, text/html, text/*;q=0.8, */*', 'text/x-dvi', 0.8);
|
||||
yield array('*;q=0.3, ISO-8859-1;q=0.7, utf-8;q=0.7', '*', 0.3);
|
||||
yield array('*;q=0.3, ISO-8859-1;q=0.7, utf-8;q=0.7', 'utf-8', 0.7);
|
||||
yield array('*;q=0.3, ISO-8859-1;q=0.7, utf-8;q=0.7', 'SHIFT_JIS', 0.3);
|
||||
yield ['text/plain;q=0.5, text/html, text/x-dvi;q=0.8, *;q=0.3', 'text/xml', 0.3];
|
||||
yield ['text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', 'text/xml', 0.3];
|
||||
yield ['text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', 'text/html', 1.0];
|
||||
yield ['text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', 'text/plain', 0.5];
|
||||
yield ['text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', '*', 0.3];
|
||||
yield ['text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*', '*', 1.0];
|
||||
yield ['text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*', 'text/xml', 1.0];
|
||||
yield ['text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*', 'text/*', 1.0];
|
||||
yield ['text/plain;q=0.5, text/html, text/*;q=0.8, */*', 'text/*', 0.8];
|
||||
yield ['text/plain;q=0.5, text/html, text/*;q=0.8, */*', 'text/html', 1.0];
|
||||
yield ['text/plain;q=0.5, text/html, text/*;q=0.8, */*', 'text/x-dvi', 0.8];
|
||||
yield ['*;q=0.3, ISO-8859-1;q=0.7, utf-8;q=0.7', '*', 0.3];
|
||||
yield ['*;q=0.3, ISO-8859-1;q=0.7, utf-8;q=0.7', 'utf-8', 0.7];
|
||||
yield ['*;q=0.3, ISO-8859-1;q=0.7, utf-8;q=0.7', 'SHIFT_JIS', 0.3];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,63 +31,63 @@ class ApacheRequestTest extends TestCase
|
||||
|
||||
public function provideServerVars()
|
||||
{
|
||||
return array(
|
||||
array(
|
||||
array(
|
||||
return [
|
||||
[
|
||||
[
|
||||
'REQUEST_URI' => '/foo/app_dev.php/bar',
|
||||
'SCRIPT_NAME' => '/foo/app_dev.php',
|
||||
'PATH_INFO' => '/bar',
|
||||
),
|
||||
],
|
||||
'/foo/app_dev.php/bar',
|
||||
'/foo/app_dev.php',
|
||||
'/bar',
|
||||
),
|
||||
array(
|
||||
array(
|
||||
],
|
||||
[
|
||||
[
|
||||
'REQUEST_URI' => '/foo/bar',
|
||||
'SCRIPT_NAME' => '/foo/app_dev.php',
|
||||
),
|
||||
],
|
||||
'/foo/bar',
|
||||
'/foo',
|
||||
'/bar',
|
||||
),
|
||||
array(
|
||||
array(
|
||||
],
|
||||
[
|
||||
[
|
||||
'REQUEST_URI' => '/app_dev.php/foo/bar',
|
||||
'SCRIPT_NAME' => '/app_dev.php',
|
||||
'PATH_INFO' => '/foo/bar',
|
||||
),
|
||||
],
|
||||
'/app_dev.php/foo/bar',
|
||||
'/app_dev.php',
|
||||
'/foo/bar',
|
||||
),
|
||||
array(
|
||||
array(
|
||||
],
|
||||
[
|
||||
[
|
||||
'REQUEST_URI' => '/foo/bar',
|
||||
'SCRIPT_NAME' => '/app_dev.php',
|
||||
),
|
||||
],
|
||||
'/foo/bar',
|
||||
'',
|
||||
'/foo/bar',
|
||||
),
|
||||
array(
|
||||
array(
|
||||
],
|
||||
[
|
||||
[
|
||||
'REQUEST_URI' => '/app_dev.php',
|
||||
'SCRIPT_NAME' => '/app_dev.php',
|
||||
),
|
||||
],
|
||||
'/app_dev.php',
|
||||
'/app_dev.php',
|
||||
'/',
|
||||
),
|
||||
array(
|
||||
array(
|
||||
],
|
||||
[
|
||||
[
|
||||
'REQUEST_URI' => '/',
|
||||
'SCRIPT_NAME' => '/app_dev.php',
|
||||
),
|
||||
],
|
||||
'/',
|
||||
'',
|
||||
'/',
|
||||
),
|
||||
);
|
||||
],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,14 +22,14 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
public function testConstruction()
|
||||
{
|
||||
$file = __DIR__.'/../README.md';
|
||||
$response = new BinaryFileResponse($file, 404, array('X-Header' => 'Foo'), true, null, true, true);
|
||||
$response = new BinaryFileResponse($file, 404, ['X-Header' => 'Foo'], true, null, true, true);
|
||||
$this->assertEquals(404, $response->getStatusCode());
|
||||
$this->assertEquals('Foo', $response->headers->get('X-Header'));
|
||||
$this->assertTrue($response->headers->has('ETag'));
|
||||
$this->assertTrue($response->headers->has('Last-Modified'));
|
||||
$this->assertFalse($response->headers->has('Content-Disposition'));
|
||||
|
||||
$response = BinaryFileResponse::create($file, 404, array(), true, ResponseHeaderBag::DISPOSITION_INLINE);
|
||||
$response = BinaryFileResponse::create($file, 404, [], true, ResponseHeaderBag::DISPOSITION_INLINE);
|
||||
$this->assertEquals(404, $response->getStatusCode());
|
||||
$this->assertFalse($response->headers->has('ETag'));
|
||||
$this->assertEquals('inline; filename=README.md', $response->headers->get('Content-Disposition'));
|
||||
@@ -39,7 +39,7 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
{
|
||||
touch(sys_get_temp_dir().'/fööö.html');
|
||||
|
||||
$response = new BinaryFileResponse(sys_get_temp_dir().'/fööö.html', 200, array(), true, 'attachment');
|
||||
$response = new BinaryFileResponse(sys_get_temp_dir().'/fööö.html', 200, [], true, 'attachment');
|
||||
|
||||
@unlink(sys_get_temp_dir().'/fööö.html');
|
||||
|
||||
@@ -85,7 +85,7 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
*/
|
||||
public function testRequests($requestRange, $offset, $length, $responseRange)
|
||||
{
|
||||
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, array('Content-Type' => 'application/octet-stream'))->setAutoEtag();
|
||||
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream'])->setAutoEtag();
|
||||
|
||||
// do a request to get the ETag
|
||||
$request = Request::create('/');
|
||||
@@ -117,7 +117,7 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
*/
|
||||
public function testRequestsWithoutEtag($requestRange, $offset, $length, $responseRange)
|
||||
{
|
||||
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, array('Content-Type' => 'application/octet-stream'));
|
||||
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream']);
|
||||
|
||||
// do a request to get the LastModified
|
||||
$request = Request::create('/');
|
||||
@@ -145,19 +145,19 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
|
||||
public function provideRanges()
|
||||
{
|
||||
return array(
|
||||
array('bytes=1-4', 1, 4, 'bytes 1-4/35'),
|
||||
array('bytes=-5', 30, 5, 'bytes 30-34/35'),
|
||||
array('bytes=30-', 30, 5, 'bytes 30-34/35'),
|
||||
array('bytes=30-30', 30, 1, 'bytes 30-30/35'),
|
||||
array('bytes=30-34', 30, 5, 'bytes 30-34/35'),
|
||||
);
|
||||
return [
|
||||
['bytes=1-4', 1, 4, 'bytes 1-4/35'],
|
||||
['bytes=-5', 30, 5, 'bytes 30-34/35'],
|
||||
['bytes=30-', 30, 5, 'bytes 30-34/35'],
|
||||
['bytes=30-30', 30, 1, 'bytes 30-30/35'],
|
||||
['bytes=30-34', 30, 5, 'bytes 30-34/35'],
|
||||
];
|
||||
}
|
||||
|
||||
public function testRangeRequestsWithoutLastModifiedDate()
|
||||
{
|
||||
// prevent auto last modified
|
||||
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, array('Content-Type' => 'application/octet-stream'), true, null, false, false);
|
||||
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream'], true, null, false, false);
|
||||
|
||||
// prepare a request for a range of the testing file
|
||||
$request = Request::create('/');
|
||||
@@ -178,7 +178,7 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
*/
|
||||
public function testFullFileRequests($requestRange)
|
||||
{
|
||||
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, array('Content-Type' => 'application/octet-stream'))->setAutoEtag();
|
||||
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream'])->setAutoEtag();
|
||||
|
||||
// prepare a request for a range of the testing file
|
||||
$request = Request::create('/');
|
||||
@@ -198,14 +198,14 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
|
||||
public function provideFullFileRanges()
|
||||
{
|
||||
return array(
|
||||
array('bytes=0-'),
|
||||
array('bytes=0-34'),
|
||||
array('bytes=-35'),
|
||||
return [
|
||||
['bytes=0-'],
|
||||
['bytes=0-34'],
|
||||
['bytes=-35'],
|
||||
// Syntactical invalid range-request should also return the full resource
|
||||
array('bytes=20-10'),
|
||||
array('bytes=50-40'),
|
||||
);
|
||||
['bytes=20-10'],
|
||||
['bytes=50-40'],
|
||||
];
|
||||
}
|
||||
|
||||
public function testUnpreparedResponseSendsFullFile()
|
||||
@@ -226,7 +226,7 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
*/
|
||||
public function testInvalidRequests($requestRange)
|
||||
{
|
||||
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, array('Content-Type' => 'application/octet-stream'))->setAutoEtag();
|
||||
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream'])->setAutoEtag();
|
||||
|
||||
// prepare a request for a range of the testing file
|
||||
$request = Request::create('/');
|
||||
@@ -242,10 +242,10 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
|
||||
public function provideInvalidRanges()
|
||||
{
|
||||
return array(
|
||||
array('bytes=-40'),
|
||||
array('bytes=30-40'),
|
||||
);
|
||||
return [
|
||||
['bytes=-40'],
|
||||
['bytes=30-40'],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -257,7 +257,7 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
$request->headers->set('X-Sendfile-Type', 'X-Sendfile');
|
||||
|
||||
BinaryFileResponse::trustXSendfileTypeHeader();
|
||||
$response = BinaryFileResponse::create($file, 200, array('Content-Type' => 'application/octet-stream'));
|
||||
$response = BinaryFileResponse::create($file, 200, ['Content-Type' => 'application/octet-stream']);
|
||||
$response->prepare($request);
|
||||
|
||||
$this->expectOutputString('');
|
||||
@@ -268,10 +268,10 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
|
||||
public function provideXSendfileFiles()
|
||||
{
|
||||
return array(
|
||||
array(__DIR__.'/../README.md'),
|
||||
array('file://'.__DIR__.'/../README.md'),
|
||||
);
|
||||
return [
|
||||
[__DIR__.'/../README.md'],
|
||||
['file://'.__DIR__.'/../README.md'],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -286,7 +286,7 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
$file = new FakeFile($realpath, __DIR__.'/File/Fixtures/test');
|
||||
|
||||
BinaryFileResponse::trustXSendfileTypeHeader();
|
||||
$response = new BinaryFileResponse($file, 200, array('Content-Type' => 'application/octet-stream'));
|
||||
$response = new BinaryFileResponse($file, 200, ['Content-Type' => 'application/octet-stream']);
|
||||
$reflection = new \ReflectionObject($response);
|
||||
$property = $reflection->getProperty('file');
|
||||
$property->setAccessible(true);
|
||||
@@ -305,7 +305,7 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
$realPath = realpath($path);
|
||||
$this->assertFileExists($realPath);
|
||||
|
||||
$response = new BinaryFileResponse($realPath, 200, array('Content-Type' => 'application/octet-stream'));
|
||||
$response = new BinaryFileResponse($realPath, 200, ['Content-Type' => 'application/octet-stream']);
|
||||
$response->deleteFileAfterSend(true);
|
||||
|
||||
$response->prepare($request);
|
||||
@@ -317,7 +317,7 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
public function testAcceptRangeOnUnsafeMethods()
|
||||
{
|
||||
$request = Request::create('/', 'POST');
|
||||
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, array('Content-Type' => 'application/octet-stream'));
|
||||
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream']);
|
||||
$response->prepare($request);
|
||||
|
||||
$this->assertEquals('none', $response->headers->get('Accept-Ranges'));
|
||||
@@ -326,7 +326,7 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
public function testAcceptRangeNotOverriden()
|
||||
{
|
||||
$request = Request::create('/', 'POST');
|
||||
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, array('Content-Type' => 'application/octet-stream'));
|
||||
$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200, ['Content-Type' => 'application/octet-stream']);
|
||||
$response->headers->set('Accept-Ranges', 'foo');
|
||||
$response->prepare($request);
|
||||
|
||||
@@ -335,17 +335,17 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
|
||||
public function getSampleXAccelMappings()
|
||||
{
|
||||
return array(
|
||||
array('/var/www/var/www/files/foo.txt', '/var/www/=/files/', '/files/var/www/files/foo.txt'),
|
||||
array('/home/Foo/bar.txt', '/var/www/=/files/,/home/Foo/=/baz/', '/baz/bar.txt'),
|
||||
array('/home/Foo/bar.txt', '"/var/www/"="/files/", "/home/Foo/"="/baz/"', '/baz/bar.txt'),
|
||||
);
|
||||
return [
|
||||
['/var/www/var/www/files/foo.txt', '/var/www/=/files/', '/files/var/www/files/foo.txt'],
|
||||
['/home/Foo/bar.txt', '/var/www/=/files/,/home/Foo/=/baz/', '/baz/bar.txt'],
|
||||
['/home/Foo/bar.txt', '"/var/www/"="/files/", "/home/Foo/"="/baz/"', '/baz/bar.txt'],
|
||||
];
|
||||
}
|
||||
|
||||
public function testStream()
|
||||
{
|
||||
$request = Request::create('/');
|
||||
$response = new BinaryFileResponse(new Stream(__DIR__.'/../README.md'), 200, array('Content-Type' => 'text/plain'));
|
||||
$response = new BinaryFileResponse(new Stream(__DIR__.'/../README.md'), 200, ['Content-Type' => 'text/plain']);
|
||||
$response->prepare($request);
|
||||
|
||||
$this->assertNull($response->headers->get('Content-Length'));
|
||||
@@ -353,7 +353,7 @@ class BinaryFileResponseTest extends ResponseTestCase
|
||||
|
||||
protected function provideResponse()
|
||||
{
|
||||
return new BinaryFileResponse(__DIR__.'/../README.md', 200, array('Content-Type' => 'application/octet-stream'));
|
||||
return new BinaryFileResponse(__DIR__.'/../README.md', 200, ['Content-Type' => 'application/octet-stream']);
|
||||
}
|
||||
|
||||
public static function tearDownAfterClass()
|
||||
|
||||
@@ -26,17 +26,17 @@ class CookieTest extends TestCase
|
||||
{
|
||||
public function invalidNames()
|
||||
{
|
||||
return array(
|
||||
array(''),
|
||||
array(',MyName'),
|
||||
array(';MyName'),
|
||||
array(' MyName'),
|
||||
array("\tMyName"),
|
||||
array("\rMyName"),
|
||||
array("\nMyName"),
|
||||
array("\013MyName"),
|
||||
array("\014MyName"),
|
||||
);
|
||||
return [
|
||||
[''],
|
||||
[',MyName'],
|
||||
[';MyName'],
|
||||
[' MyName'],
|
||||
["\tMyName"],
|
||||
["\rMyName"],
|
||||
["\nMyName"],
|
||||
["\013MyName"],
|
||||
["\014MyName"],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -55,15 +55,15 @@ class ExpressionRequestMatcherTest extends TestCase
|
||||
|
||||
public function provideExpressions()
|
||||
{
|
||||
return array(
|
||||
array('request.getMethod() == method', true),
|
||||
array('request.getPathInfo() == path', true),
|
||||
array('request.getHost() == host', true),
|
||||
array('request.getClientIp() == ip', true),
|
||||
array('request.attributes.all() == attributes', true),
|
||||
array('request.getMethod() == method && request.getPathInfo() == path && request.getHost() == host && request.getClientIp() == ip && request.attributes.all() == attributes', true),
|
||||
array('request.getMethod() != method', false),
|
||||
array('request.getMethod() != method && request.getPathInfo() == path && request.getHost() == host && request.getClientIp() == ip && request.attributes.all() == attributes', false),
|
||||
);
|
||||
return [
|
||||
['request.getMethod() == method', true],
|
||||
['request.getPathInfo() == path', true],
|
||||
['request.getHost() == host', true],
|
||||
['request.getClientIp() == ip', true],
|
||||
['request.attributes.all() == attributes', true],
|
||||
['request.getMethod() == method && request.getPathInfo() == path && request.getHost() == host && request.getClientIp() == ip && request.attributes.all() == attributes', true],
|
||||
['request.getMethod() != method', false],
|
||||
['request.getMethod() != method && request.getPathInfo() == path && request.getHost() == host && request.getClientIp() == ip && request.attributes.all() == attributes', false],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -110,14 +110,14 @@ class FileTest extends TestCase
|
||||
|
||||
public function getFilenameFixtures()
|
||||
{
|
||||
return array(
|
||||
array('original.gif', 'original.gif'),
|
||||
array('..\\..\\original.gif', 'original.gif'),
|
||||
array('../../original.gif', 'original.gif'),
|
||||
array('файлfile.gif', 'файлfile.gif'),
|
||||
array('..\\..\\файлfile.gif', 'файлfile.gif'),
|
||||
array('../../файлfile.gif', 'файлfile.gif'),
|
||||
);
|
||||
return [
|
||||
['original.gif', 'original.gif'],
|
||||
['..\\..\\original.gif', 'original.gif'],
|
||||
['../../original.gif', 'original.gif'],
|
||||
['файлfile.gif', 'файлfile.gif'],
|
||||
['..\\..\\файлfile.gif', 'файлfile.gif'],
|
||||
['../../файлfile.gif', 'файлfile.gif'],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -94,6 +94,18 @@ class UploadedFileTest extends TestCase
|
||||
$this->assertEquals('jpeg', $file->guessClientExtension());
|
||||
}
|
||||
|
||||
public function testCaseSensitiveMimeType()
|
||||
{
|
||||
$file = new UploadedFile(
|
||||
__DIR__.'/Fixtures/case-sensitive-mime-type.xlsm',
|
||||
'test.xlsm',
|
||||
'application/vnd.ms-excel.sheet.macroEnabled.12',
|
||||
null
|
||||
);
|
||||
|
||||
$this->assertEquals('xlsm', $file->guessClientExtension());
|
||||
}
|
||||
|
||||
public function testErrorIsOkByDefault()
|
||||
{
|
||||
$file = new UploadedFile(
|
||||
@@ -147,13 +159,13 @@ class UploadedFileTest extends TestCase
|
||||
|
||||
public function failedUploadedFile()
|
||||
{
|
||||
foreach (array(UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_PARTIAL, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_CANT_WRITE, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_EXTENSION, -1) as $error) {
|
||||
yield array(new UploadedFile(
|
||||
foreach ([UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_PARTIAL, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_CANT_WRITE, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_EXTENSION, -1] as $error) {
|
||||
yield [new UploadedFile(
|
||||
__DIR__.'/Fixtures/test.gif',
|
||||
'original.gif',
|
||||
'image/gif',
|
||||
$error
|
||||
));
|
||||
)];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -323,13 +335,13 @@ class UploadedFileTest extends TestCase
|
||||
|
||||
public function uploadedFileErrorProvider()
|
||||
{
|
||||
return array(
|
||||
array(UPLOAD_ERR_INI_SIZE),
|
||||
array(UPLOAD_ERR_FORM_SIZE),
|
||||
array(UPLOAD_ERR_PARTIAL),
|
||||
array(UPLOAD_ERR_NO_TMP_DIR),
|
||||
array(UPLOAD_ERR_EXTENSION),
|
||||
);
|
||||
return [
|
||||
[UPLOAD_ERR_INI_SIZE],
|
||||
[UPLOAD_ERR_FORM_SIZE],
|
||||
[UPLOAD_ERR_PARTIAL],
|
||||
[UPLOAD_ERR_NO_TMP_DIR],
|
||||
[UPLOAD_ERR_EXTENSION],
|
||||
];
|
||||
}
|
||||
|
||||
public function testIsInvalidIfNotHttpUpload()
|
||||
|
||||
110
vendor/symfony/http-foundation/Tests/FileBagTest.php
vendored
110
vendor/symfony/http-foundation/Tests/FileBagTest.php
vendored
@@ -28,7 +28,7 @@ class FileBagTest extends TestCase
|
||||
*/
|
||||
public function testFileMustBeAnArrayOrUploadedFile()
|
||||
{
|
||||
new FileBag(array('file' => 'foo'));
|
||||
new FileBag(['file' => 'foo']);
|
||||
}
|
||||
|
||||
public function testShouldConvertsUploadedFiles()
|
||||
@@ -36,54 +36,54 @@ class FileBagTest extends TestCase
|
||||
$tmpFile = $this->createTempFile();
|
||||
$file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain');
|
||||
|
||||
$bag = new FileBag(array('file' => array(
|
||||
$bag = new FileBag(['file' => [
|
||||
'name' => basename($tmpFile),
|
||||
'type' => 'text/plain',
|
||||
'tmp_name' => $tmpFile,
|
||||
'error' => 0,
|
||||
'size' => null,
|
||||
)));
|
||||
]]);
|
||||
|
||||
$this->assertEquals($file, $bag->get('file'));
|
||||
}
|
||||
|
||||
public function testShouldSetEmptyUploadedFilesToNull()
|
||||
{
|
||||
$bag = new FileBag(array('file' => array(
|
||||
$bag = new FileBag(['file' => [
|
||||
'name' => '',
|
||||
'type' => '',
|
||||
'tmp_name' => '',
|
||||
'error' => UPLOAD_ERR_NO_FILE,
|
||||
'size' => 0,
|
||||
)));
|
||||
]]);
|
||||
|
||||
$this->assertNull($bag->get('file'));
|
||||
}
|
||||
|
||||
public function testShouldRemoveEmptyUploadedFilesForMultiUpload()
|
||||
{
|
||||
$bag = new FileBag(array('files' => array(
|
||||
'name' => array(''),
|
||||
'type' => array(''),
|
||||
'tmp_name' => array(''),
|
||||
'error' => array(UPLOAD_ERR_NO_FILE),
|
||||
'size' => array(0),
|
||||
)));
|
||||
$bag = new FileBag(['files' => [
|
||||
'name' => [''],
|
||||
'type' => [''],
|
||||
'tmp_name' => [''],
|
||||
'error' => [UPLOAD_ERR_NO_FILE],
|
||||
'size' => [0],
|
||||
]]);
|
||||
|
||||
$this->assertSame(array(), $bag->get('files'));
|
||||
$this->assertSame([], $bag->get('files'));
|
||||
}
|
||||
|
||||
public function testShouldNotRemoveEmptyUploadedFilesForAssociativeArray()
|
||||
{
|
||||
$bag = new FileBag(array('files' => array(
|
||||
'name' => array('file1' => ''),
|
||||
'type' => array('file1' => ''),
|
||||
'tmp_name' => array('file1' => ''),
|
||||
'error' => array('file1' => UPLOAD_ERR_NO_FILE),
|
||||
'size' => array('file1' => 0),
|
||||
)));
|
||||
$bag = new FileBag(['files' => [
|
||||
'name' => ['file1' => ''],
|
||||
'type' => ['file1' => ''],
|
||||
'tmp_name' => ['file1' => ''],
|
||||
'error' => ['file1' => UPLOAD_ERR_NO_FILE],
|
||||
'size' => ['file1' => 0],
|
||||
]]);
|
||||
|
||||
$this->assertSame(array('file1' => null), $bag->get('files'));
|
||||
$this->assertSame(['file1' => null], $bag->get('files'));
|
||||
}
|
||||
|
||||
public function testShouldConvertUploadedFilesWithPhpBug()
|
||||
@@ -91,25 +91,25 @@ class FileBagTest extends TestCase
|
||||
$tmpFile = $this->createTempFile();
|
||||
$file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain');
|
||||
|
||||
$bag = new FileBag(array(
|
||||
'child' => array(
|
||||
'name' => array(
|
||||
$bag = new FileBag([
|
||||
'child' => [
|
||||
'name' => [
|
||||
'file' => basename($tmpFile),
|
||||
),
|
||||
'type' => array(
|
||||
],
|
||||
'type' => [
|
||||
'file' => 'text/plain',
|
||||
),
|
||||
'tmp_name' => array(
|
||||
],
|
||||
'tmp_name' => [
|
||||
'file' => $tmpFile,
|
||||
),
|
||||
'error' => array(
|
||||
],
|
||||
'error' => [
|
||||
'file' => 0,
|
||||
),
|
||||
'size' => array(
|
||||
],
|
||||
'size' => [
|
||||
'file' => null,
|
||||
),
|
||||
),
|
||||
));
|
||||
],
|
||||
],
|
||||
]);
|
||||
|
||||
$files = $bag->all();
|
||||
$this->assertEquals($file, $files['child']['file']);
|
||||
@@ -120,25 +120,25 @@ class FileBagTest extends TestCase
|
||||
$tmpFile = $this->createTempFile();
|
||||
$file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain');
|
||||
|
||||
$bag = new FileBag(array(
|
||||
'child' => array(
|
||||
'name' => array(
|
||||
'sub' => array('file' => basename($tmpFile)),
|
||||
),
|
||||
'type' => array(
|
||||
'sub' => array('file' => 'text/plain'),
|
||||
),
|
||||
'tmp_name' => array(
|
||||
'sub' => array('file' => $tmpFile),
|
||||
),
|
||||
'error' => array(
|
||||
'sub' => array('file' => 0),
|
||||
),
|
||||
'size' => array(
|
||||
'sub' => array('file' => null),
|
||||
),
|
||||
),
|
||||
));
|
||||
$bag = new FileBag([
|
||||
'child' => [
|
||||
'name' => [
|
||||
'sub' => ['file' => basename($tmpFile)],
|
||||
],
|
||||
'type' => [
|
||||
'sub' => ['file' => 'text/plain'],
|
||||
],
|
||||
'tmp_name' => [
|
||||
'sub' => ['file' => $tmpFile],
|
||||
],
|
||||
'error' => [
|
||||
'sub' => ['file' => 0],
|
||||
],
|
||||
'size' => [
|
||||
'sub' => ['file' => null],
|
||||
],
|
||||
],
|
||||
]);
|
||||
|
||||
$files = $bag->all();
|
||||
$this->assertEquals($file, $files['child']['sub']['file']);
|
||||
@@ -148,7 +148,7 @@ class FileBagTest extends TestCase
|
||||
{
|
||||
$tmpFile = $this->createTempFile();
|
||||
$file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain');
|
||||
$bag = new FileBag(array('image' => array('file' => $file)));
|
||||
$bag = new FileBag(['image' => ['file' => $file]]);
|
||||
|
||||
$files = $bag->all();
|
||||
$this->assertEquals($file, $files['image']['file']);
|
||||
|
||||
@@ -18,7 +18,7 @@ class HeaderBagTest extends TestCase
|
||||
{
|
||||
public function testConstructor()
|
||||
{
|
||||
$bag = new HeaderBag(array('foo' => 'bar'));
|
||||
$bag = new HeaderBag(['foo' => 'bar']);
|
||||
$this->assertTrue($bag->has('foo'));
|
||||
}
|
||||
|
||||
@@ -30,20 +30,20 @@ class HeaderBagTest extends TestCase
|
||||
|
||||
public function testToStringNotNull()
|
||||
{
|
||||
$bag = new HeaderBag(array('foo' => 'bar'));
|
||||
$bag = new HeaderBag(['foo' => 'bar']);
|
||||
$this->assertEquals("Foo: bar\r\n", $bag->__toString());
|
||||
}
|
||||
|
||||
public function testKeys()
|
||||
{
|
||||
$bag = new HeaderBag(array('foo' => 'bar'));
|
||||
$bag = new HeaderBag(['foo' => 'bar']);
|
||||
$keys = $bag->keys();
|
||||
$this->assertEquals('foo', $keys[0]);
|
||||
}
|
||||
|
||||
public function testGetDate()
|
||||
{
|
||||
$bag = new HeaderBag(array('foo' => 'Tue, 4 Sep 2012 20:00:00 +0200'));
|
||||
$bag = new HeaderBag(['foo' => 'Tue, 4 Sep 2012 20:00:00 +0200']);
|
||||
$headerDate = $bag->getDate('foo');
|
||||
$this->assertInstanceOf('DateTime', $headerDate);
|
||||
}
|
||||
@@ -53,7 +53,7 @@ class HeaderBagTest extends TestCase
|
||||
*/
|
||||
public function testGetDateException()
|
||||
{
|
||||
$bag = new HeaderBag(array('foo' => 'Tue'));
|
||||
$bag = new HeaderBag(['foo' => 'Tue']);
|
||||
$headerDate = $bag->getDate('foo');
|
||||
}
|
||||
|
||||
@@ -67,50 +67,50 @@ class HeaderBagTest extends TestCase
|
||||
|
||||
public function testAll()
|
||||
{
|
||||
$bag = new HeaderBag(array('foo' => 'bar'));
|
||||
$this->assertEquals(array('foo' => array('bar')), $bag->all(), '->all() gets all the input');
|
||||
$bag = new HeaderBag(['foo' => 'bar']);
|
||||
$this->assertEquals(['foo' => ['bar']], $bag->all(), '->all() gets all the input');
|
||||
|
||||
$bag = new HeaderBag(array('FOO' => 'BAR'));
|
||||
$this->assertEquals(array('foo' => array('BAR')), $bag->all(), '->all() gets all the input key are lower case');
|
||||
$bag = new HeaderBag(['FOO' => 'BAR']);
|
||||
$this->assertEquals(['foo' => ['BAR']], $bag->all(), '->all() gets all the input key are lower case');
|
||||
}
|
||||
|
||||
public function testReplace()
|
||||
{
|
||||
$bag = new HeaderBag(array('foo' => 'bar'));
|
||||
$bag = new HeaderBag(['foo' => 'bar']);
|
||||
|
||||
$bag->replace(array('NOPE' => 'BAR'));
|
||||
$this->assertEquals(array('nope' => array('BAR')), $bag->all(), '->replace() replaces the input with the argument');
|
||||
$bag->replace(['NOPE' => 'BAR']);
|
||||
$this->assertEquals(['nope' => ['BAR']], $bag->all(), '->replace() replaces the input with the argument');
|
||||
$this->assertFalse($bag->has('foo'), '->replace() overrides previously set the input');
|
||||
}
|
||||
|
||||
public function testGet()
|
||||
{
|
||||
$bag = new HeaderBag(array('foo' => 'bar', 'fuzz' => 'bizz'));
|
||||
$bag = new HeaderBag(['foo' => 'bar', 'fuzz' => 'bizz']);
|
||||
$this->assertEquals('bar', $bag->get('foo'), '->get return current value');
|
||||
$this->assertEquals('bar', $bag->get('FoO'), '->get key in case insensitive');
|
||||
$this->assertEquals(array('bar'), $bag->get('foo', 'nope', false), '->get return the value as array');
|
||||
$this->assertEquals(['bar'], $bag->get('foo', 'nope', false), '->get return the value as array');
|
||||
|
||||
// defaults
|
||||
$this->assertNull($bag->get('none'), '->get unknown values returns null');
|
||||
$this->assertEquals('default', $bag->get('none', 'default'), '->get unknown values returns default');
|
||||
$this->assertEquals(array('default'), $bag->get('none', 'default', false), '->get unknown values returns default as array');
|
||||
$this->assertEquals(['default'], $bag->get('none', 'default', false), '->get unknown values returns default as array');
|
||||
|
||||
$bag->set('foo', 'bor', false);
|
||||
$this->assertEquals('bar', $bag->get('foo'), '->get return first value');
|
||||
$this->assertEquals(array('bar', 'bor'), $bag->get('foo', 'nope', false), '->get return all values as array');
|
||||
$this->assertEquals(['bar', 'bor'], $bag->get('foo', 'nope', false), '->get return all values as array');
|
||||
}
|
||||
|
||||
public function testSetAssociativeArray()
|
||||
{
|
||||
$bag = new HeaderBag();
|
||||
$bag->set('foo', array('bad-assoc-index' => 'value'));
|
||||
$bag->set('foo', ['bad-assoc-index' => 'value']);
|
||||
$this->assertSame('value', $bag->get('foo'));
|
||||
$this->assertEquals(array('value'), $bag->get('foo', 'nope', false), 'assoc indices of multi-valued headers are ignored');
|
||||
$this->assertEquals(['value'], $bag->get('foo', 'nope', false), 'assoc indices of multi-valued headers are ignored');
|
||||
}
|
||||
|
||||
public function testContains()
|
||||
{
|
||||
$bag = new HeaderBag(array('foo' => 'bar', 'fuzz' => 'bizz'));
|
||||
$bag = new HeaderBag(['foo' => 'bar', 'fuzz' => 'bizz']);
|
||||
$this->assertTrue($bag->contains('foo', 'bar'), '->contains first value');
|
||||
$this->assertTrue($bag->contains('fuzz', 'bizz'), '->contains second value');
|
||||
$this->assertFalse($bag->contains('nope', 'nope'), '->contains unknown value');
|
||||
@@ -143,7 +143,7 @@ class HeaderBagTest extends TestCase
|
||||
|
||||
public function testCacheControlDirectiveParsing()
|
||||
{
|
||||
$bag = new HeaderBag(array('cache-control' => 'public, max-age=10'));
|
||||
$bag = new HeaderBag(['cache-control' => 'public, max-age=10']);
|
||||
$this->assertTrue($bag->hasCacheControlDirective('public'));
|
||||
$this->assertTrue($bag->getCacheControlDirective('public'));
|
||||
|
||||
@@ -156,15 +156,15 @@ class HeaderBagTest extends TestCase
|
||||
|
||||
public function testCacheControlDirectiveParsingQuotedZero()
|
||||
{
|
||||
$bag = new HeaderBag(array('cache-control' => 'max-age="0"'));
|
||||
$bag = new HeaderBag(['cache-control' => 'max-age="0"']);
|
||||
$this->assertTrue($bag->hasCacheControlDirective('max-age'));
|
||||
$this->assertEquals(0, $bag->getCacheControlDirective('max-age'));
|
||||
}
|
||||
|
||||
public function testCacheControlDirectiveOverrideWithReplace()
|
||||
{
|
||||
$bag = new HeaderBag(array('cache-control' => 'private, max-age=100'));
|
||||
$bag->replace(array('cache-control' => 'public, max-age=10'));
|
||||
$bag = new HeaderBag(['cache-control' => 'private, max-age=100']);
|
||||
$bag->replace(['cache-control' => 'public, max-age=10']);
|
||||
$this->assertTrue($bag->hasCacheControlDirective('public'));
|
||||
$this->assertTrue($bag->getCacheControlDirective('public'));
|
||||
|
||||
@@ -174,7 +174,7 @@ class HeaderBagTest extends TestCase
|
||||
|
||||
public function testCacheControlClone()
|
||||
{
|
||||
$headers = array('foo' => 'bar');
|
||||
$headers = ['foo' => 'bar'];
|
||||
$bag1 = new HeaderBag($headers);
|
||||
$bag2 = new HeaderBag($bag1->all());
|
||||
|
||||
@@ -183,13 +183,13 @@ class HeaderBagTest extends TestCase
|
||||
|
||||
public function testGetIterator()
|
||||
{
|
||||
$headers = array('foo' => 'bar', 'hello' => 'world', 'third' => 'charm');
|
||||
$headers = ['foo' => 'bar', 'hello' => 'world', 'third' => 'charm'];
|
||||
$headerBag = new HeaderBag($headers);
|
||||
|
||||
$i = 0;
|
||||
foreach ($headerBag as $key => $val) {
|
||||
++$i;
|
||||
$this->assertEquals(array($headers[$key]), $val);
|
||||
$this->assertEquals([$headers[$key]], $val);
|
||||
}
|
||||
|
||||
$this->assertEquals(\count($headers), $i);
|
||||
@@ -197,7 +197,7 @@ class HeaderBagTest extends TestCase
|
||||
|
||||
public function testCount()
|
||||
{
|
||||
$headers = array('foo' => 'bar', 'HELLO' => 'WORLD');
|
||||
$headers = ['foo' => 'bar', 'HELLO' => 'WORLD'];
|
||||
$headerBag = new HeaderBag($headers);
|
||||
|
||||
$this->assertCount(\count($headers), $headerBag);
|
||||
|
||||
@@ -18,48 +18,48 @@ class HeaderUtilsTest extends TestCase
|
||||
{
|
||||
public function testSplit()
|
||||
{
|
||||
$this->assertSame(array('foo=123', 'bar'), HeaderUtils::split('foo=123,bar', ','));
|
||||
$this->assertSame(array('foo=123', 'bar'), HeaderUtils::split('foo=123, bar', ','));
|
||||
$this->assertSame(array(array('foo=123', 'bar')), HeaderUtils::split('foo=123; bar', ',;'));
|
||||
$this->assertSame(array(array('foo=123'), array('bar')), HeaderUtils::split('foo=123, bar', ',;'));
|
||||
$this->assertSame(array('foo', '123, bar'), HeaderUtils::split('foo=123, bar', '='));
|
||||
$this->assertSame(array('foo', '123, bar'), HeaderUtils::split(' foo = 123, bar ', '='));
|
||||
$this->assertSame(array(array('foo', '123'), array('bar')), HeaderUtils::split('foo=123, bar', ',='));
|
||||
$this->assertSame(array(array(array('foo', '123')), array(array('bar'), array('foo', '456'))), HeaderUtils::split('foo=123, bar; foo=456', ',;='));
|
||||
$this->assertSame(array(array(array('foo', 'a,b;c=d'))), HeaderUtils::split('foo="a,b;c=d"', ',;='));
|
||||
$this->assertSame(['foo=123', 'bar'], HeaderUtils::split('foo=123,bar', ','));
|
||||
$this->assertSame(['foo=123', 'bar'], HeaderUtils::split('foo=123, bar', ','));
|
||||
$this->assertSame([['foo=123', 'bar']], HeaderUtils::split('foo=123; bar', ',;'));
|
||||
$this->assertSame([['foo=123'], ['bar']], HeaderUtils::split('foo=123, bar', ',;'));
|
||||
$this->assertSame(['foo', '123, bar'], HeaderUtils::split('foo=123, bar', '='));
|
||||
$this->assertSame(['foo', '123, bar'], HeaderUtils::split(' foo = 123, bar ', '='));
|
||||
$this->assertSame([['foo', '123'], ['bar']], HeaderUtils::split('foo=123, bar', ',='));
|
||||
$this->assertSame([[['foo', '123']], [['bar'], ['foo', '456']]], HeaderUtils::split('foo=123, bar; foo=456', ',;='));
|
||||
$this->assertSame([[['foo', 'a,b;c=d']]], HeaderUtils::split('foo="a,b;c=d"', ',;='));
|
||||
|
||||
$this->assertSame(array('foo', 'bar'), HeaderUtils::split('foo,,,, bar', ','));
|
||||
$this->assertSame(array('foo', 'bar'), HeaderUtils::split(',foo, bar,', ','));
|
||||
$this->assertSame(array('foo', 'bar'), HeaderUtils::split(' , foo, bar, ', ','));
|
||||
$this->assertSame(array('foo bar'), HeaderUtils::split('foo "bar"', ','));
|
||||
$this->assertSame(array('foo bar'), HeaderUtils::split('"foo" bar', ','));
|
||||
$this->assertSame(array('foo bar'), HeaderUtils::split('"foo" "bar"', ','));
|
||||
$this->assertSame(['foo', 'bar'], HeaderUtils::split('foo,,,, bar', ','));
|
||||
$this->assertSame(['foo', 'bar'], HeaderUtils::split(',foo, bar,', ','));
|
||||
$this->assertSame(['foo', 'bar'], HeaderUtils::split(' , foo, bar, ', ','));
|
||||
$this->assertSame(['foo bar'], HeaderUtils::split('foo "bar"', ','));
|
||||
$this->assertSame(['foo bar'], HeaderUtils::split('"foo" bar', ','));
|
||||
$this->assertSame(['foo bar'], HeaderUtils::split('"foo" "bar"', ','));
|
||||
|
||||
// These are not a valid header values. We test that they parse anyway,
|
||||
// and that both the valid and invalid parts are returned.
|
||||
$this->assertSame(array(), HeaderUtils::split('', ','));
|
||||
$this->assertSame(array(), HeaderUtils::split(',,,', ','));
|
||||
$this->assertSame(array('foo', 'bar', 'baz'), HeaderUtils::split('foo, "bar", "baz', ','));
|
||||
$this->assertSame(array('foo', 'bar, baz'), HeaderUtils::split('foo, "bar, baz', ','));
|
||||
$this->assertSame(array('foo', 'bar, baz\\'), HeaderUtils::split('foo, "bar, baz\\', ','));
|
||||
$this->assertSame(array('foo', 'bar, baz\\'), HeaderUtils::split('foo, "bar, baz\\\\', ','));
|
||||
$this->assertSame([], HeaderUtils::split('', ','));
|
||||
$this->assertSame([], HeaderUtils::split(',,,', ','));
|
||||
$this->assertSame(['foo', 'bar', 'baz'], HeaderUtils::split('foo, "bar", "baz', ','));
|
||||
$this->assertSame(['foo', 'bar, baz'], HeaderUtils::split('foo, "bar, baz', ','));
|
||||
$this->assertSame(['foo', 'bar, baz\\'], HeaderUtils::split('foo, "bar, baz\\', ','));
|
||||
$this->assertSame(['foo', 'bar, baz\\'], HeaderUtils::split('foo, "bar, baz\\\\', ','));
|
||||
}
|
||||
|
||||
public function testCombine()
|
||||
{
|
||||
$this->assertSame(array('foo' => '123'), HeaderUtils::combine(array(array('foo', '123'))));
|
||||
$this->assertSame(array('foo' => true), HeaderUtils::combine(array(array('foo'))));
|
||||
$this->assertSame(array('foo' => true), HeaderUtils::combine(array(array('Foo'))));
|
||||
$this->assertSame(array('foo' => '123', 'bar' => true), HeaderUtils::combine(array(array('foo', '123'), array('bar'))));
|
||||
$this->assertSame(['foo' => '123'], HeaderUtils::combine([['foo', '123']]));
|
||||
$this->assertSame(['foo' => true], HeaderUtils::combine([['foo']]));
|
||||
$this->assertSame(['foo' => true], HeaderUtils::combine([['Foo']]));
|
||||
$this->assertSame(['foo' => '123', 'bar' => true], HeaderUtils::combine([['foo', '123'], ['bar']]));
|
||||
}
|
||||
|
||||
public function testToString()
|
||||
{
|
||||
$this->assertSame('foo', HeaderUtils::toString(array('foo' => true), ','));
|
||||
$this->assertSame('foo; bar', HeaderUtils::toString(array('foo' => true, 'bar' => true), ';'));
|
||||
$this->assertSame('foo=123', HeaderUtils::toString(array('foo' => '123'), ','));
|
||||
$this->assertSame('foo="1 2 3"', HeaderUtils::toString(array('foo' => '1 2 3'), ','));
|
||||
$this->assertSame('foo="1 2 3", bar', HeaderUtils::toString(array('foo' => '1 2 3', 'bar' => true), ','));
|
||||
$this->assertSame('foo', HeaderUtils::toString(['foo' => true], ','));
|
||||
$this->assertSame('foo; bar', HeaderUtils::toString(['foo' => true, 'bar' => true], ';'));
|
||||
$this->assertSame('foo=123', HeaderUtils::toString(['foo' => '123'], ','));
|
||||
$this->assertSame('foo="1 2 3"', HeaderUtils::toString(['foo' => '1 2 3'], ','));
|
||||
$this->assertSame('foo="1 2 3", bar', HeaderUtils::toString(['foo' => '1 2 3', 'bar' => true], ','));
|
||||
}
|
||||
|
||||
public function testQuote()
|
||||
@@ -101,14 +101,14 @@ class HeaderUtilsTest extends TestCase
|
||||
|
||||
public function provideMakeDisposition()
|
||||
{
|
||||
return array(
|
||||
array('attachment', 'foo.html', 'foo.html', 'attachment; filename=foo.html'),
|
||||
array('attachment', 'foo.html', '', 'attachment; filename=foo.html'),
|
||||
array('attachment', 'foo bar.html', '', 'attachment; filename="foo bar.html"'),
|
||||
array('attachment', 'foo "bar".html', '', 'attachment; filename="foo \\"bar\\".html"'),
|
||||
array('attachment', 'foo%20bar.html', 'foo bar.html', 'attachment; filename="foo bar.html"; filename*=utf-8\'\'foo%2520bar.html'),
|
||||
array('attachment', 'föö.html', 'foo.html', 'attachment; filename=foo.html; filename*=utf-8\'\'f%C3%B6%C3%B6.html'),
|
||||
);
|
||||
return [
|
||||
['attachment', 'foo.html', 'foo.html', 'attachment; filename=foo.html'],
|
||||
['attachment', 'foo.html', '', 'attachment; filename=foo.html'],
|
||||
['attachment', 'foo bar.html', '', 'attachment; filename="foo bar.html"'],
|
||||
['attachment', 'foo "bar".html', '', 'attachment; filename="foo \\"bar\\".html"'],
|
||||
['attachment', 'foo%20bar.html', 'foo bar.html', 'attachment; filename="foo bar.html"; filename*=utf-8\'\'foo%2520bar.html'],
|
||||
['attachment', 'föö.html', 'foo.html', 'attachment; filename=foo.html; filename*=utf-8\'\'f%C3%B6%C3%B6.html'],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -122,13 +122,13 @@ class HeaderUtilsTest extends TestCase
|
||||
|
||||
public function provideMakeDispositionFail()
|
||||
{
|
||||
return array(
|
||||
array('attachment', 'foo%20bar.html'),
|
||||
array('attachment', 'foo/bar.html'),
|
||||
array('attachment', '/foo.html'),
|
||||
array('attachment', 'foo\bar.html'),
|
||||
array('attachment', '\foo.html'),
|
||||
array('attachment', 'föö.html'),
|
||||
);
|
||||
return [
|
||||
['attachment', 'foo%20bar.html'],
|
||||
['attachment', 'foo/bar.html'],
|
||||
['attachment', '/foo.html'],
|
||||
['attachment', 'foo\bar.html'],
|
||||
['attachment', '\foo.html'],
|
||||
['attachment', 'föö.html'],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,20 +26,20 @@ class IpUtilsTest extends TestCase
|
||||
|
||||
public function getIpv4Data()
|
||||
{
|
||||
return array(
|
||||
array(true, '192.168.1.1', '192.168.1.1'),
|
||||
array(true, '192.168.1.1', '192.168.1.1/1'),
|
||||
array(true, '192.168.1.1', '192.168.1.0/24'),
|
||||
array(false, '192.168.1.1', '1.2.3.4/1'),
|
||||
array(false, '192.168.1.1', '192.168.1.1/33'), // invalid subnet
|
||||
array(true, '192.168.1.1', array('1.2.3.4/1', '192.168.1.0/24')),
|
||||
array(true, '192.168.1.1', array('192.168.1.0/24', '1.2.3.4/1')),
|
||||
array(false, '192.168.1.1', array('1.2.3.4/1', '4.3.2.1/1')),
|
||||
array(true, '1.2.3.4', '0.0.0.0/0'),
|
||||
array(true, '1.2.3.4', '192.168.1.0/0'),
|
||||
array(false, '1.2.3.4', '256.256.256/0'), // invalid CIDR notation
|
||||
array(false, 'an_invalid_ip', '192.168.1.0/24'),
|
||||
);
|
||||
return [
|
||||
[true, '192.168.1.1', '192.168.1.1'],
|
||||
[true, '192.168.1.1', '192.168.1.1/1'],
|
||||
[true, '192.168.1.1', '192.168.1.0/24'],
|
||||
[false, '192.168.1.1', '1.2.3.4/1'],
|
||||
[false, '192.168.1.1', '192.168.1.1/33'], // invalid subnet
|
||||
[true, '192.168.1.1', ['1.2.3.4/1', '192.168.1.0/24']],
|
||||
[true, '192.168.1.1', ['192.168.1.0/24', '1.2.3.4/1']],
|
||||
[false, '192.168.1.1', ['1.2.3.4/1', '4.3.2.1/1']],
|
||||
[true, '1.2.3.4', '0.0.0.0/0'],
|
||||
[true, '1.2.3.4', '192.168.1.0/0'],
|
||||
[false, '1.2.3.4', '256.256.256/0'], // invalid CIDR notation
|
||||
[false, 'an_invalid_ip', '192.168.1.0/24'],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -56,20 +56,20 @@ class IpUtilsTest extends TestCase
|
||||
|
||||
public function getIpv6Data()
|
||||
{
|
||||
return array(
|
||||
array(true, '2a01:198:603:0:396e:4789:8e99:890f', '2a01:198:603:0::/65'),
|
||||
array(false, '2a00:198:603:0:396e:4789:8e99:890f', '2a01:198:603:0::/65'),
|
||||
array(false, '2a01:198:603:0:396e:4789:8e99:890f', '::1'),
|
||||
array(true, '0:0:0:0:0:0:0:1', '::1'),
|
||||
array(false, '0:0:603:0:396e:4789:8e99:0001', '::1'),
|
||||
array(true, '0:0:603:0:396e:4789:8e99:0001', '::/0'),
|
||||
array(true, '0:0:603:0:396e:4789:8e99:0001', '2a01:198:603:0::/0'),
|
||||
array(true, '2a01:198:603:0:396e:4789:8e99:890f', array('::1', '2a01:198:603:0::/65')),
|
||||
array(true, '2a01:198:603:0:396e:4789:8e99:890f', array('2a01:198:603:0::/65', '::1')),
|
||||
array(false, '2a01:198:603:0:396e:4789:8e99:890f', array('::1', '1a01:198:603:0::/65')),
|
||||
array(false, '}__test|O:21:"JDatabaseDriverMysqli":3:{s:2', '::1'),
|
||||
array(false, '2a01:198:603:0:396e:4789:8e99:890f', 'unknown'),
|
||||
);
|
||||
return [
|
||||
[true, '2a01:198:603:0:396e:4789:8e99:890f', '2a01:198:603:0::/65'],
|
||||
[false, '2a00:198:603:0:396e:4789:8e99:890f', '2a01:198:603:0::/65'],
|
||||
[false, '2a01:198:603:0:396e:4789:8e99:890f', '::1'],
|
||||
[true, '0:0:0:0:0:0:0:1', '::1'],
|
||||
[false, '0:0:603:0:396e:4789:8e99:0001', '::1'],
|
||||
[true, '0:0:603:0:396e:4789:8e99:0001', '::/0'],
|
||||
[true, '0:0:603:0:396e:4789:8e99:0001', '2a01:198:603:0::/0'],
|
||||
[true, '2a01:198:603:0:396e:4789:8e99:890f', ['::1', '2a01:198:603:0::/65']],
|
||||
[true, '2a01:198:603:0:396e:4789:8e99:890f', ['2a01:198:603:0::/65', '::1']],
|
||||
[false, '2a01:198:603:0:396e:4789:8e99:890f', ['::1', '1a01:198:603:0::/65']],
|
||||
[false, '}__test|O:21:"JDatabaseDriverMysqli":3:{s:2', '::1'],
|
||||
[false, '2a01:198:603:0:396e:4789:8e99:890f', 'unknown'],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -95,10 +95,10 @@ class IpUtilsTest extends TestCase
|
||||
|
||||
public function invalidIpAddressData()
|
||||
{
|
||||
return array(
|
||||
'invalid proxy wildcard' => array('192.168.20.13', '*'),
|
||||
'invalid proxy missing netmask' => array('192.168.20.13', '0.0.0.0'),
|
||||
'invalid request IP with invalid proxy wildcard' => array('0.0.0.0', '*'),
|
||||
);
|
||||
return [
|
||||
'invalid proxy wildcard' => ['192.168.20.13', '*'],
|
||||
'invalid proxy missing netmask' => ['192.168.20.13', '0.0.0.0'],
|
||||
'invalid request IP with invalid proxy wildcard' => ['0.0.0.0', '*'],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,13 +24,13 @@ class JsonResponseTest extends TestCase
|
||||
|
||||
public function testConstructorWithArrayCreatesJsonArray()
|
||||
{
|
||||
$response = new JsonResponse(array(0, 1, 2, 3));
|
||||
$response = new JsonResponse([0, 1, 2, 3]);
|
||||
$this->assertSame('[0,1,2,3]', $response->getContent());
|
||||
}
|
||||
|
||||
public function testConstructorWithAssocArrayCreatesJsonObject()
|
||||
{
|
||||
$response = new JsonResponse(array('foo' => 'bar'));
|
||||
$response = new JsonResponse(['foo' => 'bar']);
|
||||
$this->assertSame('{"foo":"bar"}', $response->getContent());
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ class JsonResponseTest extends TestCase
|
||||
|
||||
public function testConstructorWithCustomStatus()
|
||||
{
|
||||
$response = new JsonResponse(array(), 202);
|
||||
$response = new JsonResponse([], 202);
|
||||
$this->assertSame(202, $response->getStatusCode());
|
||||
}
|
||||
|
||||
@@ -63,35 +63,35 @@ class JsonResponseTest extends TestCase
|
||||
|
||||
public function testConstructorWithCustomHeaders()
|
||||
{
|
||||
$response = new JsonResponse(array(), 200, array('ETag' => 'foo'));
|
||||
$response = new JsonResponse([], 200, ['ETag' => 'foo']);
|
||||
$this->assertSame('application/json', $response->headers->get('Content-Type'));
|
||||
$this->assertSame('foo', $response->headers->get('ETag'));
|
||||
}
|
||||
|
||||
public function testConstructorWithCustomContentType()
|
||||
{
|
||||
$headers = array('Content-Type' => 'application/vnd.acme.blog-v1+json');
|
||||
$headers = ['Content-Type' => 'application/vnd.acme.blog-v1+json'];
|
||||
|
||||
$response = new JsonResponse(array(), 200, $headers);
|
||||
$response = new JsonResponse([], 200, $headers);
|
||||
$this->assertSame('application/vnd.acme.blog-v1+json', $response->headers->get('Content-Type'));
|
||||
}
|
||||
|
||||
public function testSetJson()
|
||||
{
|
||||
$response = new JsonResponse('1', 200, array(), true);
|
||||
$response = new JsonResponse('1', 200, [], true);
|
||||
$this->assertEquals('1', $response->getContent());
|
||||
|
||||
$response = new JsonResponse('[1]', 200, array(), true);
|
||||
$response = new JsonResponse('[1]', 200, [], true);
|
||||
$this->assertEquals('[1]', $response->getContent());
|
||||
|
||||
$response = new JsonResponse(null, 200, array());
|
||||
$response = new JsonResponse(null, 200, []);
|
||||
$response->setJson('true');
|
||||
$this->assertEquals('true', $response->getContent());
|
||||
}
|
||||
|
||||
public function testCreate()
|
||||
{
|
||||
$response = JsonResponse::create(array('foo' => 'bar'), 204);
|
||||
$response = JsonResponse::create(['foo' => 'bar'], 204);
|
||||
|
||||
$this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
|
||||
$this->assertEquals('{"foo":"bar"}', $response->getContent());
|
||||
@@ -107,14 +107,14 @@ class JsonResponseTest extends TestCase
|
||||
|
||||
public function testStaticCreateJsonArray()
|
||||
{
|
||||
$response = JsonResponse::create(array(0, 1, 2, 3));
|
||||
$response = JsonResponse::create([0, 1, 2, 3]);
|
||||
$this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
|
||||
$this->assertSame('[0,1,2,3]', $response->getContent());
|
||||
}
|
||||
|
||||
public function testStaticCreateJsonObject()
|
||||
{
|
||||
$response = JsonResponse::create(array('foo' => 'bar'));
|
||||
$response = JsonResponse::create(['foo' => 'bar']);
|
||||
$this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response);
|
||||
$this->assertSame('{"foo":"bar"}', $response->getContent());
|
||||
}
|
||||
@@ -140,7 +140,7 @@ class JsonResponseTest extends TestCase
|
||||
|
||||
public function testStaticCreateWithCustomStatus()
|
||||
{
|
||||
$response = JsonResponse::create(array(), 202);
|
||||
$response = JsonResponse::create([], 202);
|
||||
$this->assertSame(202, $response->getStatusCode());
|
||||
}
|
||||
|
||||
@@ -152,22 +152,22 @@ class JsonResponseTest extends TestCase
|
||||
|
||||
public function testStaticCreateWithCustomHeaders()
|
||||
{
|
||||
$response = JsonResponse::create(array(), 200, array('ETag' => 'foo'));
|
||||
$response = JsonResponse::create([], 200, ['ETag' => 'foo']);
|
||||
$this->assertSame('application/json', $response->headers->get('Content-Type'));
|
||||
$this->assertSame('foo', $response->headers->get('ETag'));
|
||||
}
|
||||
|
||||
public function testStaticCreateWithCustomContentType()
|
||||
{
|
||||
$headers = array('Content-Type' => 'application/vnd.acme.blog-v1+json');
|
||||
$headers = ['Content-Type' => 'application/vnd.acme.blog-v1+json'];
|
||||
|
||||
$response = JsonResponse::create(array(), 200, $headers);
|
||||
$response = JsonResponse::create([], 200, $headers);
|
||||
$this->assertSame('application/vnd.acme.blog-v1+json', $response->headers->get('Content-Type'));
|
||||
}
|
||||
|
||||
public function testSetCallback()
|
||||
{
|
||||
$response = JsonResponse::create(array('foo' => 'bar'))->setCallback('callback');
|
||||
$response = JsonResponse::create(['foo' => 'bar'])->setCallback('callback');
|
||||
|
||||
$this->assertEquals('/**/callback({"foo":"bar"});', $response->getContent());
|
||||
$this->assertEquals('text/javascript', $response->headers->get('Content-Type'));
|
||||
@@ -190,7 +190,7 @@ class JsonResponseTest extends TestCase
|
||||
public function testSetEncodingOptions()
|
||||
{
|
||||
$response = new JsonResponse();
|
||||
$response->setData(array(array(1, 2, 3)));
|
||||
$response->setData([[1, 2, 3]]);
|
||||
|
||||
$this->assertEquals('[[1,2,3]]', $response->getContent());
|
||||
|
||||
@@ -239,7 +239,7 @@ class JsonResponseTest extends TestCase
|
||||
|
||||
public function testSetComplexCallback()
|
||||
{
|
||||
$response = JsonResponse::create(array('foo' => 'bar'));
|
||||
$response = JsonResponse::create(['foo' => 'bar']);
|
||||
$response->setCallback('ಠ_ಠ["foo"].bar[0]');
|
||||
|
||||
$this->assertEquals('/**/ಠ_ಠ["foo"].bar[0]({"foo":"bar"});', $response->getContent());
|
||||
|
||||
@@ -23,44 +23,44 @@ class ParameterBagTest extends TestCase
|
||||
|
||||
public function testAll()
|
||||
{
|
||||
$bag = new ParameterBag(array('foo' => 'bar'));
|
||||
$this->assertEquals(array('foo' => 'bar'), $bag->all(), '->all() gets all the input');
|
||||
$bag = new ParameterBag(['foo' => 'bar']);
|
||||
$this->assertEquals(['foo' => 'bar'], $bag->all(), '->all() gets all the input');
|
||||
}
|
||||
|
||||
public function testKeys()
|
||||
{
|
||||
$bag = new ParameterBag(array('foo' => 'bar'));
|
||||
$this->assertEquals(array('foo'), $bag->keys());
|
||||
$bag = new ParameterBag(['foo' => 'bar']);
|
||||
$this->assertEquals(['foo'], $bag->keys());
|
||||
}
|
||||
|
||||
public function testAdd()
|
||||
{
|
||||
$bag = new ParameterBag(array('foo' => 'bar'));
|
||||
$bag->add(array('bar' => 'bas'));
|
||||
$this->assertEquals(array('foo' => 'bar', 'bar' => 'bas'), $bag->all());
|
||||
$bag = new ParameterBag(['foo' => 'bar']);
|
||||
$bag->add(['bar' => 'bas']);
|
||||
$this->assertEquals(['foo' => 'bar', 'bar' => 'bas'], $bag->all());
|
||||
}
|
||||
|
||||
public function testRemove()
|
||||
{
|
||||
$bag = new ParameterBag(array('foo' => 'bar'));
|
||||
$bag->add(array('bar' => 'bas'));
|
||||
$this->assertEquals(array('foo' => 'bar', 'bar' => 'bas'), $bag->all());
|
||||
$bag = new ParameterBag(['foo' => 'bar']);
|
||||
$bag->add(['bar' => 'bas']);
|
||||
$this->assertEquals(['foo' => 'bar', 'bar' => 'bas'], $bag->all());
|
||||
$bag->remove('bar');
|
||||
$this->assertEquals(array('foo' => 'bar'), $bag->all());
|
||||
$this->assertEquals(['foo' => 'bar'], $bag->all());
|
||||
}
|
||||
|
||||
public function testReplace()
|
||||
{
|
||||
$bag = new ParameterBag(array('foo' => 'bar'));
|
||||
$bag = new ParameterBag(['foo' => 'bar']);
|
||||
|
||||
$bag->replace(array('FOO' => 'BAR'));
|
||||
$this->assertEquals(array('FOO' => 'BAR'), $bag->all(), '->replace() replaces the input with the argument');
|
||||
$bag->replace(['FOO' => 'BAR']);
|
||||
$this->assertEquals(['FOO' => 'BAR'], $bag->all(), '->replace() replaces the input with the argument');
|
||||
$this->assertFalse($bag->has('foo'), '->replace() overrides previously set the input');
|
||||
}
|
||||
|
||||
public function testGet()
|
||||
{
|
||||
$bag = new ParameterBag(array('foo' => 'bar', 'null' => null));
|
||||
$bag = new ParameterBag(['foo' => 'bar', 'null' => null]);
|
||||
|
||||
$this->assertEquals('bar', $bag->get('foo'), '->get() gets the value of a parameter');
|
||||
$this->assertEquals('default', $bag->get('unknown', 'default'), '->get() returns second argument as default if a parameter is not defined');
|
||||
@@ -69,14 +69,14 @@ class ParameterBagTest extends TestCase
|
||||
|
||||
public function testGetDoesNotUseDeepByDefault()
|
||||
{
|
||||
$bag = new ParameterBag(array('foo' => array('bar' => 'moo')));
|
||||
$bag = new ParameterBag(['foo' => ['bar' => 'moo']]);
|
||||
|
||||
$this->assertNull($bag->get('foo[bar]'));
|
||||
}
|
||||
|
||||
public function testSet()
|
||||
{
|
||||
$bag = new ParameterBag(array());
|
||||
$bag = new ParameterBag([]);
|
||||
|
||||
$bag->set('foo', 'bar');
|
||||
$this->assertEquals('bar', $bag->get('foo'), '->set() sets the value of parameter');
|
||||
@@ -87,7 +87,7 @@ class ParameterBagTest extends TestCase
|
||||
|
||||
public function testHas()
|
||||
{
|
||||
$bag = new ParameterBag(array('foo' => 'bar'));
|
||||
$bag = new ParameterBag(['foo' => 'bar']);
|
||||
|
||||
$this->assertTrue($bag->has('foo'), '->has() returns true if a parameter is defined');
|
||||
$this->assertFalse($bag->has('unknown'), '->has() return false if a parameter is not defined');
|
||||
@@ -95,7 +95,7 @@ class ParameterBagTest extends TestCase
|
||||
|
||||
public function testGetAlpha()
|
||||
{
|
||||
$bag = new ParameterBag(array('word' => 'foo_BAR_012'));
|
||||
$bag = new ParameterBag(['word' => 'foo_BAR_012']);
|
||||
|
||||
$this->assertEquals('fooBAR', $bag->getAlpha('word'), '->getAlpha() gets only alphabetic characters');
|
||||
$this->assertEquals('', $bag->getAlpha('unknown'), '->getAlpha() returns empty string if a parameter is not defined');
|
||||
@@ -103,7 +103,7 @@ class ParameterBagTest extends TestCase
|
||||
|
||||
public function testGetAlnum()
|
||||
{
|
||||
$bag = new ParameterBag(array('word' => 'foo_BAR_012'));
|
||||
$bag = new ParameterBag(['word' => 'foo_BAR_012']);
|
||||
|
||||
$this->assertEquals('fooBAR012', $bag->getAlnum('word'), '->getAlnum() gets only alphanumeric characters');
|
||||
$this->assertEquals('', $bag->getAlnum('unknown'), '->getAlnum() returns empty string if a parameter is not defined');
|
||||
@@ -111,7 +111,7 @@ class ParameterBagTest extends TestCase
|
||||
|
||||
public function testGetDigits()
|
||||
{
|
||||
$bag = new ParameterBag(array('word' => 'foo_BAR_012'));
|
||||
$bag = new ParameterBag(['word' => 'foo_BAR_012']);
|
||||
|
||||
$this->assertEquals('012', $bag->getDigits('word'), '->getDigits() gets only digits as string');
|
||||
$this->assertEquals('', $bag->getDigits('unknown'), '->getDigits() returns empty string if a parameter is not defined');
|
||||
@@ -119,7 +119,7 @@ class ParameterBagTest extends TestCase
|
||||
|
||||
public function testGetInt()
|
||||
{
|
||||
$bag = new ParameterBag(array('digits' => '0123'));
|
||||
$bag = new ParameterBag(['digits' => '0123']);
|
||||
|
||||
$this->assertEquals(123, $bag->getInt('digits'), '->getInt() gets a value of parameter as integer');
|
||||
$this->assertEquals(0, $bag->getInt('unknown'), '->getInt() returns zero if a parameter is not defined');
|
||||
@@ -127,14 +127,14 @@ class ParameterBagTest extends TestCase
|
||||
|
||||
public function testFilter()
|
||||
{
|
||||
$bag = new ParameterBag(array(
|
||||
$bag = new ParameterBag([
|
||||
'digits' => '0123ab',
|
||||
'email' => 'example@example.com',
|
||||
'url' => 'http://example.com/foo',
|
||||
'dec' => '256',
|
||||
'hex' => '0x100',
|
||||
'array' => array('bang'),
|
||||
));
|
||||
'array' => ['bang'],
|
||||
]);
|
||||
|
||||
$this->assertEmpty($bag->filter('nokey'), '->filter() should return empty by default if no key is found');
|
||||
|
||||
@@ -142,27 +142,27 @@ class ParameterBagTest extends TestCase
|
||||
|
||||
$this->assertEquals('example@example.com', $bag->filter('email', '', FILTER_VALIDATE_EMAIL), '->filter() gets a value of parameter as email');
|
||||
|
||||
$this->assertEquals('http://example.com/foo', $bag->filter('url', '', FILTER_VALIDATE_URL, array('flags' => FILTER_FLAG_PATH_REQUIRED)), '->filter() gets a value of parameter as URL with a path');
|
||||
$this->assertEquals('http://example.com/foo', $bag->filter('url', '', FILTER_VALIDATE_URL, ['flags' => FILTER_FLAG_PATH_REQUIRED]), '->filter() gets a value of parameter as URL with a path');
|
||||
|
||||
// This test is repeated for code-coverage
|
||||
$this->assertEquals('http://example.com/foo', $bag->filter('url', '', FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED), '->filter() gets a value of parameter as URL with a path');
|
||||
|
||||
$this->assertFalse($bag->filter('dec', '', FILTER_VALIDATE_INT, array(
|
||||
$this->assertFalse($bag->filter('dec', '', FILTER_VALIDATE_INT, [
|
||||
'flags' => FILTER_FLAG_ALLOW_HEX,
|
||||
'options' => array('min_range' => 1, 'max_range' => 0xff),
|
||||
)), '->filter() gets a value of parameter as integer between boundaries');
|
||||
'options' => ['min_range' => 1, 'max_range' => 0xff],
|
||||
]), '->filter() gets a value of parameter as integer between boundaries');
|
||||
|
||||
$this->assertFalse($bag->filter('hex', '', FILTER_VALIDATE_INT, array(
|
||||
$this->assertFalse($bag->filter('hex', '', FILTER_VALIDATE_INT, [
|
||||
'flags' => FILTER_FLAG_ALLOW_HEX,
|
||||
'options' => array('min_range' => 1, 'max_range' => 0xff),
|
||||
)), '->filter() gets a value of parameter as integer between boundaries');
|
||||
'options' => ['min_range' => 1, 'max_range' => 0xff],
|
||||
]), '->filter() gets a value of parameter as integer between boundaries');
|
||||
|
||||
$this->assertEquals(array('bang'), $bag->filter('array', ''), '->filter() gets a value of parameter as an array');
|
||||
$this->assertEquals(['bang'], $bag->filter('array', ''), '->filter() gets a value of parameter as an array');
|
||||
}
|
||||
|
||||
public function testGetIterator()
|
||||
{
|
||||
$parameters = array('foo' => 'bar', 'hello' => 'world');
|
||||
$parameters = ['foo' => 'bar', 'hello' => 'world'];
|
||||
$bag = new ParameterBag($parameters);
|
||||
|
||||
$i = 0;
|
||||
@@ -176,7 +176,7 @@ class ParameterBagTest extends TestCase
|
||||
|
||||
public function testCount()
|
||||
{
|
||||
$parameters = array('foo' => 'bar', 'hello' => 'world');
|
||||
$parameters = ['foo' => 'bar', 'hello' => 'world'];
|
||||
$bag = new ParameterBag($parameters);
|
||||
|
||||
$this->assertCount(\count($parameters), $bag);
|
||||
@@ -184,7 +184,7 @@ class ParameterBagTest extends TestCase
|
||||
|
||||
public function testGetBoolean()
|
||||
{
|
||||
$parameters = array('string_true' => 'true', 'string_false' => 'false');
|
||||
$parameters = ['string_true' => 'true', 'string_false' => 'false'];
|
||||
$bag = new ParameterBag($parameters);
|
||||
|
||||
$this->assertTrue($bag->getBoolean('string_true'), '->getBoolean() gets the string true as boolean true');
|
||||
|
||||
@@ -22,7 +22,7 @@ class RedirectResponseTest extends TestCase
|
||||
|
||||
$this->assertEquals(1, preg_match(
|
||||
'#<meta http-equiv="refresh" content="\d+;url=foo\.bar" />#',
|
||||
preg_replace(array('/\s+/', '/\'/'), array(' ', '"'), $response->getContent())
|
||||
preg_replace(['/\s+/', '/\'/'], [' ', '"'], $response->getContent())
|
||||
));
|
||||
}
|
||||
|
||||
@@ -87,7 +87,7 @@ class RedirectResponseTest extends TestCase
|
||||
$response = new RedirectResponse('foo.bar', 301);
|
||||
$this->assertFalse($response->headers->hasCacheControlDirective('no-cache'));
|
||||
|
||||
$response = new RedirectResponse('foo.bar', 301, array('cache-control' => 'max-age=86400'));
|
||||
$response = new RedirectResponse('foo.bar', 301, ['cache-control' => 'max-age=86400']);
|
||||
$this->assertFalse($response->headers->hasCacheControlDirective('no-cache'));
|
||||
$this->assertTrue($response->headers->hasCacheControlDirective('max-age'));
|
||||
|
||||
|
||||
@@ -34,20 +34,20 @@ class RequestMatcherTest extends TestCase
|
||||
|
||||
public function getMethodData()
|
||||
{
|
||||
return array(
|
||||
array('get', 'get', true),
|
||||
array('get', array('get', 'post'), true),
|
||||
array('get', 'post', false),
|
||||
array('get', 'GET', true),
|
||||
array('get', array('GET', 'POST'), true),
|
||||
array('get', 'POST', false),
|
||||
);
|
||||
return [
|
||||
['get', 'get', true],
|
||||
['get', ['get', 'post'], true],
|
||||
['get', 'post', false],
|
||||
['get', 'GET', true],
|
||||
['get', ['GET', 'POST'], true],
|
||||
['get', 'POST', false],
|
||||
];
|
||||
}
|
||||
|
||||
public function testScheme()
|
||||
{
|
||||
$httpRequest = $request = $request = Request::create('');
|
||||
$httpsRequest = $request = $request = Request::create('', 'get', array(), array(), array(), array('HTTPS' => 'on'));
|
||||
$httpsRequest = $request = $request = Request::create('', 'get', [], [], [], ['HTTPS' => 'on']);
|
||||
|
||||
$matcher = new RequestMatcher();
|
||||
$matcher->matchScheme('https');
|
||||
@@ -69,7 +69,7 @@ class RequestMatcherTest extends TestCase
|
||||
public function testHost($pattern, $isMatch)
|
||||
{
|
||||
$matcher = new RequestMatcher();
|
||||
$request = Request::create('', 'get', array(), array(), array(), array('HTTP_HOST' => 'foo.example.com'));
|
||||
$request = Request::create('', 'get', [], [], [], ['HTTP_HOST' => 'foo.example.com']);
|
||||
|
||||
$matcher->matchHost($pattern);
|
||||
$this->assertSame($isMatch, $matcher->matches($request));
|
||||
@@ -81,7 +81,7 @@ class RequestMatcherTest extends TestCase
|
||||
public function testPort()
|
||||
{
|
||||
$matcher = new RequestMatcher();
|
||||
$request = Request::create('', 'get', array(), array(), array(), array('HTTP_HOST' => null, 'SERVER_PORT' => 8000));
|
||||
$request = Request::create('', 'get', [], [], [], ['HTTP_HOST' => null, 'SERVER_PORT' => 8000]);
|
||||
|
||||
$matcher->matchPort(8000);
|
||||
$this->assertTrue($matcher->matches($request));
|
||||
@@ -89,22 +89,22 @@ class RequestMatcherTest extends TestCase
|
||||
$matcher->matchPort(9000);
|
||||
$this->assertFalse($matcher->matches($request));
|
||||
|
||||
$matcher = new RequestMatcher(null, null, null, null, array(), null, 8000);
|
||||
$matcher = new RequestMatcher(null, null, null, null, [], null, 8000);
|
||||
$this->assertTrue($matcher->matches($request));
|
||||
}
|
||||
|
||||
public function getHostData()
|
||||
{
|
||||
return array(
|
||||
array('.*\.example\.com', true),
|
||||
array('\.example\.com$', true),
|
||||
array('^.*\.example\.com$', true),
|
||||
array('.*\.sensio\.com', false),
|
||||
array('.*\.example\.COM', true),
|
||||
array('\.example\.COM$', true),
|
||||
array('^.*\.example\.COM$', true),
|
||||
array('.*\.sensio\.COM', false),
|
||||
);
|
||||
return [
|
||||
['.*\.example\.com', true],
|
||||
['\.example\.com$', true],
|
||||
['^.*\.example\.com$', true],
|
||||
['.*\.sensio\.com', false],
|
||||
['.*\.example\.COM', true],
|
||||
['\.example\.COM$', true],
|
||||
['^.*\.example\.COM$', true],
|
||||
['.*\.sensio\.COM', false],
|
||||
];
|
||||
}
|
||||
|
||||
public function testPath()
|
||||
|
||||
844
vendor/symfony/http-foundation/Tests/RequestTest.php
vendored
844
vendor/symfony/http-foundation/Tests/RequestTest.php
vendored
File diff suppressed because it is too large
Load Diff
@@ -22,10 +22,10 @@ class ResponseFunctionalTest extends TestCase
|
||||
|
||||
public static function setUpBeforeClass()
|
||||
{
|
||||
$spec = array(
|
||||
1 => array('file', '/dev/null', 'w'),
|
||||
2 => array('file', '/dev/null', 'w'),
|
||||
);
|
||||
$spec = [
|
||||
1 => ['file', '/dev/null', 'w'],
|
||||
2 => ['file', '/dev/null', 'w'],
|
||||
];
|
||||
if (!self::$server = @proc_open('exec php -S localhost:8054', $spec, $pipes, __DIR__.'/Fixtures/response-functional')) {
|
||||
self::markTestSkipped('PHP server unable to start.');
|
||||
}
|
||||
@@ -52,7 +52,7 @@ class ResponseFunctionalTest extends TestCase
|
||||
public function provideCookie()
|
||||
{
|
||||
foreach (glob(__DIR__.'/Fixtures/response-functional/*.php') as $file) {
|
||||
yield array(pathinfo($file, PATHINFO_FILENAME));
|
||||
yield [pathinfo($file, PATHINFO_FILENAME)];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ class ResponseHeaderBagTest extends TestCase
|
||||
{
|
||||
public function testAllPreserveCase()
|
||||
{
|
||||
$headers = array(
|
||||
$headers = [
|
||||
'fOo' => 'BAR',
|
||||
'ETag' => 'xyzzy',
|
||||
'Content-MD5' => 'Q2hlY2sgSW50ZWdyaXR5IQ==',
|
||||
@@ -30,7 +30,7 @@ class ResponseHeaderBagTest extends TestCase
|
||||
'WWW-Authenticate' => 'Basic realm="WallyWorld"',
|
||||
'X-UA-Compatible' => 'IE=edge,chrome=1',
|
||||
'X-XSS-Protection' => '1; mode=block',
|
||||
);
|
||||
];
|
||||
|
||||
$bag = new ResponseHeaderBag($headers);
|
||||
$allPreservedCase = $bag->allPreserveCase();
|
||||
@@ -42,45 +42,45 @@ class ResponseHeaderBagTest extends TestCase
|
||||
|
||||
public function testCacheControlHeader()
|
||||
{
|
||||
$bag = new ResponseHeaderBag(array());
|
||||
$bag = new ResponseHeaderBag([]);
|
||||
$this->assertEquals('no-cache, private', $bag->get('Cache-Control'));
|
||||
$this->assertTrue($bag->hasCacheControlDirective('no-cache'));
|
||||
|
||||
$bag = new ResponseHeaderBag(array('Cache-Control' => 'public'));
|
||||
$bag = new ResponseHeaderBag(['Cache-Control' => 'public']);
|
||||
$this->assertEquals('public', $bag->get('Cache-Control'));
|
||||
$this->assertTrue($bag->hasCacheControlDirective('public'));
|
||||
|
||||
$bag = new ResponseHeaderBag(array('ETag' => 'abcde'));
|
||||
$bag = new ResponseHeaderBag(['ETag' => 'abcde']);
|
||||
$this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
|
||||
$this->assertTrue($bag->hasCacheControlDirective('private'));
|
||||
$this->assertTrue($bag->hasCacheControlDirective('must-revalidate'));
|
||||
$this->assertFalse($bag->hasCacheControlDirective('max-age'));
|
||||
|
||||
$bag = new ResponseHeaderBag(array('Expires' => 'Wed, 16 Feb 2011 14:17:43 GMT'));
|
||||
$bag = new ResponseHeaderBag(['Expires' => 'Wed, 16 Feb 2011 14:17:43 GMT']);
|
||||
$this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
|
||||
|
||||
$bag = new ResponseHeaderBag(array(
|
||||
$bag = new ResponseHeaderBag([
|
||||
'Expires' => 'Wed, 16 Feb 2011 14:17:43 GMT',
|
||||
'Cache-Control' => 'max-age=3600',
|
||||
));
|
||||
]);
|
||||
$this->assertEquals('max-age=3600, private', $bag->get('Cache-Control'));
|
||||
|
||||
$bag = new ResponseHeaderBag(array('Last-Modified' => 'abcde'));
|
||||
$bag = new ResponseHeaderBag(['Last-Modified' => 'abcde']);
|
||||
$this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
|
||||
|
||||
$bag = new ResponseHeaderBag(array('Etag' => 'abcde', 'Last-Modified' => 'abcde'));
|
||||
$bag = new ResponseHeaderBag(['Etag' => 'abcde', 'Last-Modified' => 'abcde']);
|
||||
$this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
|
||||
|
||||
$bag = new ResponseHeaderBag(array('cache-control' => 'max-age=100'));
|
||||
$bag = new ResponseHeaderBag(['cache-control' => 'max-age=100']);
|
||||
$this->assertEquals('max-age=100, private', $bag->get('Cache-Control'));
|
||||
|
||||
$bag = new ResponseHeaderBag(array('cache-control' => 's-maxage=100'));
|
||||
$bag = new ResponseHeaderBag(['cache-control' => 's-maxage=100']);
|
||||
$this->assertEquals('s-maxage=100', $bag->get('Cache-Control'));
|
||||
|
||||
$bag = new ResponseHeaderBag(array('cache-control' => 'private, max-age=100'));
|
||||
$bag = new ResponseHeaderBag(['cache-control' => 'private, max-age=100']);
|
||||
$this->assertEquals('max-age=100, private', $bag->get('Cache-Control'));
|
||||
|
||||
$bag = new ResponseHeaderBag(array('cache-control' => 'public, max-age=100'));
|
||||
$bag = new ResponseHeaderBag(['cache-control' => 'public, max-age=100']);
|
||||
$this->assertEquals('max-age=100, public', $bag->get('Cache-Control'));
|
||||
|
||||
$bag = new ResponseHeaderBag();
|
||||
@@ -88,7 +88,7 @@ class ResponseHeaderBagTest extends TestCase
|
||||
$this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
|
||||
|
||||
$bag = new ResponseHeaderBag();
|
||||
$bag->set('Cache-Control', array('public', 'must-revalidate'));
|
||||
$bag->set('Cache-Control', ['public', 'must-revalidate']);
|
||||
$this->assertCount(1, $bag->get('Cache-Control', null, false));
|
||||
$this->assertEquals('must-revalidate, public', $bag->get('Cache-Control'));
|
||||
|
||||
@@ -101,7 +101,7 @@ class ResponseHeaderBagTest extends TestCase
|
||||
|
||||
public function testCacheControlClone()
|
||||
{
|
||||
$headers = array('foo' => 'bar');
|
||||
$headers = ['foo' => 'bar'];
|
||||
$bag1 = new ResponseHeaderBag($headers);
|
||||
$bag2 = new ResponseHeaderBag($bag1->allPreserveCase());
|
||||
$this->assertEquals($bag1->allPreserveCase(), $bag2->allPreserveCase());
|
||||
@@ -109,7 +109,7 @@ class ResponseHeaderBagTest extends TestCase
|
||||
|
||||
public function testToStringIncludesCookieHeaders()
|
||||
{
|
||||
$bag = new ResponseHeaderBag(array());
|
||||
$bag = new ResponseHeaderBag([]);
|
||||
$bag->setCookie(Cookie::create('foo', 'bar'));
|
||||
|
||||
$this->assertSetCookieHeader('foo=bar; path=/; httponly; samesite=lax', $bag);
|
||||
@@ -121,7 +121,7 @@ class ResponseHeaderBagTest extends TestCase
|
||||
|
||||
public function testClearCookieSecureNotHttpOnly()
|
||||
{
|
||||
$bag = new ResponseHeaderBag(array());
|
||||
$bag = new ResponseHeaderBag([]);
|
||||
|
||||
$bag->clearCookie('foo', '/', null, true, false);
|
||||
|
||||
@@ -130,23 +130,23 @@ class ResponseHeaderBagTest extends TestCase
|
||||
|
||||
public function testReplace()
|
||||
{
|
||||
$bag = new ResponseHeaderBag(array());
|
||||
$bag = new ResponseHeaderBag([]);
|
||||
$this->assertEquals('no-cache, private', $bag->get('Cache-Control'));
|
||||
$this->assertTrue($bag->hasCacheControlDirective('no-cache'));
|
||||
|
||||
$bag->replace(array('Cache-Control' => 'public'));
|
||||
$bag->replace(['Cache-Control' => 'public']);
|
||||
$this->assertEquals('public', $bag->get('Cache-Control'));
|
||||
$this->assertTrue($bag->hasCacheControlDirective('public'));
|
||||
}
|
||||
|
||||
public function testReplaceWithRemove()
|
||||
{
|
||||
$bag = new ResponseHeaderBag(array());
|
||||
$bag = new ResponseHeaderBag([]);
|
||||
$this->assertEquals('no-cache, private', $bag->get('Cache-Control'));
|
||||
$this->assertTrue($bag->hasCacheControlDirective('no-cache'));
|
||||
|
||||
$bag->remove('Cache-Control');
|
||||
$bag->replace(array());
|
||||
$bag->replace([]);
|
||||
$this->assertEquals('no-cache, private', $bag->get('Cache-Control'));
|
||||
$this->assertTrue($bag->hasCacheControlDirective('no-cache'));
|
||||
}
|
||||
@@ -161,12 +161,12 @@ class ResponseHeaderBagTest extends TestCase
|
||||
|
||||
$this->assertCount(4, $bag->getCookies());
|
||||
$this->assertEquals('foo=bar; path=/path/foo; domain=foo.bar; httponly; samesite=lax', $bag->get('set-cookie'));
|
||||
$this->assertEquals(array(
|
||||
$this->assertEquals([
|
||||
'foo=bar; path=/path/foo; domain=foo.bar; httponly; samesite=lax',
|
||||
'foo=bar; path=/path/bar; domain=foo.bar; httponly; samesite=lax',
|
||||
'foo=bar; path=/path/bar; domain=bar.foo; httponly; samesite=lax',
|
||||
'foo=bar; path=/; httponly; samesite=lax',
|
||||
), $bag->get('set-cookie', null, false));
|
||||
], $bag->get('set-cookie', null, false));
|
||||
|
||||
$this->assertSetCookieHeader('foo=bar; path=/path/foo; domain=foo.bar; httponly; samesite=lax', $bag);
|
||||
$this->assertSetCookieHeader('foo=bar; path=/path/bar; domain=foo.bar; httponly; samesite=lax', $bag);
|
||||
@@ -228,16 +228,16 @@ class ResponseHeaderBagTest extends TestCase
|
||||
{
|
||||
$bag = new ResponseHeaderBag();
|
||||
$bag->set('set-cookie', 'foo=bar');
|
||||
$this->assertEquals(array(Cookie::create('foo', 'bar', 0, '/', null, false, false, true, null)), $bag->getCookies());
|
||||
$this->assertEquals([Cookie::create('foo', 'bar', 0, '/', null, false, false, true, null)], $bag->getCookies());
|
||||
|
||||
$bag->set('set-cookie', 'foo2=bar2', false);
|
||||
$this->assertEquals(array(
|
||||
$this->assertEquals([
|
||||
Cookie::create('foo', 'bar', 0, '/', null, false, false, true, null),
|
||||
Cookie::create('foo2', 'bar2', 0, '/', null, false, false, true, null),
|
||||
), $bag->getCookies());
|
||||
], $bag->getCookies());
|
||||
|
||||
$bag->remove('set-cookie');
|
||||
$this->assertEquals(array(), $bag->getCookies());
|
||||
$this->assertEquals([], $bag->getCookies());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -260,8 +260,8 @@ class ResponseHeaderBagTest extends TestCase
|
||||
(string) $headers;
|
||||
|
||||
$allHeaders = $headers->allPreserveCase();
|
||||
$this->assertEquals(array('http://www.symfony.com'), $allHeaders['Location']);
|
||||
$this->assertEquals(array('text/html'), $allHeaders['Content-type']);
|
||||
$this->assertEquals(['http://www.symfony.com'], $allHeaders['Location']);
|
||||
$this->assertEquals(['text/html'], $allHeaders['Content-type']);
|
||||
}
|
||||
|
||||
public function testDateHeaderAddedOnCreation()
|
||||
@@ -277,7 +277,7 @@ class ResponseHeaderBagTest extends TestCase
|
||||
public function testDateHeaderCanBeSetOnCreation()
|
||||
{
|
||||
$someDate = 'Thu, 23 Mar 2017 09:15:12 GMT';
|
||||
$bag = new ResponseHeaderBag(array('Date' => $someDate));
|
||||
$bag = new ResponseHeaderBag(['Date' => $someDate]);
|
||||
|
||||
$this->assertEquals($someDate, $bag->get('Date'));
|
||||
}
|
||||
@@ -285,7 +285,7 @@ class ResponseHeaderBagTest extends TestCase
|
||||
public function testDateHeaderWillBeRecreatedWhenRemoved()
|
||||
{
|
||||
$someDate = 'Thu, 23 Mar 2017 09:15:12 GMT';
|
||||
$bag = new ResponseHeaderBag(array('Date' => $someDate));
|
||||
$bag = new ResponseHeaderBag(['Date' => $someDate]);
|
||||
$bag->remove('Date');
|
||||
|
||||
// a (new) Date header is still present
|
||||
@@ -296,7 +296,7 @@ class ResponseHeaderBagTest extends TestCase
|
||||
public function testDateHeaderWillBeRecreatedWhenHeadersAreReplaced()
|
||||
{
|
||||
$bag = new ResponseHeaderBag();
|
||||
$bag->replace(array());
|
||||
$bag->replace([]);
|
||||
|
||||
$this->assertTrue($bag->has('Date'));
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ class ResponseTest extends ResponseTestCase
|
||||
{
|
||||
public function testCreate()
|
||||
{
|
||||
$response = Response::create('foo', 301, array('Foo' => 'bar'));
|
||||
$response = Response::create('foo', 301, ['Foo' => 'bar']);
|
||||
|
||||
$this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $response);
|
||||
$this->assertEquals(301, $response->getStatusCode());
|
||||
@@ -254,10 +254,10 @@ class ResponseTest extends ResponseTestCase
|
||||
|
||||
public function testIsValidateable()
|
||||
{
|
||||
$response = new Response('', 200, array('Last-Modified' => $this->createDateTimeOneHourAgo()->format(DATE_RFC2822)));
|
||||
$response = new Response('', 200, ['Last-Modified' => $this->createDateTimeOneHourAgo()->format(DATE_RFC2822)]);
|
||||
$this->assertTrue($response->isValidateable(), '->isValidateable() returns true if Last-Modified is present');
|
||||
|
||||
$response = new Response('', 200, array('ETag' => '"12345"'));
|
||||
$response = new Response('', 200, ['ETag' => '"12345"']);
|
||||
$this->assertTrue($response->isValidateable(), '->isValidateable() returns true if ETag is present');
|
||||
|
||||
$response = new Response();
|
||||
@@ -267,7 +267,7 @@ class ResponseTest extends ResponseTestCase
|
||||
public function testGetDate()
|
||||
{
|
||||
$oneHourAgo = $this->createDateTimeOneHourAgo();
|
||||
$response = new Response('', 200, array('Date' => $oneHourAgo->format(DATE_RFC2822)));
|
||||
$response = new Response('', 200, ['Date' => $oneHourAgo->format(DATE_RFC2822)]);
|
||||
$date = $response->getDate();
|
||||
$this->assertEquals($oneHourAgo->getTimestamp(), $date->getTimestamp(), '->getDate() returns the Date header if present');
|
||||
|
||||
@@ -275,7 +275,7 @@ class ResponseTest extends ResponseTestCase
|
||||
$date = $response->getDate();
|
||||
$this->assertEquals(time(), $date->getTimestamp(), '->getDate() returns the current Date if no Date header present');
|
||||
|
||||
$response = new Response('', 200, array('Date' => $this->createDateTimeOneHourAgo()->format(DATE_RFC2822)));
|
||||
$response = new Response('', 200, ['Date' => $this->createDateTimeOneHourAgo()->format(DATE_RFC2822)]);
|
||||
$now = $this->createDateTimeNow();
|
||||
$response->headers->set('Date', $now->format(DATE_RFC2822));
|
||||
$date = $response->getDate();
|
||||
@@ -415,21 +415,21 @@ class ResponseTest extends ResponseTestCase
|
||||
public function testGetVary()
|
||||
{
|
||||
$response = new Response();
|
||||
$this->assertEquals(array(), $response->getVary(), '->getVary() returns an empty array if no Vary header is present');
|
||||
$this->assertEquals([], $response->getVary(), '->getVary() returns an empty array if no Vary header is present');
|
||||
|
||||
$response = new Response();
|
||||
$response->headers->set('Vary', 'Accept-Language');
|
||||
$this->assertEquals(array('Accept-Language'), $response->getVary(), '->getVary() parses a single header name value');
|
||||
$this->assertEquals(['Accept-Language'], $response->getVary(), '->getVary() parses a single header name value');
|
||||
|
||||
$response = new Response();
|
||||
$response->headers->set('Vary', 'Accept-Language User-Agent X-Foo');
|
||||
$this->assertEquals(array('Accept-Language', 'User-Agent', 'X-Foo'), $response->getVary(), '->getVary() parses multiple header name values separated by spaces');
|
||||
$this->assertEquals(['Accept-Language', 'User-Agent', 'X-Foo'], $response->getVary(), '->getVary() parses multiple header name values separated by spaces');
|
||||
|
||||
$response = new Response();
|
||||
$response->headers->set('Vary', 'Accept-Language,User-Agent, X-Foo');
|
||||
$this->assertEquals(array('Accept-Language', 'User-Agent', 'X-Foo'), $response->getVary(), '->getVary() parses multiple header name values separated by commas');
|
||||
$this->assertEquals(['Accept-Language', 'User-Agent', 'X-Foo'], $response->getVary(), '->getVary() parses multiple header name values separated by commas');
|
||||
|
||||
$vary = array('Accept-Language', 'User-Agent', 'X-foo');
|
||||
$vary = ['Accept-Language', 'User-Agent', 'X-foo'];
|
||||
|
||||
$response = new Response();
|
||||
$response->headers->set('Vary', $vary);
|
||||
@@ -444,18 +444,18 @@ class ResponseTest extends ResponseTestCase
|
||||
{
|
||||
$response = new Response();
|
||||
$response->setVary('Accept-Language');
|
||||
$this->assertEquals(array('Accept-Language'), $response->getVary());
|
||||
$this->assertEquals(['Accept-Language'], $response->getVary());
|
||||
|
||||
$response->setVary('Accept-Language, User-Agent');
|
||||
$this->assertEquals(array('Accept-Language', 'User-Agent'), $response->getVary(), '->setVary() replace the vary header by default');
|
||||
$this->assertEquals(['Accept-Language', 'User-Agent'], $response->getVary(), '->setVary() replace the vary header by default');
|
||||
|
||||
$response->setVary('X-Foo', false);
|
||||
$this->assertEquals(array('Accept-Language', 'User-Agent', 'X-Foo'), $response->getVary(), '->setVary() doesn\'t wipe out earlier Vary headers if replace is set to false');
|
||||
$this->assertEquals(['Accept-Language', 'User-Agent', 'X-Foo'], $response->getVary(), '->setVary() doesn\'t wipe out earlier Vary headers if replace is set to false');
|
||||
}
|
||||
|
||||
public function testDefaultContentType()
|
||||
{
|
||||
$headerMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\ResponseHeaderBag')->setMethods(array('set'))->getMock();
|
||||
$headerMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\ResponseHeaderBag')->setMethods(['set'])->getMock();
|
||||
$headerMock->expects($this->at(0))
|
||||
->method('set')
|
||||
->with('Content-Type', 'text/html');
|
||||
@@ -595,55 +595,55 @@ class ResponseTest extends ResponseTestCase
|
||||
public function testSetCache()
|
||||
{
|
||||
$response = new Response();
|
||||
//array('etag', 'last_modified', 'max_age', 's_maxage', 'private', 'public')
|
||||
// ['etag', 'last_modified', 'max_age', 's_maxage', 'private', 'public']
|
||||
try {
|
||||
$response->setCache(array('wrong option' => 'value'));
|
||||
$response->setCache(['wrong option' => 'value']);
|
||||
$this->fail('->setCache() throws an InvalidArgumentException if an option is not supported');
|
||||
} catch (\Exception $e) {
|
||||
$this->assertInstanceOf('InvalidArgumentException', $e, '->setCache() throws an InvalidArgumentException if an option is not supported');
|
||||
$this->assertContains('"wrong option"', $e->getMessage());
|
||||
}
|
||||
|
||||
$options = array('etag' => '"whatever"');
|
||||
$options = ['etag' => '"whatever"'];
|
||||
$response->setCache($options);
|
||||
$this->assertEquals($response->getEtag(), '"whatever"');
|
||||
|
||||
$now = $this->createDateTimeNow();
|
||||
$options = array('last_modified' => $now);
|
||||
$options = ['last_modified' => $now];
|
||||
$response->setCache($options);
|
||||
$this->assertEquals($response->getLastModified()->getTimestamp(), $now->getTimestamp());
|
||||
|
||||
$options = array('max_age' => 100);
|
||||
$options = ['max_age' => 100];
|
||||
$response->setCache($options);
|
||||
$this->assertEquals($response->getMaxAge(), 100);
|
||||
|
||||
$options = array('s_maxage' => 200);
|
||||
$options = ['s_maxage' => 200];
|
||||
$response->setCache($options);
|
||||
$this->assertEquals($response->getMaxAge(), 200);
|
||||
|
||||
$this->assertTrue($response->headers->hasCacheControlDirective('public'));
|
||||
$this->assertFalse($response->headers->hasCacheControlDirective('private'));
|
||||
|
||||
$response->setCache(array('public' => true));
|
||||
$response->setCache(['public' => true]);
|
||||
$this->assertTrue($response->headers->hasCacheControlDirective('public'));
|
||||
$this->assertFalse($response->headers->hasCacheControlDirective('private'));
|
||||
|
||||
$response->setCache(array('public' => false));
|
||||
$response->setCache(['public' => false]);
|
||||
$this->assertFalse($response->headers->hasCacheControlDirective('public'));
|
||||
$this->assertTrue($response->headers->hasCacheControlDirective('private'));
|
||||
|
||||
$response->setCache(array('private' => true));
|
||||
$response->setCache(['private' => true]);
|
||||
$this->assertFalse($response->headers->hasCacheControlDirective('public'));
|
||||
$this->assertTrue($response->headers->hasCacheControlDirective('private'));
|
||||
|
||||
$response->setCache(array('private' => false));
|
||||
$response->setCache(['private' => false]);
|
||||
$this->assertTrue($response->headers->hasCacheControlDirective('public'));
|
||||
$this->assertFalse($response->headers->hasCacheControlDirective('private'));
|
||||
|
||||
$response->setCache(array('immutable' => true));
|
||||
$response->setCache(['immutable' => true]);
|
||||
$this->assertTrue($response->headers->hasCacheControlDirective('immutable'));
|
||||
|
||||
$response->setCache(array('immutable' => false));
|
||||
$response->setCache(['immutable' => false]);
|
||||
$this->assertFalse($response->headers->hasCacheControlDirective('immutable'));
|
||||
}
|
||||
|
||||
@@ -780,14 +780,14 @@ class ResponseTest extends ResponseTestCase
|
||||
|
||||
public function getStatusCodeFixtures()
|
||||
{
|
||||
return array(
|
||||
array('200', null, 'OK'),
|
||||
array('200', false, ''),
|
||||
array('200', 'foo', 'foo'),
|
||||
array('199', null, 'unknown status'),
|
||||
array('199', false, ''),
|
||||
array('199', 'foo', 'foo'),
|
||||
);
|
||||
return [
|
||||
['200', null, 'OK'],
|
||||
['200', false, ''],
|
||||
['200', 'foo', 'foo'],
|
||||
['199', null, 'unknown status'],
|
||||
['199', false, ''],
|
||||
['199', 'foo', 'foo'],
|
||||
];
|
||||
}
|
||||
|
||||
public function testIsInformational()
|
||||
@@ -801,7 +801,7 @@ class ResponseTest extends ResponseTestCase
|
||||
|
||||
public function testIsRedirectRedirection()
|
||||
{
|
||||
foreach (array(301, 302, 303, 307) as $code) {
|
||||
foreach ([301, 302, 303, 307] as $code) {
|
||||
$response = new Response('', $code);
|
||||
$this->assertTrue($response->isRedirection());
|
||||
$this->assertTrue($response->isRedirect());
|
||||
@@ -819,7 +819,7 @@ class ResponseTest extends ResponseTestCase
|
||||
$this->assertFalse($response->isRedirection());
|
||||
$this->assertFalse($response->isRedirect());
|
||||
|
||||
$response = new Response('', 301, array('Location' => '/good-uri'));
|
||||
$response = new Response('', 301, ['Location' => '/good-uri']);
|
||||
$this->assertFalse($response->isRedirect('/bad-uri'));
|
||||
$this->assertTrue($response->isRedirect('/good-uri'));
|
||||
}
|
||||
@@ -835,7 +835,7 @@ class ResponseTest extends ResponseTestCase
|
||||
|
||||
public function testIsEmpty()
|
||||
{
|
||||
foreach (array(204, 304) as $code) {
|
||||
foreach ([204, 304] as $code) {
|
||||
$response = new Response('', $code);
|
||||
$this->assertTrue($response->isEmpty());
|
||||
}
|
||||
@@ -884,7 +884,7 @@ class ResponseTest extends ResponseTestCase
|
||||
|
||||
public function testSetEtag()
|
||||
{
|
||||
$response = new Response('', 200, array('ETag' => '"12345"'));
|
||||
$response = new Response('', 200, ['ETag' => '"12345"']);
|
||||
$response->setEtag();
|
||||
|
||||
$this->assertNull($response->headers->get('Etag'), '->setEtag() removes Etags when call with null');
|
||||
@@ -914,7 +914,7 @@ class ResponseTest extends ResponseTestCase
|
||||
{
|
||||
$response = new Response();
|
||||
|
||||
$setters = array(
|
||||
$setters = [
|
||||
'setProtocolVersion' => '1.0',
|
||||
'setCharset' => 'UTF-8',
|
||||
'setPublic' => null,
|
||||
@@ -925,7 +925,7 @@ class ResponseTest extends ResponseTestCase
|
||||
'setSharedMaxAge' => 1,
|
||||
'setTtl' => 1,
|
||||
'setClientTtl' => 1,
|
||||
);
|
||||
];
|
||||
|
||||
foreach ($setters as $setter => $arg) {
|
||||
$this->assertEquals($response, $response->{$setter}($arg));
|
||||
@@ -944,20 +944,20 @@ class ResponseTest extends ResponseTestCase
|
||||
|
||||
public function validContentProvider()
|
||||
{
|
||||
return array(
|
||||
'obj' => array(new StringableObject()),
|
||||
'string' => array('Foo'),
|
||||
'int' => array(2),
|
||||
);
|
||||
return [
|
||||
'obj' => [new StringableObject()],
|
||||
'string' => ['Foo'],
|
||||
'int' => [2],
|
||||
];
|
||||
}
|
||||
|
||||
public function invalidContentProvider()
|
||||
{
|
||||
return array(
|
||||
'obj' => array(new \stdClass()),
|
||||
'array' => array(array()),
|
||||
'bool' => array(true, '1'),
|
||||
);
|
||||
return [
|
||||
'obj' => [new \stdClass()],
|
||||
'array' => [[]],
|
||||
'bool' => [true, '1'],
|
||||
];
|
||||
}
|
||||
|
||||
protected function createDateTimeOneHourAgo()
|
||||
@@ -1004,19 +1004,20 @@ class ResponseTest extends ResponseTestCase
|
||||
|
||||
$ianaHttpStatusCodes = new \DOMDocument();
|
||||
|
||||
libxml_set_streams_context(stream_context_create(array(
|
||||
'http' => array(
|
||||
$context = stream_context_create([
|
||||
'http' => [
|
||||
'method' => 'GET',
|
||||
'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')) {
|
||||
self::fail('Invalid IANA\'s HTTP status code list.');
|
||||
}
|
||||
|
||||
$ianaCodesReasonPhrases = array();
|
||||
$ianaCodesReasonPhrases = [];
|
||||
|
||||
$xpath = new \DOMXPath($ianaHttpStatusCodes);
|
||||
$xpath->registerNamespace('ns', 'http://www.iana.org/assignments');
|
||||
@@ -1026,16 +1027,16 @@ class ResponseTest extends ResponseTestCase
|
||||
$value = $xpath->query('.//ns:value', $record)->item(0)->nodeValue;
|
||||
$description = $xpath->query('.//ns:description', $record)->item(0)->nodeValue;
|
||||
|
||||
if (\in_array($description, array('Unassigned', '(Unused)'), true)) {
|
||||
if (\in_array($description, ['Unassigned', '(Unused)'], true)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (preg_match('/^([0-9]+)\s*\-\s*([0-9]+)$/', $value, $matches)) {
|
||||
for ($value = $matches[1]; $value <= $matches[2]; ++$value) {
|
||||
$ianaCodesReasonPhrases[] = array($value, $description);
|
||||
$ianaCodesReasonPhrases[] = [$value, $description];
|
||||
}
|
||||
} else {
|
||||
$ianaCodesReasonPhrases[] = array($value, $description);
|
||||
$ianaCodesReasonPhrases[] = [$value, $description];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ class ServerBagTest extends TestCase
|
||||
{
|
||||
public function testShouldExtractHeadersFromServerArray()
|
||||
{
|
||||
$server = array(
|
||||
$server = [
|
||||
'SOME_SERVER_VARIABLE' => 'value',
|
||||
'SOME_SERVER_VARIABLE2' => 'value',
|
||||
'ROOT' => 'value',
|
||||
@@ -32,45 +32,45 @@ class ServerBagTest extends TestCase
|
||||
'HTTP_ETAG' => 'asdf',
|
||||
'PHP_AUTH_USER' => 'foo',
|
||||
'PHP_AUTH_PW' => 'bar',
|
||||
);
|
||||
];
|
||||
|
||||
$bag = new ServerBag($server);
|
||||
|
||||
$this->assertEquals(array(
|
||||
$this->assertEquals([
|
||||
'CONTENT_TYPE' => 'text/html',
|
||||
'CONTENT_LENGTH' => '0',
|
||||
'ETAG' => 'asdf',
|
||||
'AUTHORIZATION' => 'Basic '.base64_encode('foo:bar'),
|
||||
'PHP_AUTH_USER' => 'foo',
|
||||
'PHP_AUTH_PW' => 'bar',
|
||||
), $bag->getHeaders());
|
||||
], $bag->getHeaders());
|
||||
}
|
||||
|
||||
public function testHttpPasswordIsOptional()
|
||||
{
|
||||
$bag = new ServerBag(array('PHP_AUTH_USER' => 'foo'));
|
||||
$bag = new ServerBag(['PHP_AUTH_USER' => 'foo']);
|
||||
|
||||
$this->assertEquals(array(
|
||||
$this->assertEquals([
|
||||
'AUTHORIZATION' => 'Basic '.base64_encode('foo:'),
|
||||
'PHP_AUTH_USER' => 'foo',
|
||||
'PHP_AUTH_PW' => '',
|
||||
), $bag->getHeaders());
|
||||
], $bag->getHeaders());
|
||||
}
|
||||
|
||||
public function testHttpBasicAuthWithPhpCgi()
|
||||
{
|
||||
$bag = new ServerBag(array('HTTP_AUTHORIZATION' => 'Basic '.base64_encode('foo:bar')));
|
||||
$bag = new ServerBag(['HTTP_AUTHORIZATION' => 'Basic '.base64_encode('foo:bar')]);
|
||||
|
||||
$this->assertEquals(array(
|
||||
$this->assertEquals([
|
||||
'AUTHORIZATION' => 'Basic '.base64_encode('foo:bar'),
|
||||
'PHP_AUTH_USER' => 'foo',
|
||||
'PHP_AUTH_PW' => 'bar',
|
||||
), $bag->getHeaders());
|
||||
], $bag->getHeaders());
|
||||
}
|
||||
|
||||
public function testHttpBasicAuthWithPhpCgiBogus()
|
||||
{
|
||||
$bag = new ServerBag(array('HTTP_AUTHORIZATION' => 'Basic_'.base64_encode('foo:bar')));
|
||||
$bag = new ServerBag(['HTTP_AUTHORIZATION' => 'Basic_'.base64_encode('foo:bar')]);
|
||||
|
||||
// Username and passwords should not be set as the header is bogus
|
||||
$headers = $bag->getHeaders();
|
||||
@@ -80,41 +80,41 @@ class ServerBagTest extends TestCase
|
||||
|
||||
public function testHttpBasicAuthWithPhpCgiRedirect()
|
||||
{
|
||||
$bag = new ServerBag(array('REDIRECT_HTTP_AUTHORIZATION' => 'Basic '.base64_encode('username:pass:word')));
|
||||
$bag = new ServerBag(['REDIRECT_HTTP_AUTHORIZATION' => 'Basic '.base64_encode('username:pass:word')]);
|
||||
|
||||
$this->assertEquals(array(
|
||||
$this->assertEquals([
|
||||
'AUTHORIZATION' => 'Basic '.base64_encode('username:pass:word'),
|
||||
'PHP_AUTH_USER' => 'username',
|
||||
'PHP_AUTH_PW' => 'pass:word',
|
||||
), $bag->getHeaders());
|
||||
], $bag->getHeaders());
|
||||
}
|
||||
|
||||
public function testHttpBasicAuthWithPhpCgiEmptyPassword()
|
||||
{
|
||||
$bag = new ServerBag(array('HTTP_AUTHORIZATION' => 'Basic '.base64_encode('foo:')));
|
||||
$bag = new ServerBag(['HTTP_AUTHORIZATION' => 'Basic '.base64_encode('foo:')]);
|
||||
|
||||
$this->assertEquals(array(
|
||||
$this->assertEquals([
|
||||
'AUTHORIZATION' => 'Basic '.base64_encode('foo:'),
|
||||
'PHP_AUTH_USER' => 'foo',
|
||||
'PHP_AUTH_PW' => '',
|
||||
), $bag->getHeaders());
|
||||
], $bag->getHeaders());
|
||||
}
|
||||
|
||||
public function testHttpDigestAuthWithPhpCgi()
|
||||
{
|
||||
$digest = 'Digest username="foo", realm="acme", nonce="'.md5('secret').'", uri="/protected, qop="auth"';
|
||||
$bag = new ServerBag(array('HTTP_AUTHORIZATION' => $digest));
|
||||
$bag = new ServerBag(['HTTP_AUTHORIZATION' => $digest]);
|
||||
|
||||
$this->assertEquals(array(
|
||||
$this->assertEquals([
|
||||
'AUTHORIZATION' => $digest,
|
||||
'PHP_AUTH_DIGEST' => $digest,
|
||||
), $bag->getHeaders());
|
||||
], $bag->getHeaders());
|
||||
}
|
||||
|
||||
public function testHttpDigestAuthWithPhpCgiBogus()
|
||||
{
|
||||
$digest = 'Digest_username="foo", realm="acme", nonce="'.md5('secret').'", uri="/protected, qop="auth"';
|
||||
$bag = new ServerBag(array('HTTP_AUTHORIZATION' => $digest));
|
||||
$bag = new ServerBag(['HTTP_AUTHORIZATION' => $digest]);
|
||||
|
||||
// Username and passwords should not be set as the header is bogus
|
||||
$headers = $bag->getHeaders();
|
||||
@@ -125,32 +125,32 @@ class ServerBagTest extends TestCase
|
||||
public function testHttpDigestAuthWithPhpCgiRedirect()
|
||||
{
|
||||
$digest = 'Digest username="foo", realm="acme", nonce="'.md5('secret').'", uri="/protected, qop="auth"';
|
||||
$bag = new ServerBag(array('REDIRECT_HTTP_AUTHORIZATION' => $digest));
|
||||
$bag = new ServerBag(['REDIRECT_HTTP_AUTHORIZATION' => $digest]);
|
||||
|
||||
$this->assertEquals(array(
|
||||
$this->assertEquals([
|
||||
'AUTHORIZATION' => $digest,
|
||||
'PHP_AUTH_DIGEST' => $digest,
|
||||
), $bag->getHeaders());
|
||||
], $bag->getHeaders());
|
||||
}
|
||||
|
||||
public function testOAuthBearerAuth()
|
||||
{
|
||||
$headerContent = 'Bearer L-yLEOr9zhmUYRkzN1jwwxwQ-PBNiKDc8dgfB4hTfvo';
|
||||
$bag = new ServerBag(array('HTTP_AUTHORIZATION' => $headerContent));
|
||||
$bag = new ServerBag(['HTTP_AUTHORIZATION' => $headerContent]);
|
||||
|
||||
$this->assertEquals(array(
|
||||
$this->assertEquals([
|
||||
'AUTHORIZATION' => $headerContent,
|
||||
), $bag->getHeaders());
|
||||
], $bag->getHeaders());
|
||||
}
|
||||
|
||||
public function testOAuthBearerAuthWithRedirect()
|
||||
{
|
||||
$headerContent = 'Bearer L-yLEOr9zhmUYRkzN1jwwxwQ-PBNiKDc8dgfB4hTfvo';
|
||||
$bag = new ServerBag(array('REDIRECT_HTTP_AUTHORIZATION' => $headerContent));
|
||||
$bag = new ServerBag(['REDIRECT_HTTP_AUTHORIZATION' => $headerContent]);
|
||||
|
||||
$this->assertEquals(array(
|
||||
$this->assertEquals([
|
||||
'AUTHORIZATION' => $headerContent,
|
||||
), $bag->getHeaders());
|
||||
], $bag->getHeaders());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -159,12 +159,12 @@ class ServerBagTest extends TestCase
|
||||
public function testItDoesNotOverwriteTheAuthorizationHeaderIfItIsAlreadySet()
|
||||
{
|
||||
$headerContent = 'Bearer L-yLEOr9zhmUYRkzN1jwwxwQ-PBNiKDc8dgfB4hTfvo';
|
||||
$bag = new ServerBag(array('PHP_AUTH_USER' => 'foo', 'HTTP_AUTHORIZATION' => $headerContent));
|
||||
$bag = new ServerBag(['PHP_AUTH_USER' => 'foo', 'HTTP_AUTHORIZATION' => $headerContent]);
|
||||
|
||||
$this->assertEquals(array(
|
||||
$this->assertEquals([
|
||||
'AUTHORIZATION' => $headerContent,
|
||||
'PHP_AUTH_USER' => 'foo',
|
||||
'PHP_AUTH_PW' => '',
|
||||
), $bag->getHeaders());
|
||||
], $bag->getHeaders());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
|
||||
*/
|
||||
class AttributeBagTest extends TestCase
|
||||
{
|
||||
private $array = array();
|
||||
private $array = [];
|
||||
|
||||
/**
|
||||
* @var AttributeBag
|
||||
@@ -30,21 +30,21 @@ class AttributeBagTest extends TestCase
|
||||
|
||||
protected function setUp()
|
||||
{
|
||||
$this->array = array(
|
||||
$this->array = [
|
||||
'hello' => 'world',
|
||||
'always' => 'be happy',
|
||||
'user.login' => 'drak',
|
||||
'csrf.token' => array(
|
||||
'csrf.token' => [
|
||||
'a' => '1234',
|
||||
'b' => '4321',
|
||||
),
|
||||
'category' => array(
|
||||
'fishing' => array(
|
||||
],
|
||||
'category' => [
|
||||
'fishing' => [
|
||||
'first' => 'cod',
|
||||
'second' => 'sole',
|
||||
),
|
||||
),
|
||||
);
|
||||
],
|
||||
],
|
||||
];
|
||||
$this->bag = new AttributeBag('_sf');
|
||||
$this->bag->initialize($this->array);
|
||||
}
|
||||
@@ -52,7 +52,7 @@ class AttributeBagTest extends TestCase
|
||||
protected function tearDown()
|
||||
{
|
||||
$this->bag = null;
|
||||
$this->array = array();
|
||||
$this->array = [];
|
||||
}
|
||||
|
||||
public function testInitialize()
|
||||
@@ -60,7 +60,7 @@ class AttributeBagTest extends TestCase
|
||||
$bag = new AttributeBag();
|
||||
$bag->initialize($this->array);
|
||||
$this->assertEquals($this->array, $bag->all());
|
||||
$array = array('should' => 'change');
|
||||
$array = ['should' => 'change'];
|
||||
$bag->initialize($array);
|
||||
$this->assertEquals($array, $bag->all());
|
||||
}
|
||||
@@ -122,7 +122,7 @@ class AttributeBagTest extends TestCase
|
||||
|
||||
public function testReplace()
|
||||
{
|
||||
$array = array();
|
||||
$array = [];
|
||||
$array['name'] = 'jack';
|
||||
$array['foo.bar'] = 'beep';
|
||||
$this->bag->replace($array);
|
||||
@@ -150,22 +150,22 @@ class AttributeBagTest extends TestCase
|
||||
public function testClear()
|
||||
{
|
||||
$this->bag->clear();
|
||||
$this->assertEquals(array(), $this->bag->all());
|
||||
$this->assertEquals([], $this->bag->all());
|
||||
}
|
||||
|
||||
public function attributesProvider()
|
||||
{
|
||||
return array(
|
||||
array('hello', 'world', true),
|
||||
array('always', 'be happy', true),
|
||||
array('user.login', 'drak', true),
|
||||
array('csrf.token', array('a' => '1234', 'b' => '4321'), true),
|
||||
array('category', array('fishing' => array('first' => 'cod', 'second' => 'sole')), true),
|
||||
array('user2.login', null, false),
|
||||
array('never', null, false),
|
||||
array('bye', null, false),
|
||||
array('bye/for/now', null, false),
|
||||
);
|
||||
return [
|
||||
['hello', 'world', true],
|
||||
['always', 'be happy', true],
|
||||
['user.login', 'drak', true],
|
||||
['csrf.token', ['a' => '1234', 'b' => '4321'], true],
|
||||
['category', ['fishing' => ['first' => 'cod', 'second' => 'sole']], true],
|
||||
['user2.login', null, false],
|
||||
['never', null, false],
|
||||
['bye', null, false],
|
||||
['bye/for/now', null, false],
|
||||
];
|
||||
}
|
||||
|
||||
public function testGetIterator()
|
||||
|
||||
@@ -21,7 +21,7 @@ use Symfony\Component\HttpFoundation\Session\Attribute\NamespacedAttributeBag;
|
||||
*/
|
||||
class NamespacedAttributeBagTest extends TestCase
|
||||
{
|
||||
private $array = array();
|
||||
private $array = [];
|
||||
|
||||
/**
|
||||
* @var NamespacedAttributeBag
|
||||
@@ -30,21 +30,21 @@ class NamespacedAttributeBagTest extends TestCase
|
||||
|
||||
protected function setUp()
|
||||
{
|
||||
$this->array = array(
|
||||
$this->array = [
|
||||
'hello' => 'world',
|
||||
'always' => 'be happy',
|
||||
'user.login' => 'drak',
|
||||
'csrf.token' => array(
|
||||
'csrf.token' => [
|
||||
'a' => '1234',
|
||||
'b' => '4321',
|
||||
),
|
||||
'category' => array(
|
||||
'fishing' => array(
|
||||
],
|
||||
'category' => [
|
||||
'fishing' => [
|
||||
'first' => 'cod',
|
||||
'second' => 'sole',
|
||||
),
|
||||
),
|
||||
);
|
||||
],
|
||||
],
|
||||
];
|
||||
$this->bag = new NamespacedAttributeBag('_sf2', '/');
|
||||
$this->bag->initialize($this->array);
|
||||
}
|
||||
@@ -52,7 +52,7 @@ class NamespacedAttributeBagTest extends TestCase
|
||||
protected function tearDown()
|
||||
{
|
||||
$this->bag = null;
|
||||
$this->array = array();
|
||||
$this->array = [];
|
||||
}
|
||||
|
||||
public function testInitialize()
|
||||
@@ -60,7 +60,7 @@ class NamespacedAttributeBagTest extends TestCase
|
||||
$bag = new NamespacedAttributeBag();
|
||||
$bag->initialize($this->array);
|
||||
$this->assertEquals($this->array, $this->bag->all());
|
||||
$array = array('should' => 'not stick');
|
||||
$array = ['should' => 'not stick'];
|
||||
$bag->initialize($array);
|
||||
|
||||
// should have remained the same
|
||||
@@ -139,7 +139,7 @@ class NamespacedAttributeBagTest extends TestCase
|
||||
|
||||
public function testReplace()
|
||||
{
|
||||
$array = array();
|
||||
$array = [];
|
||||
$array['name'] = 'jack';
|
||||
$array['foo.bar'] = 'beep';
|
||||
$this->bag->replace($array);
|
||||
@@ -177,28 +177,28 @@ class NamespacedAttributeBagTest extends TestCase
|
||||
public function testClear()
|
||||
{
|
||||
$this->bag->clear();
|
||||
$this->assertEquals(array(), $this->bag->all());
|
||||
$this->assertEquals([], $this->bag->all());
|
||||
}
|
||||
|
||||
public function attributesProvider()
|
||||
{
|
||||
return array(
|
||||
array('hello', 'world', true),
|
||||
array('always', 'be happy', true),
|
||||
array('user.login', 'drak', true),
|
||||
array('csrf.token', array('a' => '1234', 'b' => '4321'), true),
|
||||
array('csrf.token/a', '1234', true),
|
||||
array('csrf.token/b', '4321', true),
|
||||
array('category', array('fishing' => array('first' => 'cod', 'second' => 'sole')), true),
|
||||
array('category/fishing', array('first' => 'cod', 'second' => 'sole'), true),
|
||||
array('category/fishing/missing/first', null, false),
|
||||
array('category/fishing/first', 'cod', true),
|
||||
array('category/fishing/second', 'sole', true),
|
||||
array('category/fishing/missing/second', null, false),
|
||||
array('user2.login', null, false),
|
||||
array('never', null, false),
|
||||
array('bye', null, false),
|
||||
array('bye/for/now', null, false),
|
||||
);
|
||||
return [
|
||||
['hello', 'world', true],
|
||||
['always', 'be happy', true],
|
||||
['user.login', 'drak', true],
|
||||
['csrf.token', ['a' => '1234', 'b' => '4321'], true],
|
||||
['csrf.token/a', '1234', true],
|
||||
['csrf.token/b', '4321', true],
|
||||
['category', ['fishing' => ['first' => 'cod', 'second' => 'sole']], true],
|
||||
['category/fishing', ['first' => 'cod', 'second' => 'sole'], true],
|
||||
['category/fishing/missing/first', null, false],
|
||||
['category/fishing/first', 'cod', true],
|
||||
['category/fishing/second', 'sole', true],
|
||||
['category/fishing/missing/second', null, false],
|
||||
['user2.login', null, false],
|
||||
['never', null, false],
|
||||
['bye', null, false],
|
||||
['bye/for/now', null, false],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,13 +26,13 @@ class AutoExpireFlashBagTest extends TestCase
|
||||
*/
|
||||
private $bag;
|
||||
|
||||
protected $array = array();
|
||||
protected $array = [];
|
||||
|
||||
protected function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->bag = new FlashBag();
|
||||
$this->array = array('new' => array('notice' => array('A previous flash message')));
|
||||
$this->array = ['new' => ['notice' => ['A previous flash message']]];
|
||||
$this->bag->initialize($this->array);
|
||||
}
|
||||
|
||||
@@ -45,16 +45,16 @@ class AutoExpireFlashBagTest extends TestCase
|
||||
public function testInitialize()
|
||||
{
|
||||
$bag = new FlashBag();
|
||||
$array = array('new' => array('notice' => array('A previous flash message')));
|
||||
$array = ['new' => ['notice' => ['A previous flash message']]];
|
||||
$bag->initialize($array);
|
||||
$this->assertEquals(array('A previous flash message'), $bag->peek('notice'));
|
||||
$array = array('new' => array(
|
||||
'notice' => array('Something else'),
|
||||
'error' => array('a'),
|
||||
));
|
||||
$this->assertEquals(['A previous flash message'], $bag->peek('notice'));
|
||||
$array = ['new' => [
|
||||
'notice' => ['Something else'],
|
||||
'error' => ['a'],
|
||||
]];
|
||||
$bag->initialize($array);
|
||||
$this->assertEquals(array('Something else'), $bag->peek('notice'));
|
||||
$this->assertEquals(array('a'), $bag->peek('error'));
|
||||
$this->assertEquals(['Something else'], $bag->peek('notice'));
|
||||
$this->assertEquals(['a'], $bag->peek('error'));
|
||||
}
|
||||
|
||||
public function testGetStorageKey()
|
||||
@@ -73,16 +73,16 @@ class AutoExpireFlashBagTest extends TestCase
|
||||
|
||||
public function testPeek()
|
||||
{
|
||||
$this->assertEquals(array(), $this->bag->peek('non_existing'));
|
||||
$this->assertEquals(array('default'), $this->bag->peek('non_existing', array('default')));
|
||||
$this->assertEquals(array('A previous flash message'), $this->bag->peek('notice'));
|
||||
$this->assertEquals(array('A previous flash message'), $this->bag->peek('notice'));
|
||||
$this->assertEquals([], $this->bag->peek('non_existing'));
|
||||
$this->assertEquals(['default'], $this->bag->peek('non_existing', ['default']));
|
||||
$this->assertEquals(['A previous flash message'], $this->bag->peek('notice'));
|
||||
$this->assertEquals(['A previous flash message'], $this->bag->peek('notice'));
|
||||
}
|
||||
|
||||
public function testSet()
|
||||
{
|
||||
$this->bag->set('notice', 'Foo');
|
||||
$this->assertEquals(array('A previous flash message'), $this->bag->peek('notice'));
|
||||
$this->assertEquals(['A previous flash message'], $this->bag->peek('notice'));
|
||||
}
|
||||
|
||||
public function testHas()
|
||||
@@ -93,43 +93,43 @@ class AutoExpireFlashBagTest extends TestCase
|
||||
|
||||
public function testKeys()
|
||||
{
|
||||
$this->assertEquals(array('notice'), $this->bag->keys());
|
||||
$this->assertEquals(['notice'], $this->bag->keys());
|
||||
}
|
||||
|
||||
public function testPeekAll()
|
||||
{
|
||||
$array = array(
|
||||
'new' => array(
|
||||
$array = [
|
||||
'new' => [
|
||||
'notice' => 'Foo',
|
||||
'error' => 'Bar',
|
||||
),
|
||||
);
|
||||
],
|
||||
];
|
||||
|
||||
$this->bag->initialize($array);
|
||||
$this->assertEquals(array(
|
||||
$this->assertEquals([
|
||||
'notice' => 'Foo',
|
||||
'error' => 'Bar',
|
||||
), $this->bag->peekAll()
|
||||
], $this->bag->peekAll()
|
||||
);
|
||||
|
||||
$this->assertEquals(array(
|
||||
$this->assertEquals([
|
||||
'notice' => 'Foo',
|
||||
'error' => 'Bar',
|
||||
), $this->bag->peekAll()
|
||||
], $this->bag->peekAll()
|
||||
);
|
||||
}
|
||||
|
||||
public function testGet()
|
||||
{
|
||||
$this->assertEquals(array(), $this->bag->get('non_existing'));
|
||||
$this->assertEquals(array('default'), $this->bag->get('non_existing', array('default')));
|
||||
$this->assertEquals(array('A previous flash message'), $this->bag->get('notice'));
|
||||
$this->assertEquals(array(), $this->bag->get('notice'));
|
||||
$this->assertEquals([], $this->bag->get('non_existing'));
|
||||
$this->assertEquals(['default'], $this->bag->get('non_existing', ['default']));
|
||||
$this->assertEquals(['A previous flash message'], $this->bag->get('notice'));
|
||||
$this->assertEquals([], $this->bag->get('notice'));
|
||||
}
|
||||
|
||||
public function testSetAll()
|
||||
{
|
||||
$this->bag->setAll(array('a' => 'first', 'b' => 'second'));
|
||||
$this->bag->setAll(['a' => 'first', 'b' => 'second']);
|
||||
$this->assertFalse($this->bag->has('a'));
|
||||
$this->assertFalse($this->bag->has('b'));
|
||||
}
|
||||
@@ -138,17 +138,17 @@ class AutoExpireFlashBagTest extends TestCase
|
||||
{
|
||||
$this->bag->set('notice', 'Foo');
|
||||
$this->bag->set('error', 'Bar');
|
||||
$this->assertEquals(array(
|
||||
'notice' => array('A previous flash message'),
|
||||
), $this->bag->all()
|
||||
$this->assertEquals([
|
||||
'notice' => ['A previous flash message'],
|
||||
], $this->bag->all()
|
||||
);
|
||||
|
||||
$this->assertEquals(array(), $this->bag->all());
|
||||
$this->assertEquals([], $this->bag->all());
|
||||
}
|
||||
|
||||
public function testClear()
|
||||
{
|
||||
$this->assertEquals(array('notice' => array('A previous flash message')), $this->bag->clear());
|
||||
$this->assertEquals(['notice' => ['A previous flash message']], $this->bag->clear());
|
||||
}
|
||||
|
||||
public function testDoNotRemoveTheNewFlashesWhenDisplayingTheExistingOnes()
|
||||
@@ -156,6 +156,6 @@ class AutoExpireFlashBagTest extends TestCase
|
||||
$this->bag->add('success', 'Something');
|
||||
$this->bag->all();
|
||||
|
||||
$this->assertEquals(array('new' => array('success' => array('Something')), 'display' => array()), $this->array);
|
||||
$this->assertEquals(['new' => ['success' => ['Something']], 'display' => []], $this->array);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,13 +26,13 @@ class FlashBagTest extends TestCase
|
||||
*/
|
||||
private $bag;
|
||||
|
||||
protected $array = array();
|
||||
protected $array = [];
|
||||
|
||||
protected function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->bag = new FlashBag();
|
||||
$this->array = array('notice' => array('A previous flash message'));
|
||||
$this->array = ['notice' => ['A previous flash message']];
|
||||
$this->bag->initialize($this->array);
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ class FlashBagTest extends TestCase
|
||||
$bag = new FlashBag();
|
||||
$bag->initialize($this->array);
|
||||
$this->assertEquals($this->array, $bag->peekAll());
|
||||
$array = array('should' => array('change'));
|
||||
$array = ['should' => ['change']];
|
||||
$bag->initialize($array);
|
||||
$this->assertEquals($array, $bag->peekAll());
|
||||
}
|
||||
@@ -68,49 +68,49 @@ class FlashBagTest extends TestCase
|
||||
|
||||
public function testPeek()
|
||||
{
|
||||
$this->assertEquals(array(), $this->bag->peek('non_existing'));
|
||||
$this->assertEquals(array('default'), $this->bag->peek('not_existing', array('default')));
|
||||
$this->assertEquals(array('A previous flash message'), $this->bag->peek('notice'));
|
||||
$this->assertEquals(array('A previous flash message'), $this->bag->peek('notice'));
|
||||
$this->assertEquals([], $this->bag->peek('non_existing'));
|
||||
$this->assertEquals(['default'], $this->bag->peek('not_existing', ['default']));
|
||||
$this->assertEquals(['A previous flash message'], $this->bag->peek('notice'));
|
||||
$this->assertEquals(['A previous flash message'], $this->bag->peek('notice'));
|
||||
}
|
||||
|
||||
public function testAdd()
|
||||
{
|
||||
$tab = array('bar' => 'baz');
|
||||
$tab = ['bar' => 'baz'];
|
||||
$this->bag->add('string_message', 'lorem');
|
||||
$this->bag->add('object_message', new \stdClass());
|
||||
$this->bag->add('array_message', $tab);
|
||||
|
||||
$this->assertEquals(array('lorem'), $this->bag->get('string_message'));
|
||||
$this->assertEquals(array(new \stdClass()), $this->bag->get('object_message'));
|
||||
$this->assertEquals(array($tab), $this->bag->get('array_message'));
|
||||
$this->assertEquals(['lorem'], $this->bag->get('string_message'));
|
||||
$this->assertEquals([new \stdClass()], $this->bag->get('object_message'));
|
||||
$this->assertEquals([$tab], $this->bag->get('array_message'));
|
||||
}
|
||||
|
||||
public function testGet()
|
||||
{
|
||||
$this->assertEquals(array(), $this->bag->get('non_existing'));
|
||||
$this->assertEquals(array('default'), $this->bag->get('not_existing', array('default')));
|
||||
$this->assertEquals(array('A previous flash message'), $this->bag->get('notice'));
|
||||
$this->assertEquals(array(), $this->bag->get('notice'));
|
||||
$this->assertEquals([], $this->bag->get('non_existing'));
|
||||
$this->assertEquals(['default'], $this->bag->get('not_existing', ['default']));
|
||||
$this->assertEquals(['A previous flash message'], $this->bag->get('notice'));
|
||||
$this->assertEquals([], $this->bag->get('notice'));
|
||||
}
|
||||
|
||||
public function testAll()
|
||||
{
|
||||
$this->bag->set('notice', 'Foo');
|
||||
$this->bag->set('error', 'Bar');
|
||||
$this->assertEquals(array(
|
||||
'notice' => array('Foo'),
|
||||
'error' => array('Bar'), ), $this->bag->all()
|
||||
$this->assertEquals([
|
||||
'notice' => ['Foo'],
|
||||
'error' => ['Bar'], ], $this->bag->all()
|
||||
);
|
||||
|
||||
$this->assertEquals(array(), $this->bag->all());
|
||||
$this->assertEquals([], $this->bag->all());
|
||||
}
|
||||
|
||||
public function testSet()
|
||||
{
|
||||
$this->bag->set('notice', 'Foo');
|
||||
$this->bag->set('notice', 'Bar');
|
||||
$this->assertEquals(array('Bar'), $this->bag->peek('notice'));
|
||||
$this->assertEquals(['Bar'], $this->bag->peek('notice'));
|
||||
}
|
||||
|
||||
public function testHas()
|
||||
@@ -121,7 +121,7 @@ class FlashBagTest extends TestCase
|
||||
|
||||
public function testKeys()
|
||||
{
|
||||
$this->assertEquals(array('notice'), $this->bag->keys());
|
||||
$this->assertEquals(['notice'], $this->bag->keys());
|
||||
}
|
||||
|
||||
public function testSetAll()
|
||||
@@ -130,28 +130,28 @@ class FlashBagTest extends TestCase
|
||||
$this->bag->add('another_flash', 'Bar');
|
||||
$this->assertTrue($this->bag->has('one_flash'));
|
||||
$this->assertTrue($this->bag->has('another_flash'));
|
||||
$this->bag->setAll(array('unique_flash' => 'FooBar'));
|
||||
$this->bag->setAll(['unique_flash' => 'FooBar']);
|
||||
$this->assertFalse($this->bag->has('one_flash'));
|
||||
$this->assertFalse($this->bag->has('another_flash'));
|
||||
$this->assertSame(array('unique_flash' => 'FooBar'), $this->bag->all());
|
||||
$this->assertSame(array(), $this->bag->all());
|
||||
$this->assertSame(['unique_flash' => 'FooBar'], $this->bag->all());
|
||||
$this->assertSame([], $this->bag->all());
|
||||
}
|
||||
|
||||
public function testPeekAll()
|
||||
{
|
||||
$this->bag->set('notice', 'Foo');
|
||||
$this->bag->set('error', 'Bar');
|
||||
$this->assertEquals(array(
|
||||
'notice' => array('Foo'),
|
||||
'error' => array('Bar'),
|
||||
), $this->bag->peekAll()
|
||||
$this->assertEquals([
|
||||
'notice' => ['Foo'],
|
||||
'error' => ['Bar'],
|
||||
], $this->bag->peekAll()
|
||||
);
|
||||
$this->assertTrue($this->bag->has('notice'));
|
||||
$this->assertTrue($this->bag->has('error'));
|
||||
$this->assertEquals(array(
|
||||
'notice' => array('Foo'),
|
||||
'error' => array('Bar'),
|
||||
), $this->bag->peekAll()
|
||||
$this->assertEquals([
|
||||
'notice' => ['Foo'],
|
||||
'error' => ['Bar'],
|
||||
], $this->bag->peekAll()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,10 +127,10 @@ class SessionTest extends TestCase
|
||||
|
||||
public function testReplace()
|
||||
{
|
||||
$this->session->replace(array('happiness' => 'be good', 'symfony' => 'awesome'));
|
||||
$this->assertEquals(array('happiness' => 'be good', 'symfony' => 'awesome'), $this->session->all());
|
||||
$this->session->replace(array());
|
||||
$this->assertEquals(array(), $this->session->all());
|
||||
$this->session->replace(['happiness' => 'be good', 'symfony' => 'awesome']);
|
||||
$this->assertEquals(['happiness' => 'be good', 'symfony' => 'awesome'], $this->session->all());
|
||||
$this->session->replace([]);
|
||||
$this->assertEquals([], $this->session->all());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -150,16 +150,16 @@ class SessionTest extends TestCase
|
||||
$this->session->set('hi', 'fabien');
|
||||
$this->session->set($key, $value);
|
||||
$this->session->clear();
|
||||
$this->assertEquals(array(), $this->session->all());
|
||||
$this->assertEquals([], $this->session->all());
|
||||
}
|
||||
|
||||
public function setProvider()
|
||||
{
|
||||
return array(
|
||||
array('foo', 'bar', array('foo' => 'bar')),
|
||||
array('foo.bar', 'too much beer', array('foo.bar' => 'too much beer')),
|
||||
array('great', 'symfony is great', array('great' => 'symfony is great')),
|
||||
);
|
||||
return [
|
||||
['foo', 'bar', ['foo' => 'bar']],
|
||||
['foo.bar', 'too much beer', ['foo.bar' => 'too much beer']],
|
||||
['great', 'symfony is great', ['great' => 'symfony is great']],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -170,14 +170,14 @@ class SessionTest extends TestCase
|
||||
$this->session->set('hi.world', 'have a nice day');
|
||||
$this->session->set($key, $value);
|
||||
$this->session->remove($key);
|
||||
$this->assertEquals(array('hi.world' => 'have a nice day'), $this->session->all());
|
||||
$this->assertEquals(['hi.world' => 'have a nice day'], $this->session->all());
|
||||
}
|
||||
|
||||
public function testInvalidate()
|
||||
{
|
||||
$this->session->set('invalidate', 123);
|
||||
$this->session->invalidate();
|
||||
$this->assertEquals(array(), $this->session->all());
|
||||
$this->assertEquals([], $this->session->all());
|
||||
}
|
||||
|
||||
public function testMigrate()
|
||||
@@ -216,7 +216,7 @@ class SessionTest extends TestCase
|
||||
|
||||
public function testGetIterator()
|
||||
{
|
||||
$attributes = array('hello' => 'world', 'symfony' => 'rocks');
|
||||
$attributes = ['hello' => 'world', 'symfony' => 'rocks'];
|
||||
foreach ($attributes as $key => $val) {
|
||||
$this->session->set($key, $val);
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ abstract class AbstractRedisSessionHandlerTestCase extends TestCase
|
||||
$this->redisClient = $this->createRedisClient($host);
|
||||
$this->storage = new RedisSessionHandler(
|
||||
$this->redisClient,
|
||||
array('prefix' => self::PREFIX)
|
||||
['prefix' => self::PREFIX]
|
||||
);
|
||||
}
|
||||
|
||||
@@ -117,7 +117,7 @@ abstract class AbstractRedisSessionHandlerTestCase extends TestCase
|
||||
$lowTtl = 10;
|
||||
|
||||
$this->redisClient->setex(self::PREFIX.'id', $lowTtl, 'foo');
|
||||
$this->storage->updateTimestamp('id', array());
|
||||
$this->storage->updateTimestamp('id', []);
|
||||
|
||||
$this->assertGreaterThan($lowTtl, $this->redisClient->ttl(self::PREFIX.'id'));
|
||||
}
|
||||
@@ -137,9 +137,9 @@ abstract class AbstractRedisSessionHandlerTestCase extends TestCase
|
||||
|
||||
public function getOptionFixtures(): array
|
||||
{
|
||||
return array(
|
||||
array(array('prefix' => 'session'), true),
|
||||
array(array('prefix' => 'sfs', 'foo' => 'bar'), false),
|
||||
);
|
||||
return [
|
||||
[['prefix' => 'session'], true],
|
||||
[['prefix' => 'sfs', 'foo' => 'bar'], false],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,10 +19,10 @@ class AbstractSessionHandlerTest extends TestCase
|
||||
|
||||
public static function setUpBeforeClass()
|
||||
{
|
||||
$spec = array(
|
||||
1 => array('file', '/dev/null', 'w'),
|
||||
2 => array('file', '/dev/null', 'w'),
|
||||
);
|
||||
$spec = [
|
||||
1 => ['file', '/dev/null', 'w'],
|
||||
2 => ['file', '/dev/null', 'w'],
|
||||
];
|
||||
if (!self::$server = @proc_open('exec php -S localhost:8053', $spec, $pipes, __DIR__.'/Fixtures')) {
|
||||
self::markTestSkipped('PHP server unable to start.');
|
||||
}
|
||||
@@ -42,7 +42,7 @@ class AbstractSessionHandlerTest extends TestCase
|
||||
*/
|
||||
public function testSession($fixture)
|
||||
{
|
||||
$context = array('http' => array('header' => "Cookie: sid=123abc\r\n"));
|
||||
$context = ['http' => ['header' => "Cookie: sid=123abc\r\n"]];
|
||||
$context = stream_context_create($context);
|
||||
$result = file_get_contents(sprintf('http://localhost:8053/%s.php', $fixture), false, $context);
|
||||
|
||||
@@ -52,7 +52,7 @@ class AbstractSessionHandlerTest extends TestCase
|
||||
public function provideSession()
|
||||
{
|
||||
foreach (glob(__DIR__.'/Fixtures/*.php') as $file) {
|
||||
yield array(pathinfo($file, PATHINFO_FILENAME));
|
||||
yield [pathinfo($file, PATHINFO_FILENAME)];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,10 +4,10 @@ require __DIR__.'/common.inc';
|
||||
|
||||
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
|
||||
|
||||
$storage = new NativeSessionStorage(array('cookie_samesite' => 'lax'));
|
||||
$storage = new NativeSessionStorage(['cookie_samesite' => 'lax']);
|
||||
$storage->setSaveHandler(new TestSessionHandler());
|
||||
$storage->start();
|
||||
|
||||
$_SESSION = array('foo' => 'bar');
|
||||
$_SESSION = ['foo' => 'bar'];
|
||||
|
||||
ob_start(function ($buffer) { return str_replace(session_id(), 'random_session_id', $buffer); });
|
||||
|
||||
@@ -4,11 +4,11 @@ require __DIR__.'/common.inc';
|
||||
|
||||
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
|
||||
|
||||
$storage = new NativeSessionStorage(array('cookie_samesite' => 'lax'));
|
||||
$storage = new NativeSessionStorage(['cookie_samesite' => 'lax']);
|
||||
$storage->setSaveHandler(new TestSessionHandler());
|
||||
$storage->start();
|
||||
|
||||
$_SESSION = array('foo' => 'bar');
|
||||
$_SESSION = ['foo' => 'bar'];
|
||||
|
||||
$storage->regenerate(true);
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ class MemcachedSessionHandlerTest extends TestCase
|
||||
$this->memcached = $this->getMockBuilder('Memcached')->getMock();
|
||||
$this->storage = new MemcachedSessionHandler(
|
||||
$this->memcached,
|
||||
array('prefix' => self::PREFIX, 'expiretime' => self::TTL)
|
||||
['prefix' => self::PREFIX, 'expiretime' => self::TTL]
|
||||
);
|
||||
}
|
||||
|
||||
@@ -59,6 +59,12 @@ class MemcachedSessionHandlerTest extends TestCase
|
||||
|
||||
public function testCloseSession()
|
||||
{
|
||||
$this->memcached
|
||||
->expects($this->once())
|
||||
->method('quit')
|
||||
->will($this->returnValue(true))
|
||||
;
|
||||
|
||||
$this->assertTrue($this->storage->close());
|
||||
}
|
||||
|
||||
@@ -117,12 +123,12 @@ class MemcachedSessionHandlerTest extends TestCase
|
||||
|
||||
public function getOptionFixtures()
|
||||
{
|
||||
return array(
|
||||
array(array('prefix' => 'session'), true),
|
||||
array(array('expiretime' => 100), true),
|
||||
array(array('prefix' => 'session', 'expiretime' => 200), true),
|
||||
array(array('expiretime' => 100, 'foo' => 'bar'), false),
|
||||
);
|
||||
return [
|
||||
[['prefix' => 'session'], true],
|
||||
[['expiretime' => 100], true],
|
||||
[['prefix' => 'session', 'expiretime' => 200], true],
|
||||
[['expiretime' => 100, 'foo' => 'bar'], false],
|
||||
];
|
||||
}
|
||||
|
||||
public function testGetConnection()
|
||||
|
||||
@@ -40,14 +40,14 @@ class MongoDbSessionHandlerTest extends TestCase
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
|
||||
$this->options = array(
|
||||
$this->options = [
|
||||
'id_field' => '_id',
|
||||
'data_field' => 'data',
|
||||
'time_field' => 'time',
|
||||
'expiry_field' => 'expires_at',
|
||||
'database' => 'sf-test',
|
||||
'collection' => 'session-test',
|
||||
);
|
||||
];
|
||||
|
||||
$this->storage = new MongoDbSessionHandler($this->mongo, $this->options);
|
||||
}
|
||||
@@ -57,7 +57,7 @@ class MongoDbSessionHandlerTest extends TestCase
|
||||
*/
|
||||
public function testConstructorShouldThrowExceptionForMissingOptions()
|
||||
{
|
||||
new MongoDbSessionHandler($this->mongo, array());
|
||||
new MongoDbSessionHandler($this->mongo, []);
|
||||
}
|
||||
|
||||
public function testOpenMethodAlwaysReturnTrue()
|
||||
@@ -95,11 +95,11 @@ class MongoDbSessionHandlerTest extends TestCase
|
||||
$this->assertInstanceOf(\MongoDB\BSON\UTCDateTime::class, $criteria[$this->options['expiry_field']]['$gte']);
|
||||
$this->assertGreaterThanOrEqual(round((string) $criteria[$this->options['expiry_field']]['$gte'] / 1000), $testTimeout);
|
||||
|
||||
return array(
|
||||
return [
|
||||
$this->options['id_field'] => 'foo',
|
||||
$this->options['expiry_field'] => new \MongoDB\BSON\UTCDateTime(),
|
||||
$this->options['data_field'] => new \MongoDB\BSON\Binary('bar', \MongoDB\BSON\Binary::TYPE_OLD_BINARY),
|
||||
);
|
||||
];
|
||||
}));
|
||||
|
||||
$this->assertEquals('bar', $this->storage->read('foo'));
|
||||
@@ -117,8 +117,8 @@ class MongoDbSessionHandlerTest extends TestCase
|
||||
$collection->expects($this->once())
|
||||
->method('updateOne')
|
||||
->will($this->returnCallback(function ($criteria, $updateData, $options) {
|
||||
$this->assertEquals(array($this->options['id_field'] => 'foo'), $criteria);
|
||||
$this->assertEquals(array('upsert' => true), $options);
|
||||
$this->assertEquals([$this->options['id_field'] => 'foo'], $criteria);
|
||||
$this->assertEquals(['upsert' => true], $options);
|
||||
|
||||
$data = $updateData['$set'];
|
||||
$expectedExpiry = time() + (int) ini_get('session.gc_maxlifetime');
|
||||
@@ -141,7 +141,7 @@ class MongoDbSessionHandlerTest extends TestCase
|
||||
->with($this->options['database'], $this->options['collection'])
|
||||
->will($this->returnValue($collection));
|
||||
|
||||
$data = array();
|
||||
$data = [];
|
||||
|
||||
$collection->expects($this->exactly(2))
|
||||
->method('updateOne')
|
||||
@@ -166,7 +166,7 @@ class MongoDbSessionHandlerTest extends TestCase
|
||||
|
||||
$collection->expects($this->once())
|
||||
->method('deleteOne')
|
||||
->with(array($this->options['id_field'] => 'foo'));
|
||||
->with([$this->options['id_field'] => 'foo']);
|
||||
|
||||
$this->assertTrue($this->storage->destroy('foo'));
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ class NativeFileSessionHandlerTest extends TestCase
|
||||
{
|
||||
public function testConstruct()
|
||||
{
|
||||
$storage = new NativeSessionStorage(array('name' => 'TESTING'), new NativeFileSessionHandler(sys_get_temp_dir()));
|
||||
$storage = new NativeSessionStorage(['name' => 'TESTING'], new NativeFileSessionHandler(sys_get_temp_dir()));
|
||||
|
||||
$this->assertEquals('user', ini_get('session.save_handler'));
|
||||
|
||||
@@ -51,11 +51,11 @@ class NativeFileSessionHandlerTest extends TestCase
|
||||
{
|
||||
$base = sys_get_temp_dir();
|
||||
|
||||
return array(
|
||||
array("$base/foo", "$base/foo", "$base/foo"),
|
||||
array("5;$base/foo", "5;$base/foo", "$base/foo"),
|
||||
array("5;0600;$base/foo", "5;0600;$base/foo", "$base/foo"),
|
||||
);
|
||||
return [
|
||||
["$base/foo", "$base/foo", "$base/foo"],
|
||||
["5;$base/foo", "5;$base/foo", "$base/foo"],
|
||||
["5;0600;$base/foo", "5;0600;$base/foo", "$base/foo"],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -69,7 +69,7 @@ class NativeFileSessionHandlerTest extends TestCase
|
||||
public function testConstructDefault()
|
||||
{
|
||||
$path = ini_get('session.save_path');
|
||||
$storage = new NativeSessionStorage(array('name' => 'TESTING'), new NativeFileSessionHandler());
|
||||
$storage = new NativeSessionStorage(['name' => 'TESTING'], new NativeFileSessionHandler());
|
||||
|
||||
$this->assertEquals($path, ini_get('session.save_path'));
|
||||
}
|
||||
|
||||
@@ -54,6 +54,6 @@ class NullSessionHandlerTest extends TestCase
|
||||
|
||||
public function getStorage()
|
||||
{
|
||||
return new NativeSessionStorage(array(), new NullSessionHandler());
|
||||
return new NativeSessionStorage([], new NullSessionHandler());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ class PdoSessionHandlerTest extends TestCase
|
||||
*/
|
||||
public function testInexistentTable()
|
||||
{
|
||||
$storage = new PdoSessionHandler($this->getMemorySqlitePdo(), array('db_table' => 'inexistent_table'));
|
||||
$storage = new PdoSessionHandler($this->getMemorySqlitePdo(), ['db_table' => 'inexistent_table']);
|
||||
$storage->open('', 'sid');
|
||||
$storage->read('id');
|
||||
$storage->write('id', 'data');
|
||||
@@ -143,7 +143,7 @@ class PdoSessionHandlerTest extends TestCase
|
||||
$stream = $this->createStream($content);
|
||||
|
||||
$pdo->prepareResult->expects($this->once())->method('fetchAll')
|
||||
->will($this->returnValue(array(array($stream, 42, time()))));
|
||||
->will($this->returnValue([[$stream, 42, time()]]));
|
||||
|
||||
$storage = new PdoSessionHandler($pdo);
|
||||
$result = $storage->read('foo');
|
||||
@@ -171,7 +171,7 @@ class PdoSessionHandlerTest extends TestCase
|
||||
|
||||
$selectStmt->expects($this->atLeast(2))->method('fetchAll')
|
||||
->will($this->returnCallback(function () use (&$exception, $stream) {
|
||||
return $exception ? array(array($stream, 42, time())) : array();
|
||||
return $exception ? [[$stream, 42, time()]] : [];
|
||||
}));
|
||||
|
||||
$insertStmt->expects($this->once())->method('execute')
|
||||
@@ -337,19 +337,19 @@ class PdoSessionHandlerTest extends TestCase
|
||||
|
||||
public function provideUrlDsnPairs()
|
||||
{
|
||||
yield array('mysql://localhost/test', 'mysql:host=localhost;dbname=test;');
|
||||
yield array('mysql://localhost:56/test', 'mysql:host=localhost;port=56;dbname=test;');
|
||||
yield array('mysql2://root:pwd@localhost/test', 'mysql:host=localhost;dbname=test;', 'root', 'pwd');
|
||||
yield array('postgres://localhost/test', 'pgsql:host=localhost;dbname=test;');
|
||||
yield array('postgresql://localhost:5634/test', 'pgsql:host=localhost;port=5634;dbname=test;');
|
||||
yield array('postgres://root:pwd@localhost/test', 'pgsql:host=localhost;dbname=test;', 'root', 'pwd');
|
||||
yield 'sqlite relative path' => array('sqlite://localhost/tmp/test', 'sqlite:tmp/test');
|
||||
yield 'sqlite absolute path' => array('sqlite://localhost//tmp/test', 'sqlite:/tmp/test');
|
||||
yield 'sqlite relative path without host' => array('sqlite:///tmp/test', 'sqlite:tmp/test');
|
||||
yield 'sqlite absolute path without host' => array('sqlite3:////tmp/test', 'sqlite:/tmp/test');
|
||||
yield array('sqlite://localhost/:memory:', 'sqlite::memory:');
|
||||
yield array('mssql://localhost/test', 'sqlsrv:server=localhost;Database=test');
|
||||
yield array('mssql://localhost:56/test', 'sqlsrv:server=localhost,56;Database=test');
|
||||
yield ['mysql://localhost/test', 'mysql:host=localhost;dbname=test;'];
|
||||
yield ['mysql://localhost:56/test', 'mysql:host=localhost;port=56;dbname=test;'];
|
||||
yield ['mysql2://root:pwd@localhost/test', 'mysql:host=localhost;dbname=test;', 'root', 'pwd'];
|
||||
yield ['postgres://localhost/test', 'pgsql:host=localhost;dbname=test;'];
|
||||
yield ['postgresql://localhost:5634/test', 'pgsql:host=localhost;port=5634;dbname=test;'];
|
||||
yield ['postgres://root:pwd@localhost/test', 'pgsql:host=localhost;dbname=test;', 'root', 'pwd'];
|
||||
yield 'sqlite relative path' => ['sqlite://localhost/tmp/test', 'sqlite:tmp/test'];
|
||||
yield 'sqlite absolute path' => ['sqlite://localhost//tmp/test', 'sqlite:/tmp/test'];
|
||||
yield 'sqlite relative path without host' => ['sqlite:///tmp/test', 'sqlite:tmp/test'];
|
||||
yield 'sqlite absolute path without host' => ['sqlite3:////tmp/test', 'sqlite:/tmp/test'];
|
||||
yield ['sqlite://localhost/:memory:', 'sqlite::memory:'];
|
||||
yield ['mssql://localhost/test', 'sqlsrv:server=localhost;Database=test'];
|
||||
yield ['mssql://localhost:56/test', 'sqlsrv:server=localhost,56;Database=test'];
|
||||
}
|
||||
|
||||
private function createStream($content)
|
||||
@@ -387,7 +387,7 @@ class MockPdo extends \PDO
|
||||
return parent::getAttribute($attribute);
|
||||
}
|
||||
|
||||
public function prepare($statement, $driverOptions = array())
|
||||
public function prepare($statement, $driverOptions = [])
|
||||
{
|
||||
return \is_callable($this->prepareResult)
|
||||
? ($this->prepareResult)($statement, $driverOptions)
|
||||
|
||||
@@ -17,6 +17,6 @@ class PredisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCas
|
||||
{
|
||||
protected function createRedisClient(string $host): Client
|
||||
{
|
||||
return new Client(array(array('host' => $host)));
|
||||
return new Client([['host' => $host]]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,6 +17,6 @@ class PredisSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
|
||||
{
|
||||
protected function createRedisClient(string $host): Client
|
||||
{
|
||||
return new Client(array('host' => $host));
|
||||
return new Client(['host' => $host]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,6 +15,6 @@ class RedisArraySessionHandlerTest extends AbstractRedisSessionHandlerTestCase
|
||||
{
|
||||
protected function createRedisClient(string $host): \RedisArray
|
||||
{
|
||||
return new \RedisArray(array($host));
|
||||
return new \RedisArray([$host]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@ class StrictSessionHandlerTest extends TestCase
|
||||
{
|
||||
$handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
|
||||
$handler->expects($this->exactly(2))->method('read')
|
||||
->withConsecutive(array('id1'), array('id2'))
|
||||
->withConsecutive(['id1'], ['id2'])
|
||||
->will($this->onConsecutiveCalls('data1', 'data2'));
|
||||
$proxy = new StrictSessionHandler($handler);
|
||||
|
||||
|
||||
@@ -26,26 +26,26 @@ class MetadataBagTest extends TestCase
|
||||
*/
|
||||
protected $bag;
|
||||
|
||||
protected $array = array();
|
||||
protected $array = [];
|
||||
|
||||
protected function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
$this->bag = new MetadataBag();
|
||||
$this->array = array(MetadataBag::CREATED => 1234567, MetadataBag::UPDATED => 12345678, MetadataBag::LIFETIME => 0);
|
||||
$this->array = [MetadataBag::CREATED => 1234567, MetadataBag::UPDATED => 12345678, MetadataBag::LIFETIME => 0];
|
||||
$this->bag->initialize($this->array);
|
||||
}
|
||||
|
||||
protected function tearDown()
|
||||
{
|
||||
$this->array = array();
|
||||
$this->array = [];
|
||||
$this->bag = null;
|
||||
parent::tearDown();
|
||||
}
|
||||
|
||||
public function testInitialize()
|
||||
{
|
||||
$sessionMetadata = array();
|
||||
$sessionMetadata = [];
|
||||
|
||||
$bag1 = new MetadataBag();
|
||||
$bag1->initialize($sessionMetadata);
|
||||
@@ -82,7 +82,7 @@ class MetadataBagTest extends TestCase
|
||||
public function testGetLifetime()
|
||||
{
|
||||
$bag = new MetadataBag();
|
||||
$array = array(MetadataBag::CREATED => 1234567, MetadataBag::UPDATED => 12345678, MetadataBag::LIFETIME => 1000);
|
||||
$array = [MetadataBag::CREATED => 1234567, MetadataBag::UPDATED => 12345678, MetadataBag::LIFETIME => 1000];
|
||||
$bag->initialize($array);
|
||||
$this->assertEquals(1000, $bag->getLifetime());
|
||||
}
|
||||
@@ -111,11 +111,11 @@ class MetadataBagTest extends TestCase
|
||||
$timeStamp = time();
|
||||
|
||||
$created = $timeStamp - 15;
|
||||
$sessionMetadata = array(
|
||||
$sessionMetadata = [
|
||||
MetadataBag::CREATED => $created,
|
||||
MetadataBag::UPDATED => $created,
|
||||
MetadataBag::LIFETIME => 1000,
|
||||
);
|
||||
];
|
||||
$bag->initialize($sessionMetadata);
|
||||
|
||||
$this->assertEquals($created, $sessionMetadata[MetadataBag::UPDATED]);
|
||||
@@ -127,11 +127,11 @@ class MetadataBagTest extends TestCase
|
||||
$timeStamp = time();
|
||||
|
||||
$created = $timeStamp - 45;
|
||||
$sessionMetadata = array(
|
||||
$sessionMetadata = [
|
||||
MetadataBag::CREATED => $created,
|
||||
MetadataBag::UPDATED => $created,
|
||||
MetadataBag::LIFETIME => 1000,
|
||||
);
|
||||
];
|
||||
$bag->initialize($sessionMetadata);
|
||||
|
||||
$this->assertEquals($timeStamp, $sessionMetadata[MetadataBag::UPDATED]);
|
||||
|
||||
@@ -45,10 +45,10 @@ class MockArraySessionStorageTest extends TestCase
|
||||
$this->attributes = new AttributeBag();
|
||||
$this->flashes = new FlashBag();
|
||||
|
||||
$this->data = array(
|
||||
$this->attributes->getStorageKey() => array('foo' => 'bar'),
|
||||
$this->flashes->getStorageKey() => array('notice' => 'hello'),
|
||||
);
|
||||
$this->data = [
|
||||
$this->attributes->getStorageKey() => ['foo' => 'bar'],
|
||||
$this->flashes->getStorageKey() => ['notice' => 'hello'],
|
||||
];
|
||||
|
||||
$this->storage = new MockArraySessionStorage();
|
||||
$this->storage->registerBag($this->flashes);
|
||||
@@ -80,14 +80,14 @@ class MockArraySessionStorageTest extends TestCase
|
||||
$id = $this->storage->getId();
|
||||
$this->storage->regenerate();
|
||||
$this->assertNotEquals($id, $this->storage->getId());
|
||||
$this->assertEquals(array('foo' => 'bar'), $this->storage->getBag('attributes')->all());
|
||||
$this->assertEquals(array('notice' => 'hello'), $this->storage->getBag('flashes')->peekAll());
|
||||
$this->assertEquals(['foo' => 'bar'], $this->storage->getBag('attributes')->all());
|
||||
$this->assertEquals(['notice' => 'hello'], $this->storage->getBag('flashes')->peekAll());
|
||||
|
||||
$id = $this->storage->getId();
|
||||
$this->storage->regenerate(true);
|
||||
$this->assertNotEquals($id, $this->storage->getId());
|
||||
$this->assertEquals(array('foo' => 'bar'), $this->storage->getBag('attributes')->all());
|
||||
$this->assertEquals(array('notice' => 'hello'), $this->storage->getBag('flashes')->peekAll());
|
||||
$this->assertEquals(['foo' => 'bar'], $this->storage->getBag('attributes')->all());
|
||||
$this->assertEquals(['notice' => 'hello'], $this->storage->getBag('flashes')->peekAll());
|
||||
}
|
||||
|
||||
public function testGetId()
|
||||
@@ -101,8 +101,8 @@ class MockArraySessionStorageTest extends TestCase
|
||||
{
|
||||
$this->storage->clear();
|
||||
|
||||
$this->assertSame(array(), $this->storage->getBag('attributes')->all());
|
||||
$this->assertSame(array(), $this->storage->getBag('flashes')->peekAll());
|
||||
$this->assertSame([], $this->storage->getBag('attributes')->all());
|
||||
$this->assertSame([], $this->storage->getBag('flashes')->peekAll());
|
||||
}
|
||||
|
||||
public function testClearStartsSession()
|
||||
|
||||
@@ -91,7 +91,7 @@ class MockFileSessionStorageTest extends TestCase
|
||||
$storage->start();
|
||||
$this->assertEquals('108', $storage->getBag('attributes')->get('new'));
|
||||
$this->assertTrue($storage->getBag('flashes')->has('newkey'));
|
||||
$this->assertEquals(array('test'), $storage->getBag('flashes')->peek('newkey'));
|
||||
$this->assertEquals(['test'], $storage->getBag('flashes')->peek('newkey'));
|
||||
}
|
||||
|
||||
public function testMultipleInstances()
|
||||
|
||||
@@ -56,7 +56,7 @@ class NativeSessionStorageTest extends TestCase
|
||||
/**
|
||||
* @return NativeSessionStorage
|
||||
*/
|
||||
protected function getStorage(array $options = array())
|
||||
protected function getStorage(array $options = [])
|
||||
{
|
||||
$storage = new NativeSessionStorage($options);
|
||||
$storage->registerBag(new AttributeBag());
|
||||
@@ -157,19 +157,19 @@ class NativeSessionStorageTest extends TestCase
|
||||
{
|
||||
$this->iniSet('session.cache_limiter', 'nocache');
|
||||
|
||||
$storage = new NativeSessionStorage(array('cache_limiter' => 'public'));
|
||||
$storage = new NativeSessionStorage(['cache_limiter' => 'public']);
|
||||
$this->assertEquals('public', ini_get('session.cache_limiter'));
|
||||
}
|
||||
|
||||
public function testCookieOptions()
|
||||
{
|
||||
$options = array(
|
||||
$options = [
|
||||
'cookie_lifetime' => 123456,
|
||||
'cookie_path' => '/my/cookie/path',
|
||||
'cookie_domain' => 'symfony.example.com',
|
||||
'cookie_secure' => true,
|
||||
'cookie_httponly' => false,
|
||||
);
|
||||
];
|
||||
|
||||
if (\PHP_VERSION_ID >= 70300) {
|
||||
$options['cookie_samesite'] = 'lax';
|
||||
@@ -177,7 +177,7 @@ class NativeSessionStorageTest extends TestCase
|
||||
|
||||
$this->getStorage($options);
|
||||
$temp = session_get_cookie_params();
|
||||
$gco = array();
|
||||
$gco = [];
|
||||
|
||||
foreach ($temp as $key => $value) {
|
||||
$gco['cookie_'.$key] = $value;
|
||||
@@ -192,10 +192,10 @@ class NativeSessionStorageTest extends TestCase
|
||||
$this->markTestSkipped('HHVM is not handled in this test case.');
|
||||
}
|
||||
|
||||
$options = array(
|
||||
$options = [
|
||||
'url_rewriter.tags' => 'a=href',
|
||||
'cache_expire' => '200',
|
||||
);
|
||||
];
|
||||
|
||||
$this->getStorage($options);
|
||||
|
||||
@@ -276,9 +276,9 @@ class NativeSessionStorageTest extends TestCase
|
||||
public function testSetSessionOptionsOnceSessionStartedIsIgnored()
|
||||
{
|
||||
session_start();
|
||||
$this->getStorage(array(
|
||||
$this->getStorage([
|
||||
'name' => 'something-else',
|
||||
));
|
||||
]);
|
||||
|
||||
// Assert no exception has been thrown by `getStorage()`
|
||||
$this->addToAssertionCount(1);
|
||||
|
||||
@@ -86,10 +86,10 @@ class PhpBridgeSessionStorageTest extends TestCase
|
||||
$_SESSION['drak'] = 'loves symfony';
|
||||
$storage->getBag('attributes')->set('symfony', 'greatness');
|
||||
$key = $storage->getBag('attributes')->getStorageKey();
|
||||
$this->assertEquals($_SESSION[$key], array('symfony' => 'greatness'));
|
||||
$this->assertEquals($_SESSION[$key], ['symfony' => 'greatness']);
|
||||
$this->assertEquals($_SESSION['drak'], 'loves symfony');
|
||||
$storage->clear();
|
||||
$this->assertEquals($_SESSION[$key], array());
|
||||
$this->assertEquals($_SESSION[$key], []);
|
||||
$this->assertEquals($_SESSION['drak'], 'loves symfony');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,7 +127,7 @@ class SessionHandlerProxyTest extends TestCase
|
||||
*/
|
||||
public function testValidateId()
|
||||
{
|
||||
$mock = $this->getMockBuilder(array('SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'))->getMock();
|
||||
$mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();
|
||||
$mock->expects($this->once())
|
||||
->method('validateId');
|
||||
|
||||
@@ -142,7 +142,7 @@ class SessionHandlerProxyTest extends TestCase
|
||||
*/
|
||||
public function testUpdateTimestamp()
|
||||
{
|
||||
$mock = $this->getMockBuilder(array('SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'))->getMock();
|
||||
$mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();
|
||||
$mock->expects($this->once())
|
||||
->method('updateTimestamp');
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ class StreamedResponseTest extends TestCase
|
||||
{
|
||||
public function testConstructor()
|
||||
{
|
||||
$response = new StreamedResponse(function () { echo 'foo'; }, 404, array('Content-Type' => 'text/plain'));
|
||||
$response = new StreamedResponse(function () { echo 'foo'; }, 404, ['Content-Type' => 'text/plain']);
|
||||
|
||||
$this->assertEquals(404, $response->getStatusCode());
|
||||
$this->assertEquals('text/plain', $response->headers->get('Content-Type'));
|
||||
@@ -51,7 +51,7 @@ class StreamedResponseTest extends TestCase
|
||||
|
||||
public function testPrepareWithHeadRequest()
|
||||
{
|
||||
$response = new StreamedResponse(function () { echo 'foo'; }, 200, array('Content-Length' => '123'));
|
||||
$response = new StreamedResponse(function () { echo 'foo'; }, 200, ['Content-Length' => '123']);
|
||||
$request = Request::create('/', 'HEAD');
|
||||
|
||||
$response->prepare($request);
|
||||
@@ -61,7 +61,7 @@ class StreamedResponseTest extends TestCase
|
||||
|
||||
public function testPrepareWithCacheHeaders()
|
||||
{
|
||||
$response = new StreamedResponse(function () { echo 'foo'; }, 200, array('Cache-Control' => 'max-age=600, public'));
|
||||
$response = new StreamedResponse(function () { echo 'foo'; }, 200, ['Cache-Control' => 'max-age=600, public']);
|
||||
$request = Request::create('/', 'GET');
|
||||
|
||||
$response->prepare($request);
|
||||
|
||||
Reference in New Issue
Block a user