Fixing attribute mapper

ipublikuj · Feb 6, 2024 · b9a30b1 · b9a30b1
1 parent 3d81ead
commit b9a30b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/Mapping/Attribute/Crud.php b/src/Mapping/Attribute/Crud.php
@@ -25,9 +25,6 @@
  * @subpackage     Annotation
  *
  * @author         Adam Kadlec <adam.kadlec@ipublikuj.eu>
- *
- * @Annotation
- * @Target({"PROPERTY"})
  */
 #[Attribute(Attribute::TARGET_PROPERTY)]
 final class Crud implements ORMMapping\MappingAttribute

diff --git a/src/Mapping/EntityMapper.php b/src/Mapping/EntityMapper.php
@@ -120,8 +120,9 @@ public function fillEntity(Utils\ArrayHash $values, Entities\IEntity $entity, bo
 			$crud = $this->annotationReader->getPropertyAnnotation($propertyReflection, Mapping\Annotation\Crud::class);
 
 			if ($crud === null) {
-				/** @var Mapping\Attribute\Crud|null $crud */
-				$crud = $propertyReflection->getAttributes(Mapping\Attribute\Crud::class);
+				$attributes = $propertyReflection->getAttributes(Mapping\Attribute\Crud::class);
+
+				$crud = $attributes !== [] ? $attributes[0]->newInstance() : null;
 			}
 
 			if ($crud !== null) {
@@ -442,7 +443,10 @@ private function parseAnnotation(Reflector $ref, string $name): ?string
 	{
 		$factory = phpDocumentor\Reflection\DocBlockFactory::createInstance();
 
-		if (!method_exists($ref, 'getDocComment')) {
+		if (
+			!method_exists($ref, 'getDocComment')
+			|| !is_string($ref->getDocComment())
+		) {
 			return null;
 		}