FIX GroupClassHydrator

kambalabs · May 22, 2015 · 66143d0 · 66143d0
1 parent 298ab1f
commit 66143d0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/src/KmbPmProxy/Hydrator/GroupClassHydrator.php b/src/KmbPmProxy/Hydrator/GroupClassHydrator.php
@@ -37,7 +37,7 @@ class GroupClassHydrator implements GroupClassHydratorInterface
      */
     public function hydrate($templates, $class)
     {
-        if (!empty($templates)) {
+        if (is_array($templates) && !empty($templates)) {
             $availableParameters = array_filter($templates, function ($template) use ($class) {
                 return !$class->hasParameterWithName($template->name);
             });

diff --git a/src/KmbPmProxy/Validator/PuppetClassValidator.php b/src/KmbPmProxy/Validator/PuppetClassValidator.php
@@ -57,23 +57,27 @@ public function __construct($options = null)
      */
     public function isValid($value)
     {
-        foreach ($value->getParametersDefinitions() as $parameterDefinition) {
-            $name = $parameterDefinition->name;
-            $parameterTemplate = $value->getParameterTemplate($name);
-            if ($parameterTemplate === null) {
-                $this->abstractOptions['messages'][$name] = $this->createMessage(self::MSG_MISSING_PARAMETER, $name);
-            } elseif ($parameterDefinition->required !== $parameterTemplate->required) {
-                $this->abstractOptions['messages'][$name] = $this->createMessage(
-                    $parameterDefinition->required ? self::MSG_REQUIRED : self::MSG_NOT_REQUIRED,
-                    $name
-                );
+        if ($value->hasParametersDefinitions()) {
+            foreach ($value->getParametersDefinitions() as $parameterDefinition) {
+                $name = $parameterDefinition->name;
+                $parameterTemplate = $value->getParameterTemplate($name);
+                if ($parameterTemplate === null) {
+                    $this->abstractOptions['messages'][$name] = $this->createMessage(self::MSG_MISSING_PARAMETER, $name);
+                } elseif ($parameterDefinition->required !== $parameterTemplate->required) {
+                    $this->abstractOptions['messages'][$name] = $this->createMessage(
+                        $parameterDefinition->required ? self::MSG_REQUIRED : self::MSG_NOT_REQUIRED,
+                        $name
+                    );
+                }
             }
         }
 
-        foreach ($value->getParametersTemplates() as $parameterTemplate) {
-            $name = $parameterTemplate->name;
-            if (!$value->hasParameterDefinition($name)) {
-                $this->abstractOptions['messages'][$name] = $this->createMessage(self::MSG_UNDEFINED_PARAMETER, $name);
+        if ($value->hasParametersTemplates()) {
+            foreach ($value->getParametersTemplates() as $parameterTemplate) {
+                $name = $parameterTemplate->name;
+                if (!$value->hasParameterDefinition($name)) {
+                    $this->abstractOptions['messages'][$name] = $this->createMessage(self::MSG_UNDEFINED_PARAMETER, $name);
+                }
             }
         }