Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 10:30:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix support for multiple authors and maintainers

Browse source
This commit is contained in:
Art4 2025-02-04 14:35:57 +00:00
parent a80bf0ddf1
commit b0e3f1f64d
4 changed files with 55 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/Core/Addon/AddonInfo.php
View file

@ -24,8 +24,8 @@ final class AddonInfo
$id = array_key_exists('id', $info) ? (string) $info['id'] : '';
$name = array_key_exists('name', $info) ? (string) $info['name'] : '';
$description = array_key_exists('description', $info) ? (string) $info['description'] : '';
$author = array_key_exists('author', $info) ? self::parseContributor($info['author']) : [];
$maintainer = array_key_exists('maintainer', $info) ? self::parseContributor($info['maintainer']) : [];
$authors = array_key_exists('authors', $info) ? self::parseContributors($info['authors']) : [];
$maintainers = array_key_exists('maintainers', $info) ? self::parseContributors($info['maintainers']) : [];
$version = array_key_exists('version', $info) ? (string) $info['version'] : '';
$status = array_key_exists('status', $info) ? (string) $info['status'] : '';
@ -33,21 +33,28 @@ final class AddonInfo
$id,
$name,
$description,
$author,
$maintainer,
$authors,
$maintainers,
$version,
$status
);
}
private static function parseContributor($entry): array
private static function parseContributors($entries): array
{
if (!is_array($entry)) {
if (!is_array($entries)) {
return [];
}
$contributors = [];
foreach ($entries as $entry) {
if (!is_array($entry)) {
continue;
}
if (!array_key_exists('name', $entry)) {
return [];
continue;
}
$contributor = [
@ -58,7 +65,10 @@ final class AddonInfo
$contributor['link'] = (string) $entry['link'];
}
return $contributor;
$contributors[] = $contributor;
}
return $contributors;
}
private string $id = '';
@ -67,9 +77,9 @@ final class AddonInfo
private string $description = '';
private array $author = [];
private array $authors = [];
private array $maintainer = [];
private array $maintainers = [];
private string $version = '';
@ -79,16 +89,16 @@ final class AddonInfo
string $id,
string $name,
string $description,
array $author,
array $maintainer,
array $authors,
array $maintainers,
string $version,
string $status
) {
$this->id = $id;
$this->name = $name;
$this->description = $description;
$this->author = $author;
$this->maintainer = $maintainer;
$this->authors = $authors;
$this->maintainers = $maintainers;
$this->version = $version;
$this->status = $status;
}
@ -108,14 +118,14 @@ final class AddonInfo
return $this->description;
}
public function getAuthor(): array
public function getAuthors(): array
{
return $this->author;
return $this->authors;
}
public function getMaintainer(): array
public function getMaintainers(): array
{
return $this->maintainer;
return $this->maintainers;
}
public function getVersion(): string

8
src/Core/Addon/AddonProxy.php
View file

@ -103,6 +103,14 @@ final class AddonProxy implements AddonHelper
// add addon ID
$data['id'] = $addonId;
// rename author to authors
$data['authors'] = $data['author'];
unset($data['author']);
// rename maintainer to maintainers
$data['maintainers'] = $data['maintainer'];
unset($data['maintainer']);
return AddonInfo::fromArray($data);
}

6
src/Module/Admin/Addons/Details.php
View file

@ -94,6 +94,8 @@ class Details extends BaseAdmin
$t = Renderer::getMarkupTemplate('admin/addons/details.tpl');
throw new \Exception('ff');
return Renderer::replaceMacros($t, [
'$title' => DI::l10n()->t('Administration'),
'$page' => DI::l10n()->t('Addons'),
@ -107,8 +109,8 @@ class Details extends BaseAdmin
'name' => $addonInfo->getName(),
'version' => $addonInfo->getVersion(),
'description' => $addonInfo->getDescription(),
'author' => $addonInfo->getAuthor(),
'maintainer' => $addonInfo->getMaintainer(),
'author' => $addonInfo->getAuthors(),
'maintainer' => $addonInfo->getMaintainers(),
],
'$str_author' => DI::l10n()->t('Author: '),
'$str_maintainer' => DI::l10n()->t('Maintainer: '),

12
tests/Unit/Core/Addon/AddonInfoTest.php
View file

@ -20,8 +20,8 @@ class AddonInfoTest extends TestCase
'id' => '',
'name' => '',
'description' => '',
'author' => [],
'maintainer' => [],
'authors' => [],
'maintainers' => [],
'version' => '',
'status' => '',
];
@ -35,8 +35,8 @@ class AddonInfoTest extends TestCase
'id' => 'test',
'name' => 'Test-Addon',
'description' => 'This is an addon for tests',
'author' => ['name' => 'Sam'],
'maintainer' => ['name' => 'Sam', 'link' => 'https://example.com'],
'authors' => [['name' => 'Sam']],
'maintainers' => [['name' => 'Sam', 'link' => 'https://example.com']],
'version' => '0.1',
'status' => 'In Development',
];
@ -47,8 +47,8 @@ class AddonInfoTest extends TestCase
$this->assertSame($data['name'], $info->getName());
$this->assertSame($data['description'], $info->getDescription());
$this->assertSame($data['description'], $info->getDescription());
$this->assertSame($data['author'], $info->getAuthor());
$this->assertSame($data['maintainer'], $info->getMaintainer());
$this->assertSame($data['authors'], $info->getAuthors());
$this->assertSame($data['maintainers'], $info->getMaintainers());
$this->assertSame($data['version'], $info->getVersion());
$this->assertSame($data['status'], $info->getStatus());
}