Fix issue on PATCH, respect getPAtchValidationModel

phramework · Oct 28, 2016 · 634f42d · 634f42d
1 parent 35eff3d
commit 634f42d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/src/Controller/PATCH.php b/src/Controller/PATCH.php
@@ -107,8 +107,11 @@ protected static function handlePATCH(
             ));
         }
 
+        $validationModel = $modelClass::getValidationModel();
+
         if (($patchValidationModel = $modelClass::getPatchValidationModel()) !== null) {
-            $validator = $patchValidationModel->attributes;
+            $validationModel = $patchValidationModel;
+            $validator       = $patchValidationModel->attributes;
         } else {
 
             //Construct a validator
@@ -169,7 +172,9 @@ protected static function handlePATCH(
         $parsedRelationshipAttributes = self::getParsedRelationshipAttributes(
             $modelClass,
             $attributes,
-            $requestRelationships
+            $requestRelationships,
+            [],
+            $validationModel
         );
 
         //Check if callbacks for TO_MANY relationships are set

diff --git a/src/Controller/POST.php b/src/Controller/POST.php
@@ -19,6 +19,7 @@
 use Phramework\Exceptions\ForbiddenException;
 use Phramework\Exceptions\IncorrectParametersException;
 use Phramework\JSONAPI\Controller\POST\QueueItem;
+use Phramework\JSONAPI\ValidationModel;
 use Phramework\Models\Request;
 use Phramework\Exceptions\RequestException;
 use Phramework\Exceptions\ServerException;
@@ -247,11 +248,11 @@ private static function handlePOSTResource(
         $validationCallbacks,
         $requestRelationships
     ) {
-        $validator = $modelClass::getValidationModel();
+        $validationModel = $modelClass::getValidationModel();
 
         $attributesValidator = (
-            isset($validator->attributes) && $validator->attributes
-            ? $validator->attributes
+            isset($validationModel->attributes) && $validationModel->attributes
+            ? $validationModel->attributes
             : new ObjectValidator()
         );
 
@@ -267,7 +268,8 @@ private static function handlePOSTResource(
             $modelClass,
             $attributes,
             $requestRelationships,
-            $relationshipParameters
+            $relationshipParameters,
+            $validationModel
         );
 
         //Call Validation callbacks
@@ -329,10 +331,9 @@ protected static function getParsedRelationshipAttributes(
         $modelClass,
         &$attributes,
         $requestRelationships,
-        $relationshipParameters = []
+        $relationshipParameters = [],
+        ValidationModel $validationModel
     ) {
-        $validator = $modelClass::getValidationModel();
-
         /**
          * Format, object with
          * - relationshipKey1 -> id1
@@ -456,8 +457,8 @@ protected static function getParsedRelationshipAttributes(
 
         //Parse attributes using relationship's validation model
         $parsedRelationshipAttributes = (
-            isset($validator->relationships)
-                ? $validator->relationships->parse(
+            isset($validationModel->relationships)
+            ? $validationModel->relationships->parse(
                 $relationshipAttributes
             )
             : new \stdClass()