Skip to content

Issue 42 #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Issue 42 #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions Classes/Details/ExtensionDetails.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@
* The TYPO3 project - inspiring people to share!
*/

use TYPO3\CMS\Core\Utility\GeneralUtility;
use SchamsNet\Nagios\Controller\NagiosController;
use TYPO3\CMS\Core\Package\PackageManager;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Extensionmanager\Utility\ListUtility;
use SchamsNet\Nagios\Controller\NagiosController;

/**
* Class contains methods for extension-related details, such as extension versions.
Expand All @@ -35,16 +34,16 @@ class ExtensionDetails
private $availableExtensions = [];

/**
* Extensionmanager ListUtility
* PackageManager
*/
private ListUtility $extensionListUtility;
private PackageManager $packageManager;

/**
* Constructor
*/
public function __construct(ListUtility $extensionListUtility)
public function __construct(PackageManager $packageManager)
{
$this->extensionListUtility = $extensionListUtility;
$this->packageManager = $packageManager;
}

/**
Expand All @@ -53,16 +52,14 @@ public function __construct(ListUtility $extensionListUtility)
public function getAvailableExtensions(bool $loadedExtensionsOnly = false): array
{
$installedExtensions = [];
$this->availableExtensions = $this->extensionListUtility
->getAvailableAndInstalledExtensionsWithAdditionalInformation();
$this->availableExtensions = $this->packageManager->getAvailablePackages();

foreach ($this->availableExtensions as $extensionKey => $extensionDetails) {
if (array_key_exists('type', $extensionDetails)
&& array_key_exists('version', $extensionDetails)
&& $this->isValidExtensionKey($extensionKey)
&& strtolower($extensionDetails['type']) == 'local') {
if ($extensionDetails->getPackageMetaData()->isExtensionType() &&
!$extensionDetails->getPackageMetaData()->isFrameworkType() &&
$this->isValidExtensionKey($extensionKey)) {
if (!$loadedExtensionsOnly
|| ($loadedExtensionsOnly && ExtensionManagementUtility::isLoaded($extensionKey))
|| ($loadedExtensionsOnly && $this->packageManager->isPackageActive($extensionKey))
) {
$extensionVersion = $this->getExtensionVersion($extensionKey);
if ($extensionVersion) {
Expand Down