Caching path relitivli to app dir

Bc. Libor Jonát · Bc. Libor Jonát · commit b295d801f81e · 2015-01-30T15:16:26.000+01:00
diff --git a/Bower/Bower.php b/Bower/Bower.php
@@ -75,7 +75,7 @@ public function __construct($bowerPath = '/usr/bin/bower', EventDispatcherInterf
     {
         $this->bowerPath = $bowerPath;
         $this->eventDispatcher = $eventDispatcher;
-        $this->dependencyMapper = $dependencyMapper ?: new DependencyMapper();
+        $this->dependencyMapper = $dependencyMapper ?: new DependencyMapper($kernelRootDir);
         $this->offline = $offline;
         $this->allowRoot = $allowRoot;
         $this->kernelRootDir = $kernelRootDir;
@@ -138,6 +138,19 @@ public function createDependencyMappingCache(ConfigurationInterface $config)
             throw new InvalidMappingException('Bower returned an invalid dependency mapping. This mostly happens when the dependencies are not yet installed or if you are using an old version of bower.');
         }
 
+        $kernelDir = realpath($this->kernelRootDir . '/../');
+
+        $filterDir = function(&$mapping) use ($kernelDir, &$filterDir) {
+            $mapping['canonicalDir'] = str_replace($kernelDir, '', realpath($mapping['canonicalDir']));
+            if (isset($mapping['dependencies']) && !empty($mapping['dependencies'])) {
+                foreach ($mapping['dependencies'] as & $package) {
+                    $filterDir($package);
+                }
+            }
+        };
+
+        $filterDir($mapping);
+
         $cacheKey = $this->createCacheKey($config);
         $config->getCache()->save($cacheKey, $mapping);
 
diff --git a/Bower/Package/DependencyMapper.php b/Bower/Package/DependencyMapper.php
@@ -26,6 +26,11 @@ class DependencyMapper implements DependencyMapperInterface
 
     const DEPENDENCIES_KEY = 'dependencies';
 
+    /**
+     * @var string KernelRootDir
+     */
+    private $kernelRootDir;
+
     /**
      * @var array
      */
@@ -69,9 +74,17 @@ class DependencyMapper implements DependencyMapperInterface
      */
     private $packages;
 
-    public function __construct()
+    /**
+     * @param $kernelRootDir
+     */
+    public function __construct($kernelRootDir)
     {
         $this->packages = new ArrayCollection();
+        $this->kernelRootDir = $kernelRootDir;
+
+        if (empty($kernelRootDir)) {
+            throw new \RuntimeException('Kernel directory cannot be empty');
+        }
     }
 
     /**
@@ -173,6 +186,9 @@ private function getFiles(array $packageInfo, $type)
      */
     private function extractFiles($canonicalDir, $files, array $extensions)
     {
+        $appDir = realpath($this->kernelRootDir . '/../');
+        $canonicalDir = $appDir . '/' . $canonicalDir;
+
         if (!is_array($files)) {
             $files = array($files);
         }
