- Added a new @PrimaryKey annotation to replace the too-specific property-wise @Id

src/Annotation/Property/Field/ForeignKey.php

@@ -6,11 +6,11 @@ namespace Ulmus\Annotation\Property\Field;
  * Since we need consistancy between the declaration of our ID and FK fields, it
  * was decided to extend the Id class instead of Field for this case.
  */
-class ForeignKey extends Id {
+class ForeignKey extends PrimaryKey {
 
-    public function __construct()
+    public function __construct(? string $type = null, ? int $length = null)
     {
-        parent::__construct();
+        parent::__construct($type, $length);
 
         unset($this->nullable);
         $this->attributes['primary_key'] = false;

src/Annotation/Property/Field/Id.php

@@ -2,15 +2,13 @@
 
 namespace Ulmus\Annotation\Property\Field;
 
-class Id extends \Ulmus\Annotation\Property\Field {
+class Id extends \Ulmus\Annotation\Property\Field\PrimaryKey {
 
     public function __construct()
     {
-        $this->nullable = false;
         $this->attributes['unsigned'] = true;
-        $this->attributes['primary_key'] = true;
         $this->attributes['auto_increment'] = true;
-        
+
         parent::__construct('bigint');
     }
 

src/Annotation/Property/Field/PrimaryKey.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Ulmus\Annotation\Property\Field;
+
+class PrimaryKey extends \Ulmus\Annotation\Property\Field {
+
+    public function __construct(? string $type = null, ? int $length = null)
+    {
+        $this->nullable = false;
+        $this->attributes['primary_key'] = true;
+
+        parent::__construct($type, $length);
+    }
+
+}

src/EntityTrait.php

@@ -5,7 +5,7 @@ namespace Ulmus;
 use Ulmus\{ Repository, Query, Common\EntityResolver, Common\EntityField };
 use Ulmus\Annotation\Classes\{ Method, Table, Collation, };
 use Ulmus\Annotation\Property\{ Field, Filter, FilterJoin, Relation, OrderBy, Where, OrWhere, Join, Virtual, On, WithJoin, };
-use Ulmus\Annotation\Property\Field\{ Id, ForeignKey, CreatedAt, UpdatedAt, Datetime as DateTime, Date, Time, Bigint, Tinyint, Text, Mediumtext, Longtext, Blob, Mediumblob, Longblob, };
+use Ulmus\Annotation\Property\Field\{ PrimaryKey, Id, ForeignKey, CreatedAt, UpdatedAt, Datetime as DateTime, Date, Time, Bigint, Tinyint, Text, Mediumtext, Longtext, Blob, Mediumblob, Longblob, };
 use Ulmus\Annotation\Property\Relation\{ Ignore as RelationIgnore };
 
 trait EntityTrait {

src/Query/Where.php

@@ -8,6 +8,7 @@ class Where extends Fragment {
     const OPERATOR_LIKE = "LIKE";
     const OPERATOR_EQUAL = "=";
     const OPERATOR_NOT_EQUAL = "<>";
+    const OPERATOR_REGEXP = "REGEXP";
     const CONDITION_AND = "AND";
     const CONDITION_OR  = "OR";
     const CONDITION_NOT = "NOT";
@@ -113,7 +114,7 @@ class Where extends Fragment {
                 }
 
                 # whitelisting operators
-                return in_array(strtoupper($this->operator), [ '=', '!=', '>', '>=', '<', '<=', '<>', 'LIKE', 'IS', 'IS NOT' ]) ? $this->operator : "=";
+                return in_array(strtoupper($this->operator), [ '=', '!=', '>', '>=', '<', '<=', '<>', 'LIKE', 'IS', 'IS NOT', 'REGEXP' ]) ? $this->operator : "=";
             }
 
             protected function value()

src/Repository.php

@@ -46,7 +46,7 @@ class Repository
         return $this->where($field, $value)->loadOne();
     }
 
-    public function loadFromPk($value, /* ? stringable */ $primaryKey = null) : ? object
+    public function loadFromPk($value, null|string|\Stringable $primaryKey = null) : ? object
     {
         return $primaryKey ? $this->loadOneFromField($primaryKey, $value) : $this->wherePrimaryKey($value)->loadOne();
     }
@@ -130,7 +130,7 @@ class Repository
         }
     }
 
-    public function save(/*object|array*/ $entity, ? array $fieldsAndValue = null, bool $replace = false) : bool
+    public function save(object|array $entity, ? array $fieldsAndValue = null, bool $replace = false) : bool
     {
         if ( is_array($entity) ) {
             $entity = ( new $this->entityClass() )->fromArray($entity);
@@ -198,7 +198,7 @@ class Repository
         return $changed;
     }
 
-    public function insertAll(/* EntityCollection | array */ $collection, int $size = 1000) : int
+    public function insertAll(EntityCollection|array $collection, int $size = 1000) : int
     {
         if ( empty($collection) ) {
             return 0;
@@ -254,12 +254,12 @@ class Repository
         }
     }
 
-    public function replace(/*object|array*/ $entity, ? array $fieldsAndValue = null) : bool
+    public function replace(object|array $entity, ? array $fieldsAndValue = null) : bool
     {
         return $this->save($entity, $fieldsAndValue, true);
     }
 
-    public function replaceAll(/*EntityCollection|array*/ $collection) : int
+    public function replaceAll(EntityCollection|array $collection) : int
     {
         $changed = 0;
 
@@ -339,7 +339,7 @@ class Repository
         }
     }
 
-    public function removeQueryFragment(/*? Query\Fragment|string*/ $fragment) : self
+    public function removeQueryFragment(null|Query\Fragment|string|array $fragment) : self
     {
         foreach((array) $fragment as $item) {
             $this->queryBuilder->removeFragment($item);
@@ -381,14 +381,14 @@ class Repository
         );
     }
 
-    public function select(/*array|Stringable*/ $fields, bool $distinct = false) : self
+    public function select(array|string|\Stringable $fields, bool $distinct = false) : self
     {
         $this->queryBuilder->select($fields, $distinct);
 
         return $this;
     }
 
-    public function distinct(/*array|Stringable*/ $fields) : self
+    public function distinct(array|string|\Stringable $fields) : self
     {
         $this->queryBuilder->select($fields);
         $this->queryBuilder->getFragment(Query\Select::class)->distinct = true;
@@ -642,7 +642,7 @@ class Repository
         return $this;
     }
 
-    public function withSubquery(/*string|array*/ $fields) : self
+    public function withSubquery(string|array $fields) : self
     {
         # We skip subqueries when counting results since it should not affect the row count.
         if ( $this instanceof Repository\ServerRequestCountRepository ) {
@@ -704,7 +704,7 @@ class Repository
         return $this;
     }
 
-    public function loadCollectionRelation(EntityCollection $collection, /*array|string*/ $fields) : void
+    public function loadCollectionRelation(EntityCollection $collection, array|string $fields) : void
     {
         foreach ((array)$fields as $name) {
             if (null !== ($relation = $this->entityResolver->searchFieldAnnotation($name, new Annotation\Property\Relation()))) {