Merge branch 'main' into neos-9

* main:
  TASK: Use non nullable returns when default value is present

Author: mficzel

Classes/Domain/NodePropertySpecification.php

@@ -10,8 +10,9 @@
 readonly class NodePropertySpecification
 {
     public function __construct(
-        readonly string $propertyName,
-        readonly string $propertyType
+        public string $propertyName,
+        public string $propertyType,
+        public mixed $defaultValue,
     ) {
     }
 }

Classes/Domain/NodePropertySpecificationCollection.php

@@ -15,19 +15,19 @@
     /**
      * @var NodePropertySpecification[]
      */
-    public array $properties;
+    public array $items;
 
     public function __construct(
         NodePropertySpecification ...$properties
     ) {
-        $this->properties = $properties;
+        $this->items = $properties;
     }
 
     /**
      * @return \Generator<int, NodePropertySpecification>
      */
     public function getIterator(): \Generator
     {
-        yield from $this->properties;
+        yield from $this->items;
     }
 }

Classes/Factory/NodeTypeObjectFileFactory.php

@@ -5,6 +5,7 @@
 namespace PackageFactory\NodeTypeObjects\Factory;
 
 use Neos\Utility\Unicode\Functions as UnicodeFunctions;
+use PackageFactory\NodeTypeObjects\Domain\NodePropertySpecification;
 use PackageFactory\NodeTypeObjects\Domain\NodeTypeObjectFile;
 use PackageFactory\NodeTypeObjects\Domain\NodeTypeObjectSpecification;
 
@@ -14,10 +15,13 @@ public function createNodeTypeObjectPhpCodeFromNode(
         NodeTypeObjectSpecification $specification,
     ): NodeTypeObjectFile {
         $propertyAccessors = '';
+        $internalPropertyAccessors = '';
         foreach ($specification->properties as $property) {
             $propertyType = $property->propertyType;
+            $propertyDefaultValue = $property->defaultValue;
             $propertyName = $property->propertyName;
-            if (str_starts_with($property->propertyName, '_')) {
+            $propertyIsInternal = str_starts_with($property->propertyName, '_');
+            if ($propertyIsInternal) {
                 $methodName = 'getInternal' . UnicodeFunctions::ucfirst(substr($propertyName, 1));
             } else {
                 $methodName = 'get' . UnicodeFunctions::ucfirst($propertyName);
@@ -47,28 +51,59 @@ public function createNodeTypeObjectPhpCodeFromNode(
                 $annotationType =  '\\' . $annotationType;
             }
 
-            if ($annotationType) {
-                $propertyAccessors .= <<<EOL
+            $returnType = ($propertyDefaultValue === null) ? '?' . $phpType : $phpType;
+
+            $defaultReturn = match(true) {
+                ($propertyType === 'DateTime' && is_string($propertyDefaultValue)) => 'new \DateTime(\'' . $propertyDefaultValue . '\')',
+                default => var_export($propertyDefaultValue, true),
+            };
 
+            $typeCheck = match($phpType) {
+                'null' => 'is_null($value)',
+                'string' => 'is_string($value)',
+                'int' => 'is_int($value)',
+                'float' => 'is_float($value)',
+                'bool' => 'is_bool($value)',
+                'array' => 'is_array($value)',
+                default => '$value instanceof ' . $phpType,
+            };
+
+            if ($annotationType) {
+                $propertyAccessor = <<<EOL
 
                     /**
                      * @return ?$annotationType;
                      */
-                    public function $methodName(): ?$phpType
+                    public function $methodName(): $returnType
                     {
-                        return \$this->node->getProperty('$propertyName');
+                        \$value = \$this->node->getProperty('$propertyName');
+                        if ($typeCheck) {
+                            return \$value;
+                        }
+                        return $defaultReturn;
                     }
+
                 EOL;
             } else {
-                $propertyAccessors .= <<<EOL
-
+                $propertyAccessor = <<<EOL
 
-                    public function $methodName(): ?$phpType
+                    public function $methodName(): $returnType
                     {
-                        return \$this->node->getProperty('$propertyName');
+                        \$value = \$this->node->getProperty('$propertyName');
+                        if ($typeCheck) {
+                            return \$value;
+                        }
+                        return $defaultReturn;
                     }
+
                 EOL;
             }
+
+            if ($propertyIsInternal) {
+                $internalPropertyAccessors .= $propertyAccessor;
+            } else {
+                $propertyAccessors .= $propertyAccessor;
+            }
         }
 
         $nodeTypeName = $specification->nodeTypeName;
@@ -106,7 +141,13 @@ public static function fromNode(Node \$node): self
                     throw new \Exception("unsupported nodetype " . \$node->nodeTypeName->value);
                 }
                 return new self(\$node);
-            }$propertyAccessors
+            }
+
+            // property accessors
+            $propertyAccessors
+
+            // internal property accessors
+            $internalPropertyAccessors
         }
 
         EOL;

Classes/Factory/NodeTypeSpecificationFactory.php

@@ -41,7 +41,8 @@ public function createFromPackageKeyAndNodeType(
         foreach ($nodeType->getProperties() as $propertyName => $propertyConfiguration) {
             $propertySpecifications[] = new NodePropertySpecification(
                 $propertyName,
-                $nodeType->getPropertyType($propertyName)
+                $nodeType->getPropertyType($propertyName),
+                $propertyConfiguration['defaultValue'] ?? null
             );
         }