From 66af35a768be91fe5aea7db6ea799181aa5af907 Mon Sep 17 00:00:00 2001
From: Oliver Hader <oliver@typo3.org>
Date: Tue, 17 Jun 2014 15:35:14 +0200
Subject: [PATCH] [BUGFIX] Undefined method in extension manager
PHP fatal error due to the invalid call to non-existing method
ExtensionManagementService::resolveDependenciesAndInstall during
upgrading an existing extension to a newer version from TER.
Resolves: #59624
Releases: 6.2
Change-Id: I84ff3685a94625cbc94af1967ac65b61cf9f5e43
Reviewed-on: https://review.typo3.org/30777
Reviewed-by: Alexander Opitz
Tested-by: Alexander Opitz
Reviewed-by: Francois Suter
Tested-by: Francois Suter
Reviewed-by: Oliver Hader
Tested-by: Oliver Hader
---
.../extensionmanager/Classes/Controller/DownloadController.php | 3 +--
.../Classes/Domain/Repository/ExtensionRepository.php | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
index 66153a0a8b2c..7fe59e0b9877 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
@@ -182,10 +182,9 @@ class DownloadController extends AbstractController {
$result = array();
$extensionKey = $this->request->getArgument('extension');
- /** @var Extension $highestTerVersionExtension */
$highestTerVersionExtension = $this->extensionRepository->findHighestAvailableVersion($extensionKey);
try {
- $result = $this->managementService->resolveDependenciesAndInstall($highestTerVersionExtension);
+ $result = $this->managementService->installExtension($highestTerVersionExtension);
} catch (\Exception $e) {
$hasErrors = TRUE;
$errorMessage = $e->getMessage();
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
index 9f181e99674f..c50726405898 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
@@ -258,7 +258,7 @@ class ExtensionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
* Find highest version available of an extension
*
* @param string $extensionKey
- * @return object
+ * @return \TYPO3\CMS\Extensionmanager\Domain\Model\Extension
*/
public function findHighestAvailableVersion($extensionKey) {
$query = $this->createQuery();
--
GitLab