Add support for slogan as array (#117)

Relates: #10890
This commit is contained in:
Daniel Siepmann 2024-01-24 11:54:48 +01:00 committed by GitHub
parent 54d244b804
commit 56c1f75b35
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 378 additions and 6 deletions

View file

@ -27,7 +27,10 @@ use WerkraumMedia\ThueCat\Domain\Import\EntityMapper\PropertyValues;
class TouristAttraction extends Place implements MapsToType class TouristAttraction extends Place implements MapsToType
{ {
protected string $slogan = ''; /**
* @var string[]
*/
protected array $slogan = [];
protected string $startOfConstruction = ''; protected string $startOfConstruction = '';
@ -62,7 +65,7 @@ class TouristAttraction extends Place implements MapsToType
*/ */
protected array $availableLanguages = []; protected array $availableLanguages = [];
public function getSlogan(): string public function getSlogan(): array
{ {
return $this->slogan; return $this->slogan;
} }
@ -129,10 +132,15 @@ class TouristAttraction extends Place implements MapsToType
/** /**
* @internal for mapping via Symfony component. * @internal for mapping via Symfony component.
*
* @param string|array $slogan
*/ */
public function setSlogan(string $slogan): void public function setSlogan($slogan): void
{ {
$this->slogan = PropertyValues::removePrefixFromEntry($slogan); if (is_string($slogan)) {
$slogan = [$slogan];
}
$this->slogan = PropertyValues::removePrefixFromEntries($slogan);
} }
/** /**

View file

@ -197,7 +197,7 @@ class GeneralConverter implements Converter
'payment_accepted' => method_exists($entity, 'getPaymentsAccepted') ? implode(',', $entity->getPaymentsAccepted()) : '', 'payment_accepted' => method_exists($entity, 'getPaymentsAccepted') ? implode(',', $entity->getPaymentsAccepted()) : '',
'distance_to_public_transport' => method_exists($entity, 'getDistanceToPublicTransport') ? $entity->getDistanceToPublicTransport() : '', 'distance_to_public_transport' => method_exists($entity, 'getDistanceToPublicTransport') ? $entity->getDistanceToPublicTransport() : '',
'slogan' => method_exists($entity, 'getSlogan') ? $entity->getSlogan() : '', 'slogan' => method_exists($entity, 'getSlogan') ? implode(',', $entity->getSlogan()) : '',
'start_of_construction' => method_exists($entity, 'getStartOfConstruction') ? $entity->getStartOfConstruction() : '', 'start_of_construction' => method_exists($entity, 'getStartOfConstruction') ? $entity->getStartOfConstruction() : '',
'museum_service' => method_exists($entity, 'getMuseumServices') ? implode(',', $entity->getMuseumServices()) : '', 'museum_service' => method_exists($entity, 'getMuseumServices') ? implode(',', $entity->getMuseumServices()) : '',
'architectural_style' => method_exists($entity, 'getArchitecturalStyles') ? implode(',', $entity->getArchitecturalStyles()) : '', 'architectural_style' => method_exists($entity, 'getArchitecturalStyles') ? implode(',', $entity->getArchitecturalStyles()) : '',

View file

@ -61,7 +61,15 @@ class TouristAttraction extends Place
public function getSlogan(): string public function getSlogan(): string
{ {
return $this->slogan; return explode(',', $this->slogan)[0] ?? '';
}
/**
* @return string[]
*/
public function getSlogans(): array
{
return explode(',', $this->slogan);
} }
public function getOffers(): ?Offers public function getOffers(): ?Offers

View file

@ -15,6 +15,10 @@ Features
* Add support for PHP 8.3. * Add support for PHP 8.3.
* Add support for multiple slogans (array within slogan).
The existing API will return the first slogan.
A new method `getSlogans` is added which will return the array of slogans.
Fixes Fixes
----- -----

View file

@ -0,0 +1,28 @@
<?php
declare(strict_types=1);
return [
'tx_thuecat_tourist_attraction' => [
0 => [
'uid' => '1',
'pid' => '10',
'sys_language_uid' => '0',
'l18n_parent' => '0',
'l10n_source' => '0',
'remote_id' => 'https://thuecat.org/resources/attraction-with-single-slogan',
'title' => 'Attraktion mit single slogan',
'slogan' => 'InsiderTip',
],
1 => [
'uid' => '2',
'pid' => '10',
'sys_language_uid' => '1',
'l18n_parent' => '1',
'l10n_source' => '1',
'remote_id' => 'https://thuecat.org/resources/attraction-with-single-slogan',
'title' => 'Attraction with single slogan',
'slogan' => 'InsiderTip',
],
],
];

View file

@ -0,0 +1,28 @@
<?php
declare(strict_types=1);
return [
'tx_thuecat_tourist_attraction' => [
0 => [
'uid' => '1',
'pid' => '10',
'sys_language_uid' => '0',
'l18n_parent' => '0',
'l10n_source' => '0',
'remote_id' => 'https://thuecat.org/resources/attraction-with-slogan-array',
'title' => 'Attraktion mit slogan array',
'slogan' => 'Highlight,InsiderTip,Unique',
],
1 => [
'uid' => '2',
'pid' => '10',
'sys_language_uid' => '1',
'l18n_parent' => '1',
'l10n_source' => '1',
'remote_id' => 'https://thuecat.org/resources/attraction-with-slogan-array',
'title' => 'Attraction with slogan array',
'slogan' => 'Highlight,InsiderTip,Unique',
],
],
];

View file

@ -0,0 +1,55 @@
{
"@context": {
"cdb": "https://thuecat.org/ontology/cdb/1.0/",
"dachkg": "https://thuecat.org/ontology/dachkg/1.0/",
"dbo": "http://dbpedia.org/ontology/",
"dsv": "http://ontologies.sti-innsbruck.at/dsv/",
"foaf": "http://xmlns.com/foaf/0.1/",
"owl": "http://www.w3.org/2002/07/owl#",
"rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
"rdfs": "http://www.w3.org/2000/01/rdf-schema#",
"schema": "http://schema.org/",
"sh": "http://www.w3.org/ns/shacl#",
"thuecat": "https://thuecat.org/ontology/thuecat/1.0/",
"ttgds": "https://thuecat.org/ontology/ttgds/1.0/",
"xsd": "http://www.w3.org/2001/XMLSchema#"
},
"@graph": [
{
"@id": "https://thuecat.org/resources/attraction-with-single-slogan",
"@type": [
"schema:Place",
"schema:Thing",
"schema:TouristAttraction",
"ttgds:PointOfInterest"
],
"schema:availableLanguage": [
{
"@type": "thuecat:Language",
"@value": "thuecat:German"
},
{
"@type": "thuecat:Language",
"@value": "thuecat:English"
}
],
"schema:name": [
{
"@language": "de",
"@value": "Attraktion mit single slogan"
},
{
"@language": "en",
"@value": "Attraction with single slogan"
}
],
"schema:slogan": {
"@type": "thuecat:ThuSlogan",
"@value": "thuecat:InsiderTip"
},
"thuecat:contentResponsible": {
"@id": "https://thuecat.org/resources/018132452787-ngbe"
}
}
]
}

View file

@ -0,0 +1,65 @@
{
"@context": {
"cdb": "https://thuecat.org/ontology/cdb/1.0/",
"dachkg": "https://thuecat.org/ontology/dachkg/1.0/",
"dbo": "http://dbpedia.org/ontology/",
"dsv": "http://ontologies.sti-innsbruck.at/dsv/",
"foaf": "http://xmlns.com/foaf/0.1/",
"owl": "http://www.w3.org/2002/07/owl#",
"rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
"rdfs": "http://www.w3.org/2000/01/rdf-schema#",
"schema": "http://schema.org/",
"sh": "http://www.w3.org/ns/shacl#",
"thuecat": "https://thuecat.org/ontology/thuecat/1.0/",
"ttgds": "https://thuecat.org/ontology/ttgds/1.0/",
"xsd": "http://www.w3.org/2001/XMLSchema#"
},
"@graph": [
{
"@id": "https://thuecat.org/resources/attraction-with-slogan-array",
"@type": [
"schema:Place",
"schema:Thing",
"schema:TouristAttraction",
"ttgds:PointOfInterest"
],
"schema:availableLanguage": [
{
"@type": "thuecat:Language",
"@value": "thuecat:German"
},
{
"@type": "thuecat:Language",
"@value": "thuecat:English"
}
],
"schema:name": [
{
"@language": "de",
"@value": "Attraktion mit slogan array"
},
{
"@language": "en",
"@value": "Attraction with slogan array"
}
],
"schema:slogan": [
{
"@type": "thuecat:ThuSlogan",
"@value": "thuecat:Highlight"
},
{
"@type": "thuecat:ThuSlogan",
"@value": "thuecat:InsiderTip"
},
{
"@type": "thuecat:ThuSlogan",
"@value": "thuecat:Unique"
}
],
"thuecat:contentResponsible": {
"@id": "https://thuecat.org/resources/018132452787-ngbe"
}
}
]
}

View file

@ -0,0 +1,65 @@
<?php
declare(strict_types=1);
use TYPO3\CMS\Core\Domain\Repository\PageRepository;
return [
'pages' => [
0 => [
'uid' => '1',
'pid' => '0',
'tstamp' => '1613400587',
'crdate' => '1613400558',
'doktype' => PageRepository::DOKTYPE_DEFAULT,
'title' => 'Rootpage',
'is_siteroot' => '1',
],
1 => [
'uid' => '10',
'pid' => '1',
'tstamp' => '1613400587',
'crdate' => '1613400558',
'doktype' => PageRepository::DOKTYPE_SYSFOLDER,
'title' => 'Storage folder',
],
],
'tx_thuecat_import_configuration' => [
0 => [
'uid' => '1',
'pid' => '0',
'tstamp' => '1613400587',
'crdate' => '1613400558',
'disable' => '0',
'title' => 'Tourist Attraction',
'type' => 'static',
'configuration' => '<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<T3FlexForms>
<data>
<sheet index="sDEF">
<language index="lDEF">
<field index="storagePid">
<value index="vDEF">10</value>
</field>
<field index="urls">
<el index="el">
<field index="602a89f54d694654233086">
<value index="url">
<el>
<field index="url">
<value index="vDEF">https://thuecat.org/resources/attraction-with-single-slogan</value>
</field>
</el>
</value>
<value index="_TOGGLE">0</value>
</field>
</el>
</field>
</language>
</sheet>
</data>
</T3FlexForms>
',
],
],
];

View file

@ -0,0 +1,65 @@
<?php
declare(strict_types=1);
use TYPO3\CMS\Core\Domain\Repository\PageRepository;
return [
'pages' => [
0 => [
'uid' => '1',
'pid' => '0',
'tstamp' => '1613400587',
'crdate' => '1613400558',
'doktype' => PageRepository::DOKTYPE_DEFAULT,
'title' => 'Rootpage',
'is_siteroot' => '1',
],
1 => [
'uid' => '10',
'pid' => '1',
'tstamp' => '1613400587',
'crdate' => '1613400558',
'doktype' => PageRepository::DOKTYPE_SYSFOLDER,
'title' => 'Storage folder',
],
],
'tx_thuecat_import_configuration' => [
0 => [
'uid' => '1',
'pid' => '0',
'tstamp' => '1613400587',
'crdate' => '1613400558',
'disable' => '0',
'title' => 'Tourist Attraction',
'type' => 'static',
'configuration' => '<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<T3FlexForms>
<data>
<sheet index="sDEF">
<language index="lDEF">
<field index="storagePid">
<value index="vDEF">10</value>
</field>
<field index="urls">
<el index="el">
<field index="602a89f54d694654233086">
<value index="url">
<el>
<field index="url">
<value index="vDEF">https://thuecat.org/resources/attraction-with-slogan-array</value>
</field>
</el>
</value>
<value index="_TOGGLE">0</value>
</field>
</el>
</field>
</language>
</sheet>
</data>
</T3FlexForms>
',
],
],
];

View file

@ -333,6 +333,32 @@ class ImportTest extends AbstractImportTestCase
self::assertStringEqualsFile(__DIR__ . '/Fixtures/Import/ImportsTouristAttractionWithAccessibilitySpecificationEnglish.txt', $records[1]['accessibility_specification'] . PHP_EOL); self::assertStringEqualsFile(__DIR__ . '/Fixtures/Import/ImportsTouristAttractionWithAccessibilitySpecificationEnglish.txt', $records[1]['accessibility_specification'] . PHP_EOL);
} }
#[Test]
public function importsTouristAttractionWithSloganArray(): void
{
$this->importPHPDataSet(__DIR__ . '/Fixtures/Import/ImportsTouristAttractionWithSloganArray.php');
GuzzleClientFaker::appendResponseFromFile(__DIR__ . '/Fixtures/Import/Guzzle/thuecat.org/resources/attraction-with-slogan-array.json');
GuzzleClientFaker::appendResponseFromFile(__DIR__ . '/Fixtures/Import/Guzzle/thuecat.org/resources/018132452787-ngbe.json');
$this->importConfiguration();
$this->assertPHPDataSet(__DIR__ . '/Assertions/Import/ImportsTouristAttractionWithSloganArray.php');
}
#[Test]
public function importsTouristAttractionWithSingleSlogan(): void
{
$this->importPHPDataSet(__DIR__ . '/Fixtures/Import/ImportsTouristAttractionWithSingleSlogan.php');
GuzzleClientFaker::appendResponseFromFile(__DIR__ . '/Fixtures/Import/Guzzle/thuecat.org/resources/attraction-with-single-slogan.json');
GuzzleClientFaker::appendResponseFromFile(__DIR__ . '/Fixtures/Import/Guzzle/thuecat.org/resources/018132452787-ngbe.json');
$this->importConfiguration();
$this->assertPHPDataSet(__DIR__ . '/Assertions/Import/ImportsTouristAttractionWithSingleSlogan.php');
}
private function importConfiguration(): void private function importConfiguration(): void
{ {
$configuration = $this->get(ImportConfigurationRepository::class)->findByUid(1); $configuration = $this->get(ImportConfigurationRepository::class)->findByUid(1);

View file

@ -280,4 +280,24 @@ class TouristAttractionTest extends TestCase
} }
} }
} }
#[Test]
public function returnsSingleSlogan(): void
{
$subject = new TouristAttraction();
$subject->_setProperty('slogan', 'Some text');
self::assertSame('Some text', $subject->getSlogan());
self::assertSame(['Some text'], $subject->getSlogans());
}
#[Test]
public function returnsMultipleSlogans(): void
{
$subject = new TouristAttraction();
$subject->_setProperty('slogan', 'Some text,Highlight');
self::assertSame('Some text', $subject->getSlogan());
self::assertSame(['Some text', 'Highlight'], $subject->getSlogans());
}
} }