TASK: Adjust PHP8 persistence test-fixtures to php 8 syntax

- ORM annotations > ORM attributes
- Flow annotation > Flow attributes
- @param and @return annotations to parameter and return types

!!! Nested attributes are not supported in php 8.0 so they stay annotations for now !!!

Author: mficzel

Neos.Flow/Tests/Functional/Persistence/FixturesPHP8/AbstractEntity.php

@@ -16,10 +16,9 @@
 
 /**
  * A sample entity for tests
- *
- * @Flow\Entity
- * @ORM\InheritanceType("JOINED")
  */
+#[Flow\Entity]
+#[ORM\InheritanceType('JOINED')]
 abstract class AbstractEntity
 {
 }

Neos.Flow/Tests/Functional/Persistence/FixturesPHP8/AnnotatedIdEntity.php

@@ -16,44 +16,28 @@
 
 /**
  * A sample entity that has a property with a Id annotation
- *
- * @Flow\Entity
  */
+#[Flow\Entity]
 class AnnotatedIdEntity
 {
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\SequenceGenerator(sequenceName="annotatedidentity_seq")
-     * @var string
-     */
-    protected $id;
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\SequenceGenerator(sequenceName: 'annotatedidentity_seq')]
+    protected string $id;
 
-    /**
-     * @var string
-     */
-    protected $title;
+    protected string $title;
 
-    /**
-     * @return string
-     */
-    public function getId()
+    public function getId(): string
     {
         return $this->id;
     }
 
-    /**
-     * @param string $title
-     */
-    public function setTitle($title)
+    public function setTitle(string $title): void
     {
         $this->title = $title;
     }
 
-    /**
-     * @return string
-     */
-    public function getTitle()
+    public function getTitle(): string
     {
         return $this->title;
     }

Neos.Flow/Tests/Functional/Persistence/FixturesPHP8/AnnotatedIdentitiesEntity.php

@@ -15,51 +15,32 @@
 
 /**
  * A sample entity that has properties with an Identity annotation
- *
- * @Flow\Entity
  */
+#[Flow\Entity]
 class AnnotatedIdentitiesEntity
 {
-    /**
-     * @Flow\Identity
-     * @var string
-     */
-    protected $author;
+    #[Flow\Identity]
+    protected string $author;
 
-    /**
-     * @Flow\Identity
-     * @var string
-     */
-    protected $title;
+    #[Flow\Identity]
+    protected string $title;
 
-    /**
-     * @param string $author
-     */
-    public function setAuthor($author)
+    public function setAuthor(string $author): void
     {
         $this->author = $author;
     }
 
-    /**
-     * @return string
-     */
-    public function getAuthor()
+    public function getAuthor(): string
     {
         return $this->author;
     }
 
-    /**
-     * @param string $title
-     */
-    public function setTitle($title)
+    public function setTitle(string $title): void
     {
         $this->title = $title;
     }
 
-    /**
-     * @return string
-     */
-    public function getTitle()
+    public function getTitle(): string
     {
         return $this->title;
     }

Neos.Flow/Tests/Functional/Persistence/FixturesPHP8/CleanupObject.php

@@ -13,20 +13,14 @@
 
 class CleanupObject
 {
-    /**
-     * @var boolean
-     */
-    protected $state = false;
+    protected bool $state = false;
 
-    public function toggleState()
+    public function toggleState(): void
     {
         $this->state = !$this->state;
     }
 
-    /**
-     * @return boolean
-     */
-    public function getState()
+    public function getState(): bool
     {
         return $this->state;
     }

Neos.Flow/Tests/Functional/Persistence/FixturesPHP8/Comment.php

@@ -16,30 +16,19 @@
 
 /**
  * A sample entity for tests
- *
- * @Flow\Entity
  */
+#[Flow\Entity]
 class Comment
 {
-    /**
-     * @var string
-     */
-    protected $content = '';
+    protected string $content = '';
 
-    /**
-     * @return string
-     * @ORM\PrePersist
-     */
-    public function getContent()
+    #[ORM\PrePersist]
+    public function getContent(): string
     {
         return $this->content;
     }
 
-    /**
-     * @param string $content
-     * @return void
-     */
-    public function setContent($content)
+    public function setContent(string $content): void
     {
         $this->content = $content;
     }

Neos.Flow/Tests/Functional/Persistence/FixturesPHP8/CommentRepository.php

@@ -16,8 +16,8 @@
 
 /**
  * A repository for comments
- * @Flow\Scope("singleton")
  */
+#[Flow\Scope('singleton')]
 class CommentRepository extends Repository
 {
     /**

Neos.Flow/Tests/Functional/Persistence/FixturesPHP8/CommonObject.php

@@ -19,25 +19,15 @@
  */
 class CommonObject
 {
-    /**
-     * @var string
-     */
-    protected $foo;
+    protected ?string $foo;
 
-    /**
-     * @param string $foo
-     * @return $this
-     */
-    public function setFoo($foo = null)
+    public function setFoo(?string $foo = null): self
     {
         $this->foo = $foo;
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getFoo()
+    public function getFoo(): ?string
     {
         return $this->foo;
     }

Neos.Flow/Tests/Functional/Persistence/FixturesPHP8/CompositeKeyTestEntity.php

@@ -16,56 +16,35 @@
 
 /**
  * A simple entity for persistence tests
- *
- * @Flow\Entity
- * @ORM\Table(name="persistence_php8_compsitekeytestentity")
  */
+#[Flow\Entity]
+#[ORM\Table(name: 'persistence_php8_compsitekeytestentity')]
 class CompositeKeyTestEntity
 {
-    /**
-     * @var string
-     * @ORM\Id
-     * @ORM\Column(length=20)
-     */
-    protected $name = '';
+    #[ORM\Id]
+    #[ORM\Column(length: 20)]
+    protected string $name = '';
 
-    /**
-     * @var TestEntity
-     * @ORM\Id
-     * @ORM\ManyToOne
-     */
-    protected $relatedEntity;
+    #[ORM\Id]
+    #[ORM\ManyToOne]
+    protected TestEntity $relatedEntity;
 
-    /**
-     * @return string
-     */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
 
-    /**
-     * @param string $name
-     * @return void
-     */
-    public function setName($name)
+    public function setName(string $name): void
     {
         $this->name = $name;
     }
 
-    /**
-     * @param TestEntity $relatedEntity
-     * @return void
-     */
-    public function setRelatedEntity(TestEntity $relatedEntity)
+    public function setRelatedEntity(TestEntity $relatedEntity): void
     {
         $this->relatedEntity = $relatedEntity;
     }
 
-    /**
-     * @return TestEntity
-     */
-    public function getRelatedEntity()
+    public function getRelatedEntity(): TestEntity
     {
         return $this->relatedEntity;
     }

Neos.Flow/Tests/Functional/Persistence/FixturesPHP8/EntityWithIndexedRelation.php

@@ -18,23 +18,23 @@
 
 /**
  * A sample entity that has a property with an indexed relation
- *
- * @Flow\Scope("prototype")
- * @Flow\Entity
  */
+#[Flow\Scope('prototype')]
+#[Flow\Entity]
 class EntityWithIndexedRelation
 {
     /**
      * @var Collection<AnnotatedIdentitiesEntity>
-     * @ORM\ManyToMany(indexBy="author")
      */
-    protected $annotatedIdentitiesEntities;
+    #[ORM\ManyToMany(indexBy: 'author')]
+    protected Collection $annotatedIdentitiesEntities;
 
     /**
      * @var Collection<RelatedIndexEntity>
      * @ORM\OneToMany(indexBy="sorting", mappedBy="entityWithIndexedRelation")
      */
-    protected $relatedIndexEntities;
+    #[ORM\OneToMany(indexBy: 'sorting', mappedBy: 'entityWithIndexedRelation')]
+    protected Collection $relatedIndexEntities;
 
     /**
      * Constructor
@@ -46,42 +46,38 @@ public function __construct()
     }
 
     /**
-     * @param \Doctrine\Common\Collections\Collection $annotatedIdentitiesEntities
+     * @param Collection<AnnotatedIdentitiesEntity> $annotatedIdentitiesEntities
      */
-    public function setAnnotatedIdentitiesEntities($annotatedIdentitiesEntities)
+    public function setAnnotatedIdentitiesEntities(Collection $annotatedIdentitiesEntities): void
     {
         $this->annotatedIdentitiesEntities = $annotatedIdentitiesEntities;
     }
 
     /**
-     * @return \Doctrine\Common\Collections\Collection
+     * @return Collection<AnnotatedIdentitiesEntity>
      */
-    public function getAnnotatedIdentitiesEntities()
+    public function getAnnotatedIdentitiesEntities(): Collection
     {
         return $this->annotatedIdentitiesEntities;
     }
 
     /**
-     * @param \Doctrine\Common\Collections\Collection $relatedIndexEntities
+     * @param Collection<RelatedIndexEntity> $relatedIndexEntities
      */
-    public function setRelatedIndexEntities($relatedIndexEntities)
+    public function setRelatedIndexEntities(Collection $relatedIndexEntities): void
     {
         $this->relatedIndexEntities = $relatedIndexEntities;
     }
 
     /**
-     * @return \Doctrine\Common\Collections\Collection
+     * @return Collection<RelatedIndexEntity>
      */
-    public function getRelatedIndexEntities()
+    public function getRelatedIndexEntities(): Collection
     {
         return $this->relatedIndexEntities;
     }
 
-    /**
-     * @param string $sorting
-     * @param RelatedIndexEntity $relatedIndexEntity
-     */
-    public function setRelatedIndexEntity($sorting, RelatedIndexEntity $relatedIndexEntity)
+    public function setRelatedIndexEntity(string $sorting, RelatedIndexEntity $relatedIndexEntity): void
     {
         $relatedIndexEntity->setSorting($sorting);
         $relatedIndexEntity->setEntityWithIndexedRelation($this);