dan/ffmpeg-mappable-media
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix FiltersCollection::getIterator in case of empty collection

Browse source
This commit is contained in:
Romain Neutron 2013-09-05 11:12:10 +02:00
commit e43da86152
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/FFMpeg/Filters/FiltersCollection.php
View file

@ -47,8 +47,12 @@ class FiltersCollection implements \Countable, \IteratorAggregate
public function getIterator() public function getIterator()
{ {
if (null === $this->sorted) { if (null === $this->sorted) {
krsort($this->filters); if (0 === count($this->filters)) {
$this->sorted = call_user_func_array('array_merge', $this->filters); $this->sorted = $this->filters;
} else {
krsort($this->filters);
$this->sorted = call_user_func_array('array_merge', $this->filters);
}
} }
return new \ArrayIterator($this->sorted); return new \ArrayIterator($this->sorted);

6
tests/FFMpeg/Tests/Filters/FiltersCollectionTest.php
View file

@ -30,6 +30,12 @@ class FiltersCollectionTest extends TestCase
$this->assertCount(2, $coll->getIterator()); $this->assertCount(2, $coll->getIterator());
} }
public function testEmptyIterator()
{
$coll = new FiltersCollection();
$this->assertInstanceOf('\ArrayIterator', $coll->getIterator());
}
public function testIteratorSort() public function testIteratorSort()
{ {
$coll = new FiltersCollection(); $coll = new FiltersCollection();