Skip to content

Commit

Permalink
OXDEV-8215: Raname a few variables; Remove unnecessary docblock or br…
Browse files Browse the repository at this point in the history
…ackets;
  • Loading branch information
MarcelOxid committed Jul 29, 2024
1 parent 544d0f8 commit 6a8e5b4
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
1 change: 0 additions & 1 deletion src/Module/Controller/ModuleListController.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ public function __construct(

/**
* Query of Configuration Access Module
* @param ModuleFilters|null $filters
* @return ModuleDataType[]
*/
#[Query]
Expand Down
10 changes: 5 additions & 5 deletions src/Module/DataType/ModuleDataTypeFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ public function createFromCoreModule(
ModuleConfiguration $moduleConfig
): ModuleDataType {
$titlesData = $moduleConfig->getTitle();
$title = $this->languageService->filterByLanguageAbbreviation(data: $titlesData);
$translatedTitle = $this->languageService->filterByLanguageAbbreviation(data: $titlesData);

$descriptionData = $moduleConfig->getDescription();
$description = $this->languageService->filterByLanguageAbbreviation(data: $descriptionData);
$description = $moduleConfig->getDescription();
$translatedDescription = $this->languageService->filterByLanguageAbbreviation(data: $description);

return new ModuleDataType(
id: $moduleConfig->getId(),
version: $moduleConfig->getVersion(),
title: $title,
description: $description,
title: $translatedTitle,
description: $translatedDescription,
thumbnail: $moduleConfig->getThumbnail(),
author: $moduleConfig->getAuthor(),
url: $moduleConfig->getUrl(),
Expand Down
2 changes: 1 addition & 1 deletion src/Module/Exception/ModulesNotFoundException.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ final class ModulesNotFoundException extends NotFound
{
public function __construct()
{
parent::__construct(('Modules was not found.'));
parent::__construct('Modules was not found.');
}
}
6 changes: 3 additions & 3 deletions src/Shared/Service/LanguageService.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
class LanguageService implements LanguageServiceInterface
{
public function __construct(
private LanguageWrapperInterface $language
private LanguageWrapperInterface $languageWrapper
) {
}

public function filterByLanguageAbbreviation(array $data): ?string
{
$langId = $this->language->getBaseLanguage();
$languageAbbr = $this->language->getLanguageAbbr(langId: $langId);
$langId = $this->languageWrapper->getBaseLanguage();
$languageAbbr = $this->languageWrapper->getLanguageAbbr(langId: $langId);

if (isset($data[$languageAbbr])) {
return $data[$languageAbbr];
Expand Down

0 comments on commit 6a8e5b4

Please sign in to comment.