Merge 094be8f into 7e5395c

ihortymoshenko · Nov 27, 2014 · eb5de36 · eb5de36
2 parents 7e5395c + 094be8f
commit eb5de36
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Assetic/Factory/AssetFactory.php b/src/Assetic/Factory/AssetFactory.php
@@ -28,8 +28,8 @@ public function generateAssetName($inputs, $filters, $options = array())
         $partPaths = pathinfo($path);
 
         $name = str_replace($options['root'], '', $path);
-        $name = str_replace($partPaths['basename'], '', $name);
+        $name = dirname($name);
 
-        return ltrim($name . $partPaths['filename'], '/');
+        return ltrim("{$name}/{$partPaths['filename']}", '/');
     }
 }
diff --git a/tests/Assetic/Factory/AssetFactoryTest.php b/tests/Assetic/Factory/AssetFactoryTest.php
@@ -29,4 +29,16 @@ public function testGenerateAssetName()
             $assetFactory->generateAssetName(array(__FILE__), array(), array('root' => $root))
         );
     }
+
+    public function testGenerateAssetNameWithAssetNameEqualsToFolderName()
+    {
+        $root = realpath(__DIR__ . DIRECTORY_SEPARATOR . '..');
+
+        $assetFactory = new AssetFactory($root);
+
+        $this->assertEquals(
+            'some_dir/normalize.css/normalize',
+            $assetFactory->generateAssetName(array("/some_dir/normalize.css/normalize.css"), array(), array('root' => $root))
+        );
+    }
 }