[mms] Fix generating the install path for composer packages installed…

… within a Horde component.
horde · Jan 13, 2015 · f60821c · f60821c
1 parent 9ef67bc
commit f60821c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/framework/Pear/lib/Horde/Pear/Package/Contents/InstallAs/HordeComponent.php b/framework/Pear/lib/Horde/Pear/Package/Contents/InstallAs/HordeComponent.php
@@ -42,14 +42,24 @@ public function getInstallAs($file, $package)
     {
         $elements = explode('/', substr($file, 1));
         $basedir = array_shift($elements);
+
         switch ($basedir) {
         case 'COPYING':
         case 'examples':
         case 'js':
         case 'locale':
             return substr($file, 1);
+
+        case 'bundle':
+            // Composer packages
+            foreach (array_reverse(explode('_', $package)) as $dir) {
+                array_unshift($elements, $dir);
+            }
+            return join('/', $elements);
+
         case 'migration':
             return $basedir . '/' . basename($file);
+
         case 'doc':
             foreach (explode('_', $package) as $dir) {
                 if ($elements[0] == $dir) {
@@ -63,4 +73,4 @@ public function getInstallAs($file, $package)
             return join('/', $elements);
         }
     }
-}
+}
diff --git a/framework/Pear/package.xml b/framework/Pear/package.xml
@@ -21,6 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [mms] Fix generating the install path for composer packages installed within a Horde component.
 * [mms] Ignore .git directories in composer bundle directories when creating package.xml file.
  </notes>
  <contents>
@@ -540,6 +541,7 @@
    <date>2015-01-13</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [mms] Fix generating the install path for composer packages installed within a Horde component.
 * [mms] Ignore .git directories in composer bundle directories when creating package.xml file.
    </notes>
   </release>