diff --git a/Classes/Domain/Model/Author.php b/Classes/Domain/Model/Author.php index 42cef9d..993ad92 100644 --- a/Classes/Domain/Model/Author.php +++ b/Classes/Domain/Model/Author.php @@ -17,16 +17,15 @@ use TYPO3\CMS\Extbase\Annotation as Extbase; use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; -use TYPO3\CMS\Extbase\Persistence\Generic\LazyObjectStorage; use TYPO3\CMS\Extbase\Persistence\ObjectStorage; class Author extends AbstractEntity { /** - * @var ObjectStorage|LazyObjectStorage + * @var ObjectStorage */ #[Extbase\ORM\Lazy] - protected ObjectStorage|LazyObjectStorage $books; + protected ObjectStorage $books; protected string $lastname = ''; diff --git a/Classes/Domain/Model/Book.php b/Classes/Domain/Model/Book.php index 1eb19e8..91ebc3d 100644 --- a/Classes/Domain/Model/Book.php +++ b/Classes/Domain/Model/Book.php @@ -18,28 +18,27 @@ use TYPO3\CMS\Extbase\Annotation as Extbase; use TYPO3\CMS\Extbase\Domain\Model\FileReference; use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; -use TYPO3\CMS\Extbase\Persistence\Generic\LazyObjectStorage; use TYPO3\CMS\Extbase\Persistence\ObjectStorage; class Book extends AbstractEntity { /** - * @var ObjectStorage|LazyObjectStorage + * @var ObjectStorage */ #[Extbase\ORM\Lazy] - protected ObjectStorage|LazyObjectStorage $author; + protected ObjectStorage $author; /** - * @var ObjectStorage|LazyObjectStorage + * @var ObjectStorage */ #[Extbase\ORM\Lazy] - protected ObjectStorage|LazyObjectStorage $category; + protected ObjectStorage $category; /** - * @var ObjectStorage|LazyObjectStorage + * @var ObjectStorage */ #[Extbase\ORM\Lazy] - protected ObjectStorage|LazyObjectStorage $extras; + protected ObjectStorage $extras; /** * @var ObjectStorage diff --git a/Classes/Domain/Model/Category.php b/Classes/Domain/Model/Category.php index 22dd682..bfb11e3 100644 --- a/Classes/Domain/Model/Category.php +++ b/Classes/Domain/Model/Category.php @@ -18,25 +18,24 @@ use TYPO3\CMS\Extbase\Annotation as Extbase; use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; use TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy; -use TYPO3\CMS\Extbase\Persistence\Generic\LazyObjectStorage; use TYPO3\CMS\Extbase\Persistence\ObjectStorage; class Category extends AbstractEntity { /** - * @var ObjectStorage|LazyObjectStorage + * @var ObjectStorage */ #[Extbase\ORM\Lazy] - protected ObjectStorage|LazyObjectStorage $children; + protected ObjectStorage $children; /** - * @var ObjectStorage|LazyObjectStorage + * @var ObjectStorage */ #[Extbase\ORM\Lazy] - protected ObjectStorage|LazyObjectStorage $books; + protected ObjectStorage $books; #[Extbase\ORM\Lazy] - protected null|LazyLoadingProxy|Category $parent = null; + protected Category|LazyLoadingProxy|null $parent = null; protected string $title = ''; diff --git a/Classes/Domain/Model/Extras.php b/Classes/Domain/Model/Extras.php index 811222e..d8f901a 100644 --- a/Classes/Domain/Model/Extras.php +++ b/Classes/Domain/Model/Extras.php @@ -22,7 +22,7 @@ class Extras extends AbstractEntity { #[Extbase\ORM\Lazy] - protected null|LazyLoadingProxy|ExtrasLabels $label = null; + protected ExtrasLabels|LazyLoadingProxy|null $label = null; protected int $type = 0; diff --git a/Classes/Domain/Model/Series.php b/Classes/Domain/Model/Series.php index 73dd229..5ece580 100644 --- a/Classes/Domain/Model/Series.php +++ b/Classes/Domain/Model/Series.php @@ -17,16 +17,15 @@ use TYPO3\CMS\Extbase\Annotation as Extbase; use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; -use TYPO3\CMS\Extbase\Persistence\Generic\LazyObjectStorage; use TYPO3\CMS\Extbase\Persistence\ObjectStorage; class Series extends AbstractEntity { /** - * @var ObjectStorage|LazyObjectStorage + * @var ObjectStorage */ #[Extbase\ORM\Lazy] - protected ObjectStorage|LazyObjectStorage $books; + protected ObjectStorage $books; protected string $title = ''; diff --git a/Documentation/guides.xml b/Documentation/guides.xml index 3b6ed80..17bc27b 100644 --- a/Documentation/guides.xml +++ b/Documentation/guides.xml @@ -16,8 +16,8 @@ interlink-shortcode="evoweb/sf-books" /> diff --git a/ext_emconf.php b/ext_emconf.php index 3d9cb6b..e4e138d 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -10,7 +10,7 @@ 'author_email' => 'typo3@evoweb.de', 'author_company' => 'evoWeb', 'state' => 'stable', - 'version' => '8.1.0', + 'version' => '8.1.1', 'constraints' => [ 'depends' => [ 'typo3' => '12.0.0-13.4.99',