Prepping everything for a PHP 8 release

src/EntityTrait.php

@@ -2,14 +2,10 @@
 
 namespace Ulmus;
 
-use Ulmus\Repository,
-    Ulmus\Query,
-    Ulmus\Common\EntityResolver,
-    Ulmus\Common\EntityField;
-
+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\{ 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 {
@@ -110,7 +106,7 @@ trait EntityTrait {
     public function resetVirtualProperties() : self
     {
         foreach($this->resolveEntity()->properties as $prop => $property) {
-            if ( ! $property['builtin'] ) {
+            if ( empty($property['builtin']) ) {
                 foreach($property['tags'] as $tag) {
                     if ( in_array(strtolower($tag['tag']), [ 'relation', 'join', 'virtual' ] ) ) {
                         unset($this->$prop);
@@ -273,7 +269,7 @@ trait EntityTrait {
     /**
      * @Ignore
      */
-    public function jsonSerialize() : mixed
+    public function jsonSerialize()
     {
         return $this->entityGetDataset();
     }