Restructure

Author: Georg Ringer

Classes/Command/ApiCommandController.php

@@ -50,6 +50,7 @@ public function databaseCompareCommand($actions = '') {
 			$this->quit();
 		}
 
+		/** @var $service Tx_Coreapi_Service_DatabaseApiService */
 		$service = $this->objectManager->get('Tx_Coreapi_Service_DatabaseApiService');
 		$allowedActions = array();
 		$actionSplit = t3lib_div::trimExplode(',', $actions);

Classes/Command/CacheApiCommandController.php

@@ -36,7 +36,10 @@ class Tx_Coreapi_Command_CacheApiCommandController extends Tx_Extbase_MVC_Contro
 	 * @return void
 	 */
 	public function clearAllCacheCommand() {
-		$this->objectManager->get('Tx_Coreapi_Service_CacheApiService')->clearAllCaches();
+		/** @var $service Tx_Coreapi_Service_CacheApiService */
+		$service = $this->objectManager->get('Tx_Coreapi_Service_CacheApiService');
+		$service->clearAllCaches();
+
 		$this->outputLine('All caches have been cleared.');
 	}
 
@@ -46,7 +49,10 @@ public function clearAllCacheCommand() {
 	 * @return void
 	 */
 	public function clearConfigurationCacheCommand() {
-		$this->objectManager->get('Tx_Coreapi_Service_CacheApiService')->clearConfigurationCache();
+		/** @var $service Tx_Coreapi_Service_CacheApiService */
+		$service = $this->objectManager->get('Tx_Coreapi_Service_CacheApiService');
+		$service->clearConfigurationCache();
+
 		$this->outputLine('Configuration Cache has been cleared.');
 	}
 

Classes/Command/ExtensionApiCommandController.php

@@ -37,28 +37,18 @@ class Tx_Coreapi_Command_ExtensionApiCommandController extends Tx_Extbase_MVC_Co
 	 * @return void
 	 */
 	public function listInstalledCommand($type = '') {
-		$type = strtoupper($type);
+				$type = strtoupper($type);
 		if (!empty($type) && $type !== 'L' && $type !== 'G' && $type !== 'S') {
 			$this->outputLine('Only "L", "S" and "G" are supported as type (or nothing)');
 			$this->quit();
 		}
 
-		$extensions = $GLOBALS['TYPO3_LOADED_EXT'];
+		/** @var $extensions Tx_Coreapi_Service_ExtensionApiService */
+		$extensions = $this->objectManager->get('Tx_Coreapi_Service_ExtensionApiService')->getInstalledExtensions($type);
 
-		$list = array();
-		foreach ($extensions as $key => $extension) {
-			if (!empty($type) && $type !== $extension['type']) {
-				continue;
-			}
-			$list[$key] = $extension['ext_tables.sql'];
-		}
-
-		ksort($list);
-
-		foreach ($list as $key => $description) {
-			include_once(t3lib_extMgm::extPath($key) . 'ext_emconf.php');
-			$title = $key . ' - ' . $EM_CONF['']['version'] . '/' . $EM_CONF['']['state'];
-			$description = $EM_CONF['']['title'];
+		foreach ($extensions as $key => $details) {
+			$title = $key . ' - ' . $details['version'] . '/' . $details['state'];
+			$description = $details['title'];
 			$description = wordwrap($description, self::MAXIMUM_LINE_LENGTH - 43, PHP_EOL . str_repeat(' ', 43), TRUE);
 			$this->outputLine('%-2s%-40s %s', array(' ', $title, $description));
 		}

Classes/Service/ExtensionApiService.php

@@ -39,6 +39,24 @@ class Tx_Coreapi_Service_ExtensionApiService {
 	extension:uninstall         Uninstalls an extension
 	extension:refresh           Refreshes the local cache of all extensions available in TER
 */
+
+	public function getInstalledExtensions($type = '') {
+		$extensions = $GLOBALS['TYPO3_LOADED_EXT'];
+
+		$list = array();
+		foreach ($extensions as $key => $extension) {
+			if (!empty($type) && $type !== $extension['type']) {
+				continue;
+			}
+
+			include_once(t3lib_extMgm::extPath($key) . 'ext_emconf.php');
+			$list[$key] = $EM_CONF[''];
+		}
+
+		ksort($list);
+
+		return $list;
+	}
 }
 
 ?>