Skip to content

Commit 189074f

Browse files
committed
Merge pull request #122 from spiffyjr/patch-1
Update AssetFilterManager.php
2 parents 445176d + c892369 commit 189074f

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

src/AssetManager/Service/AssetFilterManager.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ public function setFilters($path, AssetInterface $asset)
8383
}
8484

8585
foreach ($filters as $filter) {
86+
if (is_null($filter)) {
87+
continue;
88+
}
8689
if (!empty($filter['filter'])) {
8790
$this->ensureByFilter($asset, $filter['filter']);
8891
} elseif (!empty($filter['service'])) {

tests/AssetManagerTest/Service/AssetFilterManagerTest.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,21 @@ public function setUp()
1717
require_once __DIR__ . '/../../_files/CustomFilter.php';
1818
}
1919

20+
public function testNulledValuesAreSkipped()
21+
{
22+
$assetFilterManager = new AssetFilterManager(array(
23+
'test/path.test' => array(
24+
'null_filters' => null
25+
)
26+
));
27+
28+
$asset = new StringAsset('Herp Derp');
29+
30+
$assetFilterManager->setFilters('test/path.test', $asset);
31+
32+
$this->assertEquals('called', $asset->dump());
33+
}
34+
2035
public function testensureByService()
2136
{
2237
$assetFilterManager = new AssetFilterManager(array(

0 commit comments

Comments
 (0)