Merge pull request #44 from netlogix/fix/property-type-from-reflection

fix: Fetch property type from reflection if no var annotation is present

Author: Sascha Nowak

Classes/Configuration/ConfigurationProvider.php

@@ -114,7 +114,12 @@ protected function applyAnnotationBasedConfiguration(string $type, array $settin
         foreach ($reflection->getPropertyNamesByAnnotation($className, JsonApi\ExposeProperty::class) as $propertyName) {
             $annotation = $reflection->getPropertyAnnotation($className, $propertyName, JsonApi\ExposeProperty::class);
             assert($annotation instanceof JsonApi\ExposeProperty);
-            $targetType = $reflection->getPropertyTagValues($className, $propertyName, 'var')[0];
+            $propertyTagValues = $reflection->getPropertyTagValues($className, $propertyName, 'var');
+            if (array_key_exists(0, $propertyTagValues)) {
+                $targetType = $propertyTagValues[0];
+            } else {
+                $targetType = $reflection->getPropertyType($className, $propertyName);
+            }
             $settings = $this->applyAnnotationBasedConfigurationForProperty(
                 $propertyName,
                 $annotation->exposeAsAttribute,

Classes/Resource/Information/ExposableTypeMap.php

@@ -154,9 +154,13 @@ protected static function collectKnownTypes(ObjectManagerInterface $objectManage
                 array_walk(
                     $propertyNames,
                     function (string $propertyName) use ($className, $reflectionService, &$classNameToPropertyNamesMap) {
-                        $classNameToPropertyNamesMap[$className][$propertyName] = $reflectionService
-                            ->getPropertyTagValues($className, $propertyName, 'var')[0]
-                            ?: '';
+                        $propertyTagValues = $reflectionService->getPropertyTagValues($className, $propertyName, 'var');
+                        if (array_key_exists(0, $propertyTagValues)) {
+                            $typeName = $propertyTagValues[0] ?: '';
+                        } else {
+                            $typeName = $reflectionService->getPropertyType($className, $propertyName);
+                        }
+                        $classNameToPropertyNamesMap[$className][$propertyName] = $typeName;
                     }
                 );