updated packages
This commit is contained in:
@@ -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'],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user