Work-Related/events
Work-Related/events
1
0
mirror of https://github.com/werkraum-media/events.git synced 2024-11-22 10:16:09 +01:00
Code Issues Activity

Fix type miss match of object storages

Browse source 
The properties should always be ObjectStorage instances.
We streamline the annotation and initialization to ensure exactly that.

Also import needs small adjustment as it still expected null as possible
return type.
This commit is contained in:
Daniel Siepmann 2021-09-06 16:33:18 +02:00
parent 018fdc697e
commit 410a73052e
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Classes/Domain/Model/Event.php
View file

@ -176,15 +176,15 @@ class Event extends AbstractEntity
* @var ObjectStorage<FileReference> * @var ObjectStorage<FileReference>
* @Extbase\ORM\Cascade remove * @Extbase\ORM\Cascade remove
*/ */
protected $images = null; protected $images;
/** /**
* dates * dates
* *
* @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Wrm\Events\Domain\Model\Date> * @var ObjectStorage<Date>
* @Extbase\ORM\Cascade remove * @Extbase\ORM\Cascade remove
*/ */
protected $dates = null; protected $dates;
/** /**
* organizer * organizer
@ -196,7 +196,7 @@ class Event extends AbstractEntity
/** /**
* region * region
* *
* @var \Wrm\Events\Domain\Model\Region * @var Region
*/ */
protected $region = null; protected $region = null;
@ -208,17 +208,17 @@ class Event extends AbstractEntity
/** /**
* categories * categories
* *
* @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<Category> * @var ObjectStorage<Category>
*/ */
protected $categories; protected $categories;
/** /**
* @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<Partner> * @var ObjectStorage<Partner>
*/ */
protected $partner; protected $partner;
/** /**
* @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<Event> * @var ObjectStorage<Event>
*/ */
protected $referencesEvents; protected $referencesEvents;
@ -232,13 +232,8 @@ class Event extends AbstractEntity
*/ */
protected $dataProcessing = null; protected $dataProcessing = null;
/**
* __construct
*/
public function __construct() public function __construct()
{ {
//Do not remove the next line: It would break the functionality
$this->initStorageObjects(); $this->initStorageObjects();
} }
@ -260,7 +255,10 @@ class Event extends AbstractEntity
*/ */
protected function initStorageObjects() protected function initStorageObjects()
{ {
$this->images = new ObjectStorage();
$this->dates = new ObjectStorage(); $this->dates = new ObjectStorage();
$this->categories = new ObjectStorage();
$this->partner = new ObjectStorage();
$this->referencesEvents = new ObjectStorage(); $this->referencesEvents = new ObjectStorage();
} }

2
Classes/Service/DestinationDataImportService.php
View file

@ -671,7 +671,7 @@ class DestinationDataImportService
} }
if ($error !== true) { if ($error !== true) {
if ($this->tmpCurrentEvent->getImages() !== null) { if ($this->tmpCurrentEvent->getImages()->count() > 0) {
$this->logger->info('Relation found'); $this->logger->info('Relation found');
// TODO: How to delete file references? // TODO: How to delete file references?
} else { } else {