Merge branch '4.3' into 4.4
* 4.3: fix merge
This commit is contained in:
commit
d7e5dd120b
@ -4,8 +4,8 @@ CHANGELOG
|
|||||||
4.4.0
|
4.4.0
|
||||||
-----
|
-----
|
||||||
|
|
||||||
* deprecated the `XmlEncoder::TYPE_CASE_ATTRIBUTES` constant, use `XmlEncoder::TYPE_CAST_ATTRIBUTES` instead
|
* deprecated the `XmlEncoder::TYPE_CASE_ATTRIBUTES` constant, use `XmlEncoder::TYPE_CAST_ATTRIBUTES` instead
|
||||||
|
|
||||||
4.3.0
|
4.3.0
|
||||||
-----
|
-----
|
||||||
|
|
||||||
|
@ -70,7 +70,7 @@ CSV
|
|||||||
CSV
|
CSV
|
||||||
, $this->encoder->encode($data = ['', '"', 'foo"', '\\"', '\\', 'foo\\'], 'csv'));
|
, $this->encoder->encode($data = ['', '"', 'foo"', '\\"', '\\', 'foo\\'], 'csv'));
|
||||||
|
|
||||||
$this->assertSame($data, $this->encoder->decode($csv, 'csv'));
|
$this->assertSame($data, $this->encoder->decode($csv, 'csv', [CsvEncoder::AS_COLLECTION_KEY => false]));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -79,8 +79,8 @@ CSV
|
|||||||
public function testSingleSlash()
|
public function testSingleSlash()
|
||||||
{
|
{
|
||||||
$this->assertSame($csv = "0\n\\\n", $this->encoder->encode($data = ['\\'], 'csv'));
|
$this->assertSame($csv = "0\n\\\n", $this->encoder->encode($data = ['\\'], 'csv'));
|
||||||
$this->assertSame($data, $this->encoder->decode($csv, 'csv'));
|
$this->assertSame($data, $this->encoder->decode($csv, 'csv', [CsvEncoder::AS_COLLECTION_KEY => false]));
|
||||||
$this->assertSame($data, $this->encoder->decode(trim($csv), 'csv'));
|
$this->assertSame($data, $this->encoder->decode(trim($csv), 'csv', [CsvEncoder::AS_COLLECTION_KEY => false]));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSupportEncoding()
|
public function testSupportEncoding()
|
||||||
|
Reference in New Issue
Block a user