Merge pull request #21 from fykosak/dev-mapper

Dev mapper

Author: cevro

composer.json

@@ -6,7 +6,7 @@
   "require": {
     "php": ">=8.3",
     "nette/di": "v3.*",
-    "nette/database": "v3.*",
+    "nette/database": "^v3.2.7",
     "ext-pdo": "*",
     "ext-gettext": "*"
   },

composer.lock

@@ -8,6 +8,7 @@
 use Fykosak\NetteORM\ModelRelationsParser;
 use Fykosak\NetteORM\Selection\TypedGroupedSelection;
 use Fykosak\NetteORM\Selection\TypedSelection;
+use Fykosak\NetteORM\Types\WGS84Point;
 use Nette\Database\Table\ActiveRow;
 use Nette\MemberAccessException;
 
@@ -54,6 +55,8 @@ public function &__get(string $key): mixed //phpcs:ignore
                     }
                 } elseif ($returnType->isSubclassOf(\BackedEnum::class)) {
                     $value = $returnType->getMethod('tryFrom')->invoke($returnType, $value);
+                } elseif ($returnType->name === WGS84Point::class) {
+                    $value = $returnType->getMethod('fromBytes')->invoke($returnType, $value);
                 }
             }
         }

src/Model/Model.php

@@ -13,7 +13,7 @@ class ModelRelationsParser
 {
     /**
      * @phpstan-param \ReflectionClass<Model> $modelReflection
-     * @phpstan-return array<string,array{type:Type,reflection:\ReflectionClass<Model>|null,property:string}>
+     * @phpstan-return array<string,array{type:Type,reflection:\ReflectionClass<mixed>|null,property:string}>
      * @throws \ReflectionException
      */
     public static function parseModelDoc(\ReflectionClass $modelReflection): ?array

src/ModelRelationsParser.php

@@ -13,7 +13,7 @@
 use Nette\Database\Table\Selection;
 
 /**
- * @template TModel of Model
+ * @phpstan-template-covariant TModel of Model
  */
 class TypedGroupedSelection extends GroupedSelection
 {

src/Selection/TypedGroupedSelection.php

@@ -12,7 +12,7 @@
 use Nette\Database\Table\Selection;
 
 /**
- * @template TModel of Model
+ * @phpstan-template-covariant TModel of Model
  * @phpstan-extends Selection<TModel>
  * @phpstan-ignore-next-line
  */

src/Selection/TypedSelection.php

@@ -8,7 +8,7 @@
 use Fykosak\NetteORM\Model\Model;
 
 /**
- * @template TModel of Model
+ * @phpstan-template-covariant TModel of Model
  */
 trait TypedSelectionsTrait
 {

src/Selection/TypedSelectionsTrait.php

@@ -7,6 +7,7 @@
 use Fykosak\NetteORM\Mapper;
 use Fykosak\NetteORM\Model\Model;
 use Fykosak\NetteORM\Selection\TypedSelection;
+use Fykosak\NetteORM\Types\WGS84Point;
 use Nette\Database\Explorer;
 
 /**
@@ -104,7 +105,9 @@ protected function filterData(array $data): array
             $name = $column['name'];
             if (array_key_exists($name, $data)) {
                 if ($data[$name] instanceof \BackedEnum) {
-                     $result[$name] = $data[$name]->value;
+                    $result[$name] = $data[$name]->value;
+                } elseif ($data[$name] instanceof WGS84Point) {
+                    $result[$name] = $data[$name]->toString();
                 } else {
                     $result[$name] = $data[$name];
                 }