- A lot of fixes made again in this patch

src/Annotation/Property/FilterJoin.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Ulmus\Annotation\Property;
+
+class FilterJoin implements \Ulmus\Annotation\Annotation {
+
+    public string $method;
+
+    public function __construct(string $method = null)
+    {
+        if ( $method !== null ) {
+            $this->method = $method;
+        }
+    }
+}

src/Annotation/Property/OrWhere.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Ulmus\Annotation\Property;
+
+use Ulmus\Query;
+
+class OrWhere extends Where {
+
+    public function __construct(/* ? Stringable */ $field = null, $value = null, ? string $operator = null, ? string $condition = null)
+    {
+        parent::__construct($field, $value, $operator, Query\Where::CONDITION_OR);
+    }
+
+}

src/Annotation/Property/Relation.php

@@ -8,6 +8,8 @@ class Relation implements \Ulmus\Annotation\Annotation {
 
     public /*stringable*/ $key;
 
+    public /* callable */ $generateKey;
+
     public /*stringable*/ $foreignKey;
 
     public array $foreignKeys;