Merge pull request #269 from totti95/fix/php81Compatibility

Fix php 8.1 compatibility ReadOnly and add toArray method annotation

src/InnerResultIterator.php

@@ -135,7 +135,7 @@ public function count()
         if ($this->fetchStarted && $this->tdbmService->getConnection()->getDatabasePlatform() instanceof MySqlPlatform) {
             // Optimisation: we don't need a separate "count" SQL request in MySQL.
             assert($this->statement instanceof Statement);
-            $this->count = $this->statement->rowCount();
+            $this->count = (int)$this->statement->rowCount();
             return $this->count;
         }
         return $this->getRowCountViaSqlQuery();

src/Utils/AbstractBeanPropertyDescriptor.php

@@ -4,7 +4,7 @@
 namespace TheCodingMachine\TDBM\Utils;
 
 use Doctrine\DBAL\Schema\Table;
-use TheCodingMachine\TDBM\Utils\Annotation\ReadOnly;
+use TheCodingMachine\TDBM\Utils\Annotation\ReadOnlyColumn;
 use Laminas\Code\Generator\DocBlock\Tag\ParamTag;
 use Laminas\Code\Generator\MethodGenerator;
 

src/Utils/Annotation/AnnotationParser.php

@@ -43,7 +43,7 @@ public static function buildWithDefaultAnnotations(array $additionalAnnotations)
             'ProtectedGetter' => ProtectedGetter::class,
             'ProtectedSetter' => ProtectedSetter::class,
             'ProtectedOneToMany' => ProtectedOneToMany::class,
-            'ReadOnly' => ReadOnly::class,
+            'ReadOnly' => ReadOnlyColumn::class,
             'JsonKey' => JsonKey::class,
             'JsonIgnore' => JsonIgnore::class,
             'JsonInclude' => JsonInclude::class,

src/Utils/Annotation/ReadOnly.php → src/Utils/Annotation/ReadOnlyColumn.php

@@ -10,6 +10,6 @@
  *
  * @Annotation
  */
-final class ReadOnly
+final class ReadOnlyColumn
 {
 }

src/Utils/BeanDescriptor.php

@@ -1198,7 +1198,7 @@ public function generateResultIteratorPhpCode(): ?FileGenerator
         $class->setDocBlock((new DocBlockGenerator(
             "The $baseClassName class will iterate over results of $beanClassWithoutNameSpace class.",
             null,
-            [new Tag\MethodTag('getIterator', ['\\' . $beanClassName . '[]'])]
+            [new Tag\MethodTag('getIterator', ['\\' . $beanClassName . '[]']), new Tag\MethodTag('toArray', ['\\' . $beanClassName . '[]'])]
         ))->setWordWrap(false));
 
         $file = $this->codeGeneratorListener->onBaseResultIteratorGenerated($file, $this, $this->configuration);

src/Utils/ObjectBeanPropertyDescriptor.php

@@ -345,7 +345,7 @@ private function isSetterProtected(): bool
 
     public function isReadOnly(): bool
     {
-        return $this->findAnnotation(Annotation\ReadOnly::class) !== null;
+        return $this->findAnnotation(Annotation\ReadOnlyColumn::class) !== null;
     }
 
     /**

src/Utils/ScalarBeanPropertyDescriptor.php

@@ -421,7 +421,7 @@ private function isSetterProtected(): bool
 
     public function isReadOnly(): bool
     {
-        return $this->findAnnotation(Annotation\ReadOnly::class) !== null;
+        return $this->findAnnotation(Annotation\ReadOnlyColumn::class) !== null;
     }
 
     private function findAnnotation(string $type): ?object