[kriswallsmithGH-82] added clone once logic to asset iteration so cha…

…nges made to each leaf persist between iterations
fuel-packages · Aug 16, 2011 · 22e9107 · 22e9107
1 parent 8bc3af3
commit 22e9107
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/src/Assetic/Asset/AssetCollection.php b/src/Assetic/Asset/AssetCollection.php
@@ -234,6 +234,8 @@ public function getChildren()
  */
 class AssetCollectionIterator implements \RecursiveIterator
 {
+    static private $clones = array();
+
     private $assets;
     private $filters;
     private $output;
@@ -264,13 +266,20 @@ public function current($raw = false)
             return $asset;
         }
 
-        // clone before making changes
-        $clone = clone $asset;
+        // clone once
+        $oid = spl_object_hash($asset);
+        if (!isset(self::$clones[$oid])) {
+            self::$clones[$oid] = clone $asset;
+        }
+        $clone = self::$clones[$oid];
 
-        // generate an url based on asset name
-        $name = sprintf('%s_%d', pathinfo($asset->getSourcePath(), PATHINFO_FILENAME) ?: 'part', $this->key() + 1);
-        $clone->setTargetPath(str_replace('*', $name, $this->output));
+        if (!$clone->getTargetPath()) {
+            // generate a target path based on asset name
+            $name = sprintf('%s_%d', pathinfo($asset->getSourcePath(), PATHINFO_FILENAME) ?: 'part', $this->key() + 1);
+            $clone->setTargetPath(str_replace('*', $name, $this->output));
+        }
 
+        // cascade filters
         foreach ($this->filters as $filter) {
             $clone->ensureFilter($filter);
         }

diff --git a/tests/Assetic/Test/Asset/AssetCollectionTest.php b/tests/Assetic/Test/Asset/AssetCollectionTest.php
@@ -246,4 +246,17 @@ public function testEmptyMtime()
         $coll = new AssetCollection();
         $this->assertNull($coll->getLastModified(), '->getLastModified() returns null on empty collection');
     }
+
+    public function testLeafManipulation()
+    {
+        $coll = new AssetCollection(array(new StringAsset('asdf')));
+
+        foreach ($coll as $leaf) {
+            $leaf->setTargetPath('asdf');
+        }
+
+        foreach ($coll as $leaf) {
+            $this->assertEquals('asdf', $leaf->getTargetPath(), 'leaf changes persist between iterations');
+        }
+    }
 }