We only need to support split repos anymore.

horde · Oct 9, 2017 · 9e8c517 · 9e8c517
1 parent 45243b6
commit 9e8c517
Showing 1 changed file with 5 additions and 20 deletions.
diff --git a/lib/Components/Component/Factory.php b/lib/Components/Component/Factory.php
@@ -289,12 +289,7 @@ public function createPackageXml($package_xml_path)
      */
     public function createPackageFile($package_xml_dir)
     {
-        if (basename(dirname($package_xml_dir)) == 'framework' ||
-            file_exists($package_xml_dir . '/../.gitignore')) {
-            $type = new Horde_Pear_Package_Type_Horde($package_xml_dir);
-        } else {
-            $type = new Horde_Pear_Package_Type_HordeSplit($package_xml_dir);
-        }
+        $type = new Horde_Pear_Package_Type_HordeSplit($package_xml_dir);
         $type->writePackageXmlDraft();
     }
 
@@ -320,20 +315,10 @@ public function createThemePackageFile($package_xml_dir)
      */
     public function createContentList($package_xml_dir)
     {
-        if (basename(dirname($package_xml_dir)) == 'framework' ||
-            file_exists($package_xml_dir . '/../.gitignore') ||
-            (basename(dirname($package_xml_dir)) == 'bundles' &&
-             file_exists($package_xml_dir . '/../../.gitignore'))) {
-            $type = new Horde_Pear_Package_Type_Horde(
-                $package_xml_dir,
-                $this->getGitRoot()->getRoot()
-            );
-        } else {
-            $type = new Horde_Pear_Package_Type_HordeSplit(
-                $package_xml_dir,
-                $this->getGitRoot()->getRoot()
-            );
-        }
+        $type = new Horde_Pear_Package_Type_HordeSplit(
+            $package_xml_dir,
+            $this->getGitRoot()->getRoot()
+        );
         return new Horde_Pear_Package_Contents_List($type);
     }