Merge pull request joomla#9 from mahagr/installAbstract

Give either extension or manifest parameter for all InstallerAdapters

Author: mbabker

libraries/cms/installer/adapter.php

@@ -28,6 +28,14 @@ abstract class JInstallerAdapter extends JAdapterInstance
 	 * */
 	protected $element = null;
 
+	/**
+	 * Extension object.
+	 *
+	 * @var    JTableExtension
+	 * @since  3.1
+	 * */
+	protected $extension = null;
+
 	/**
 	 * Messages rendered by custom scripts
 	 *
@@ -92,7 +100,7 @@ public function __construct($parent, $db, $options = array())
 		parent::__construct($parent, $db, $options);
 
 		// Set the manifest object
-		$this->manifest = $this->parent->getManifest();
+		$this->manifest = $this->getManifest();
 
 		// Set name and element
 		$this->name = $this->getName();
@@ -226,6 +234,24 @@ protected function extensionExists($extension, $type, $clientId = null)
 		return $id > 0;
 	}
 
+	/**
+	 * Get the manifest object.
+	 *
+	 * @return  object  Manifest object
+	 *
+	 * @since   3.1
+	 */
+	public function getManifest()
+	{
+		if (!$this->manifest) {
+			// We are trying to find manifest for the installed extension.
+			// TODO: handle locally in every adapter (see uninstall to get some hints).
+			$this->manifest = $this->parent->getManifest();
+		}
+
+		return $this->manifest;
+	}
+
 	/**
 	 * Get the filtered component name from the manifest
 	 *

libraries/cms/installer/adapter/library.php

@@ -53,7 +53,7 @@ public function loadLanguage($path = null)
 
 		if (!$source)
 		{
-			$this->parent->setPath('source', JPATH_PLATFORM . '/' . $this->parent->extension->element);
+			$this->parent->setPath('source', JPATH_PLATFORM . '/' . $this->element);
 		}
 
 		$extension = 'lib_' . $this->element;
@@ -80,7 +80,7 @@ public function install()
 		 * ---------------------------------------------------------------------------------------------
 		 */
 
-		$extension_id = $this->extensionExists($this->element, 'library');
+		$extension_id = JTable::getInstance('extension')->find(array('element' => $this->element, 'type' => 'library'));
 		if ($extension_id)
 		{
 			// Already installed, can we upgrade?
@@ -192,34 +192,6 @@ public function install()
 		return $row->extension_id;
 	}
 
-	/**
-	 * Custom update method
-	 *
-	 * @return  boolean  True on success
-	 *
-	 * @since   3.1
-	 */
-	public function update()
-	{
-		// Since this is just files, an update removes old files
-
-		/*
-		 * ---------------------------------------------------------------------------------------------
-		 * Manifest Document Setup Section
-		 * ---------------------------------------------------------------------------------------------
-		 */
-
-		$extension_id = JTable::getInstance('extension')->find(array('element' => $this->element, 'type' => 'library'));
-		if ($extension_id)
-		{
-			// Already installed, which would make sense
-			$installer = new JInstaller;  // We don't want to compromise this instance!
-			$installer->uninstall('library', $extension_id);
-		}
-		// Now create the new files
-		return $this->install();
-	}
-
 	/**
 	 * Custom uninstall method
 	 *

libraries/cms/installer/installer.php

@@ -500,9 +500,11 @@ public function discover_install($eid = null)
 			}
 
 			// Lazy load the adapter
+			$adapter = null;
 			if (!isset($this->_adapters[$this->extension->type]) || !is_object($this->_adapters[$this->extension->type]))
 			{
-				if (!$this->setAdapter($this->extension->type))
+				$params = array('extension' => $this->extension);
+				if (!$this->setAdapter($this->extension->type, $adapter, $params))
 				{
 					return false;
 				}
@@ -691,17 +693,22 @@ public function update($path = null)
 	 * Package uninstallation method
 	 *
 	 * @param   string  $type        Package type
-	 * @param   mixed   $identifier  Package identifier for adapter
+	 * @param   mixed   $eid         Package identifier for adapter
 	 *
 	 * @return  boolean  True if successful
 	 *
 	 * @since   3.1
 	 */
-	public function uninstall($type, $identifier)
+	public function uninstall($type, $eid)
 	{
+		$this->extension = JTable::getInstance('extension');
+		$this->extension->load(array('type'=>$type, 'extension_id'=>$eid));
+
+		$adapter = null;
 		if (!isset($this->_adapters[$type]) || !is_object($this->_adapters[$type]))
 		{
-			if (!$this->setAdapter($type))
+			$params = array('extension' => $this->extension);
+			if (!$this->setAdapter($type, $adapter, $params))
 			{
 				// We failed to get the right adapter
 				return false;
@@ -714,12 +721,12 @@ public function uninstall($type, $identifier)
 			// Fire the onExtensionBeforeUninstall event.
 			JPluginHelper::importPlugin('extension');
 			$dispatcher = JEventDispatcher::getInstance();
-			$dispatcher->trigger('onExtensionBeforeUninstall', array('eid' => $identifier));
+			$dispatcher->trigger('onExtensionBeforeUninstall', array('eid' => $eid));
 
 			// Run the uninstall.
 			$errorMsg = '';
 			try {
-				$result = (bool) $this->_adapters[$type]->uninstall($identifier);
+				$result = (bool) $this->_adapters[$type]->uninstall($eid);
 			}
 			catch (Exception $e)
 			{
@@ -735,7 +742,7 @@ public function uninstall($type, $identifier)
 				'onExtensionAfterUninstall',
 				array(
 					'installer' => clone $this,
-					'eid' => $identifier,
+					'eid' => $eid,
 					'result' => $result
 				)
 			);
@@ -776,9 +783,11 @@ public function refreshManifestCache($eid)
 			}
 
 			// Lazy load the adapter
+			$adapter = null;
 			if (!isset($this->_adapters[$this->extension->type]) || !is_object($this->_adapters[$this->extension->type]))
 			{
-				if (!$this->setAdapter($this->extension->type))
+				$params = array('extension' => $this->extension);
+				if (!$this->setAdapter($this->extension->type, $adapter, $params))
 				{
 					return false;
 				}
@@ -839,9 +848,11 @@ public function setupInstall()
 		$type = (string) $this->manifest->attributes()->type;
 
 		// Lazy load the adapter
+		$adapter = null;
 		if (!isset($this->_adapters[$type]) || !is_object($this->_adapters[$type]))
 		{
-			if (!$this->setAdapter($type))
+			$params = array('manifest' => $this->manifest);
+			if (!$this->setAdapter($type, $adapter, $params))
 			{
 				return false;
 			}
@@ -1851,6 +1862,10 @@ public function copyManifest($cid = 1)
 	 */
 	public function findManifest()
 	{
+		if (!$this->getPath('source')) {
+			return false;
+		}
+
 		// Get an array of all the XML files from the installation directory
 		$xmlfiles = JFolder::files($this->getPath('source'), '.xml$', 1, true);