- Completed merge

src/Common/EntityField.php

@@ -15,11 +15,11 @@ class EntityField implements WhereRawParameter
 
     public string $entityClass;
 
-    public string $alias;
+    public ? string $alias;
 
     protected EntityResolver $entityResolver;
 
-    public function __construct(string $entityClass, string $name, string $alias, EntityResolver $resolver)
+    public function __construct(string $entityClass, string $name, ? string $alias, EntityResolver $resolver)
     {
         $this->entityClass = $entityClass;
         $this->name = $name;

src/Common/ObjectReflection.php

@@ -6,7 +6,7 @@ use Ulmus\Ulmus;
 
 use Ulmus\Annotation\AnnotationReader;
 
-use Reflector, ReflectionClass, ReflectionProperty, ReflectionMethod;
+use Reflector, ReflectionClass, ReflectionProperty, ReflectionMethod, ReflectionUnionType, ReflectionNamedType, ReflectionParameter;
 
 class ObjectReflection {
 
@@ -139,8 +139,8 @@ class ObjectReflection {
                     'null' => $parameter->allowsNull(),
                     'position' => $parameter->getPosition(),
                     'type' => $parameter->hasType() ? $parameter->getType()->getName() : false,
-                    'array' => $parameter->isArray(),
-                    'callable' => $parameter->isCallable(),
+                    'array' => \Notes\ObjectReflection::isType('array', $parameter),
+                    'callable' => \Notes\ObjectReflection::isType('callable', $parameter),
                     'optional' => $parameter->isOptional(),
                     'byReference' => $parameter->isPassedByReference(),
                 ];
@@ -205,6 +205,7 @@ class ObjectReflection {
                 break;
 
                 case T_STRING:
+                case T_NAME_QUALIFIED:
                     if ( $isNamespace && $latestString ) {
                         $statement[] = $latestString;
                     }