Remove manifest files and use existing XML info

joomla · May 29, 2017 · b5b9fb3 · b5b9fb3
1 parent 3b4b063
commit b5b9fb3
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 755 deletions.
diff --git a/libraries/src/CMS/Installer/Adapter/LibraryAdapter.php b/libraries/src/CMS/Installer/Adapter/LibraryAdapter.php
@@ -398,11 +398,6 @@ public function uninstall($id)
 		// Because libraries may not have their own folders we cannot use the standard method of finding an installation manifest
 		if (file_exists($manifestFile))
 		{
-			$manifest = new LibraryManifest($manifestFile);
-
-			// Set the library root path
-			$this->parent->setPath('extension_root', JPATH_PLATFORM . '/' . $manifest->libraryname);
-
 			$xml = simplexml_load_file($manifestFile);
 
 			// If we cannot load the XML file return null
@@ -413,6 +408,9 @@ public function uninstall($id)
 				return false;
 			}
 
+			// Set the library root path
+			$this->parent->setPath('extension_root', JPATH_PLATFORM . '/' . (string) $xml->libraryname);
+
 			// Check for a valid XML root tag.
 			if ($xml->getName() != 'extension')
 			{

diff --git a/libraries/src/CMS/Installer/Adapter/PackageAdapter.php b/libraries/src/CMS/Installer/Adapter/PackageAdapter.php
@@ -529,7 +529,6 @@ protected function triggerManifestScript($method)
 	public function uninstall($id)
 	{
 		$row = null;
-		$retval = true;
 
 		$row = Table::getInstance('extension');
 		$row->load($id);
@@ -553,10 +552,6 @@ public function uninstall($id)
 		}
 
 		$manifestFile = JPATH_MANIFESTS . '/packages/' . $row->get('element') . '.xml';
-		$manifest = new PackageManifest($manifestFile);
-
-		// Set the package root path
-		$this->parent->setPath('extension_root', JPATH_MANIFESTS . '/packages/' . $manifest->packagename);
 
 		// Because packages may not have their own folders we cannot use the standard method of finding an installation manifest
 		if (!file_exists($manifestFile))
@@ -577,6 +572,9 @@ public function uninstall($id)
 			return false;
 		}
 
+		// Set the package root path
+		$this->parent->setPath('extension_root', JPATH_MANIFESTS . '/packages/' . $xml->packagename);
+
 		// Check for a valid XML root tag.
 		if ($xml->getName() != 'extension')
 		{
@@ -586,7 +584,7 @@ public function uninstall($id)
 		}
 
 		// If there is an manifest class file, let's load it
-		$manifestScript = (string) $manifest->scriptfile;
+		$manifestScript = (string) $xml->scriptfile;
 
 		if ($manifestScript)
 		{
@@ -670,7 +668,7 @@ public function uninstall($id)
 		}
 
 		// Return the result up the line
-		return $retval;
+		return true;
 	}
 
 	/**

diff --git a/libraries/src/CMS/Installer/Installer.php b/libraries/src/CMS/Installer/Installer.php
@@ -629,7 +629,7 @@ public function discover_install($eid = null)
 	 *
 	 * Asks each adapter to find extensions
 	 *
-	 * @return  InstallerExtension[]
+	 * @return  Extension[]
 	 *
 	 * @since   3.1
 	 */

diff --git a/libraries/src/CMS/Installer/InstallerAdapter.php b/libraries/src/CMS/Installer/InstallerAdapter.php
@@ -179,9 +179,19 @@ protected function canUninstallPackageChild($packageId)
 			return true;
 		}
 
-		$manifest = new PackageManifest($manifestFile);
+		$blockChildUninstall = false;
 
-		return $manifest->blockChildUninstall === false;
+		if (isset($xml->blockChildUninstall))
+		{
+			$value = (string) $xml->blockChildUninstall;
+
+			if ($value === '1' || $value === 'true')
+			{
+				$blockChildUninstall = true;
+			}
+		}
+
+		return $blockChildUninstall === false;
 	}
 
 	/**

diff --git a/libraries/src/CMS/Installer/InstallerExtension.php b/libraries/src/CMS/Installer/InstallerExtension.php
diff --git a/libraries/src/CMS/Installer/Manifest.php b/libraries/src/CMS/Installer/Manifest.php