Merge pull request nilportugues#73 from franbenz/doctrine-tests

New Doctrine serialization test: Comment refers to Comment

Author: nilportugues

src/Helpers/DataIncludedHelper.php

@@ -264,7 +264,8 @@ protected static function removeResourcesNotIncluded(array &$mappings, $parentTy
      */
     protected static function isDeleteableIncludedResource(array &$mappings, $parentType, $includeValue)
     {
-        return count($mappings[$parentType]->getIncludedResources()) > 0
+        return !empty($mappings[$parentType])
+        && count($mappings[$parentType]->getIncludedResources()) > 0
         && false === in_array($includeValue[Serializer::CLASS_IDENTIFIER_KEY], $mappings[$parentType]->getIncludedResources(), true);
     }
 }

src/Helpers/DataLinksHelper.php

@@ -32,7 +32,7 @@ public static function setResponseDataLinks(array &$mappings, array &$value)
         $data = [];
         $type = $value[Serializer::CLASS_IDENTIFIER_KEY];
 
-        if (\is_scalar($type)) {
+        if (\is_scalar($type) && !empty($mappings[$type])) {
             $copy = $value;
             RecursiveFormatterHelper::formatScalarValues($copy);
             if (!empty($copy[Serializer::CLASS_IDENTIFIER_KEY])) {
@@ -105,7 +105,7 @@ public static function setResponseDataRelationship(array &$mappings, array &$arr
                                     $parentType
                                 );
 
-                                if (!empty($selfLink = $mappings[$parentType]->getRelationshipSelfUrl($propertyName))) {
+                                if (!empty($mappings[$parentType]) && !empty($selfLink = $mappings[$parentType]->getRelationshipSelfUrl($propertyName))) {
                                     $href = \str_replace($idProperties, $idValues, $selfLink);
                                     if ($selfLink != $href) {
                                         $propertyNameKey = DataAttributesHelper::transformToValidMemberName($propertyName);
@@ -126,7 +126,7 @@ public static function setResponseDataRelationship(array &$mappings, array &$arr
                                 $parentType = $parent[Serializer::CLASS_IDENTIFIER_KEY];
 
                                 //Removes relationships related to the current resource if filtering include resources has been set.
-                                if (!empty($mappings[$parentType]->isFilteringIncludedResources())) {
+                                if (!empty($mappings[$parentType]) && !empty($mappings[$parentType]->isFilteringIncludedResources())) {
                                     foreach ($newData[JsonApiTransformer::RELATIONSHIPS_KEY][$propertyName] as $position => $includedResource) {
                                         if (count($mappings[$parentType]->getIncludedResources()) > 0 &&
                                             false === in_array($type, $mappings[$parentType]->getIncludedResources(), true)
@@ -222,7 +222,7 @@ public static function setResponseDataRelationshipSelfLinks($propertyName, array
         $data = [];
         $parentType = $parent[Serializer::CLASS_IDENTIFIER_KEY];
 
-        if (\is_scalar($parentType)) {
+        if (\is_scalar($parentType) && !empty($mappings[$parentType])) {
             $copy = $parent;
             RecursiveFormatterHelper::formatScalarValues($copy);
             if (!empty($copy[Serializer::CLASS_IDENTIFIER_KEY])) {

src/Helpers/PropertyHelper.php

@@ -28,10 +28,7 @@ class PropertyHelper
      */
     public static function setResponseDataTypeAndId(array &$mappings, array &$value)
     {
-        $type = $value[Serializer::CLASS_IDENTIFIER_KEY];
-
-        //Recursion base case
-        if (empty($mappings[$type])) {
+        if (empty($type = $value[Serializer::CLASS_IDENTIFIER_KEY]) || (empty($mappings[$type]))) {
             return [];
         }
 

tests/Integrations/Doctrine/AbstractTestCase.php

@@ -8,6 +8,12 @@
 
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\ORM\Tools\SchemaTool;
+use NilPortugues\Tests\Api\JsonApi\Integrations\Doctrine\Entity\Customer;
+use NilPortugues\Tests\Api\JsonApi\Integrations\Doctrine\Mappings\CustomerMapping;
+use NilPortugues\Tests\Api\JsonApi\Integrations\Doctrine\Mappings\PostMapping;
+use NilPortugues\Tests\Api\JsonApi\Integrations\Doctrine\Mappings\CommentMapping;
+use NilPortugues\Tests\Api\JsonApi\Integrations\Doctrine\Entity\Post;
+use NilPortugues\Tests\Api\JsonApi\Integrations\Doctrine\Entity\Comment;
 
 require_once 'bootstrap.php';
 
@@ -17,13 +23,44 @@ abstract class AbstractTestCase extends \PHPUnit_Framework_TestCase
      * @var \Doctrine\ORM\EntityManager
      */
     protected static $entityManager;
+    protected static $classConfig;
 
     public static function setUpBeforeClass()
     {
         self::$entityManager = GetEntityManager();
         // Build the schema for sqlite
         self::generateSchema();
 
+        $newCustomer = new Customer();
+        $newCustomer->setActive(true);
+        $newCustomer->setName('Name 1');
+        self::$entityManager->persist($newCustomer);
+
+        $newPost = new Post();
+        $newPost->setCustomer($newCustomer);
+        $newPost->setDate(new \DateTime('2016-07-12 16:30:12.000000'));
+        $newPost->setDescription('Description test');
+        self::$entityManager->persist($newPost);
+
+        $newComment = new Comment();
+        $newComment->setPost($newPost);
+        $newComment->setComment('Comment 1');
+        self::$entityManager->persist($newComment);
+
+        $newComment2 = new Comment();
+        $newComment2->setPost($newPost);
+        $newComment2->setComment('Comment 2');
+        $newComment2->setParentComment($newComment);
+        self::$entityManager->persist($newComment2);
+
+        self::$entityManager->flush();
+
+        self::$classConfig = [
+                CustomerMapping::class,
+                PostMapping::class,
+                CommentMapping::class,
+        ];
+
         parent::setUpBeforeClass();
     }