Merge pull request #8 from jakeworrall/move-validation-logic

Move required properties check to value class constructor
Space48 · May 3, 2019 · cc2a3c7 · cc2a3c7
2 parents fd656b1 + d0f6ee2
commit cc2a3c7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/src/BuilderClass/BuildMethodGenerator.php b/src/BuilderClass/BuildMethodGenerator.php
@@ -25,20 +25,6 @@ public function generateMethods(ReflectionMethodCollection $matchedMethods, Prop
                 $methodBody = <<<THEPHP
         return $valueAutoClass::___withTrustedValues(\$this->propertyValues);
 THEPHP;
-                $requiredProperties = $properties
-                    ->filter(function (Property $property) { return $property->isRequired(); })
-                    ->propertyNames();
-                if ($requiredProperties) {
-                    $requiredPropertiesExported = \implode(', ', \array_map(function ($property) { return "'$property'"; }, $requiredProperties));
-                    $methodBody = <<<THEPHP
-        foreach ([$requiredPropertiesExported] as \$property) {
-            if (!isset(\$this->propertyValues[\$property])) {
-                throw new \Exception("Required property \$property not initialized.");
-            }
-        }
-$methodBody
-THEPHP;
-                }
                 return $methodDefinitions->withAdditionalMethodDefinition(MethodDefinition::of($method, $methodBody));
             });
     }

diff --git a/src/ValueClass/ValueClassGenerator.php b/src/ValueClass/ValueClassGenerator.php
@@ -28,6 +28,12 @@ public function generateClass(ReflectionClass $baseClass, PropertyCollection $pr
             return generateConcreteMethod($methodDefinition->reflection(), $methodDefinition->body());
         }));
 
+        $requiredProperties = $properties
+            ->filter(function (Property $property) { return $property->isRequired(); })
+            ->propertyNames();
+
+        $requiredPropertiesExported = \implode(', ', \array_map(function ($property) { return "'$property'"; }, $requiredProperties));
+
         return <<<THEPHP
 namespace {$baseClass->getNamespaceName()};
 
@@ -40,12 +46,26 @@ final class AutoValue_{$baseClass->getShortName()} extends {$baseClass->getShort
     
     protected function __construct(array \$propertyValues = [])
     {
+        self::___checkRequiredPropertiesExist(\$propertyValues);
+        
         foreach (\$propertyValues as \$property => \$value) {
             \$this->\$property = \$value;
         }
     }
     
 $methodDeclarations
+    
+    /**
+     * @internal
+     */
+    public static function ___checkRequiredPropertiesExist(array \$propertyValues): void
+    {
+        foreach ([$requiredPropertiesExported] as \$property) {
+            if (!isset(\$propertyValues[\$property])) {
+                throw new \Exception("Required property \$property not initialized.");
+            }
+        }
+    }
 
     /**
      * @internal