Merge branch 'master' into develop

Author: etobi

Classes/Command/CacheApiCommandController.php

@@ -84,7 +84,7 @@ public function injectCacheApiService(\Etobi\CoreAPI\Service\CacheApiService $ca
 	public function clearAllCachesCommand($hard = false) {
 		$this->cacheApiService->clearAllCaches($hard);
 		$message = 'All caches have been cleared%s.';
-		$this->logger->info(sprintf($message, $hard ? ' hard' : ''));
+		$this->logger->info($message);
 		$this->outputLine($message, $hard ? array(' hard') : array(''));
 	}
 
@@ -158,4 +158,4 @@ public function clearAllExceptPageCacheCommand() {
 		$this->logger->info($message);
 		$this->outputLine($message);
 	}
-}
+}

Classes/Command/ConfigurationApiCommandController.php

@@ -9,7 +9,6 @@
 	'Etobi\CoreAPI\Command\SiteApiCommandController' => $extensionClassesPath . 'Command/SiteApiCommandController.php',
 	'Etobi\CoreAPI\Command\CacheApiCommandController' => $extensionClassesPath . 'Command/CacheApiCommandController.php',
 	'Etobi\CoreAPI\Command\ExtensionApiCommandController' => $extensionClassesPath . 'Command/ExtensionApiCommandController.php',
-	'Etobi\CoreAPI\Command\ConfigurationApiCommandController' => $extensionClassesPath . 'Command/ConfigurationApiCommandController.php',
 	'Etobi\CoreAPI\Service\CacheApiService' => $extensionClassesPath . 'Service/CacheApiService.php',
 	'Etobi\CoreAPI\Service\SiteApiService' => $extensionClassesPath . 'Service/SiteApiService.php',
 	'Etobi\CoreAPI\Service\DatabaseApiService' => $extensionClassesPath . 'Service/DatabaseApiService.php',

Classes/Service/ConfigurationApiService.php

@@ -17,12 +17,12 @@
 	'modify_tables' => '',
 	'clearCacheOnLoad' => 0,
 	'lockType' => '',
-	'version' => '1.1.1',
+	'version' => '1.2.0',
 	'constraints' => array(
 		'depends' => array(
-			'typo3' => '6.2.0-6.2.99',
-			'extbase' => '6.2.0-6.2.99',
-			'fluid' => '6.2.0-6.2.99',
+			'typo3' => '6.2.0-7.99.99',
+			'extbase' => '6.2.0-7.99.99',
+			'fluid' => '6.2.0-7.99.99',
 		),
 		'conflicts' => array(
 		),

ext_autoload.php

@@ -8,5 +8,4 @@
 	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers'][] = 'Etobi\CoreAPI\Command\CacheApiCommandController';
 	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers'][] = 'Etobi\CoreAPI\Command\SiteApiCommandController';
 	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers'][] = 'Etobi\CoreAPI\Command\ExtensionApiCommandController';
-	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers'][] = 'Etobi\CoreAPI\Command\ConfigurationApiCommandController';
-}
+}