Merge pull request #34 from GSokol/nilportugues

Avoid "Uncaught Warning: Invalid argument supplied for foreach()" warning
nilportugues · Apr 4, 2017 · d1a9e4d · d1a9e4d
2 parents ed9cd7a + e936512
commit d1a9e4d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/Serializer/JsonApiSerializer.php b/src/Serializer/JsonApiSerializer.php
@@ -59,6 +59,9 @@ private function mapUrls(JsonApiTransformer $transformer, Router $router)
             $mappingProperty = $mappingClass->getProperty('otherUrls');
             $mappingProperty->setAccessible(true);
             $otherUrls = $mappingProperty->getValue($mapping);
+            if (empty($otherUrls)) {
+                $otherUrls = [];
+            }
             foreach ($otherUrls as &$url) {
                 $url = $this->getUrlPattern($router, $url, $baseUrl);
             }
@@ -67,6 +70,9 @@ private function mapUrls(JsonApiTransformer $transformer, Router $router)
             $mappingProperty = $mappingClass->getProperty('relationshipSelfUrl');
             $mappingProperty->setAccessible(true);
             $relationshipSelfUrl = $mappingProperty->getValue($mapping);
+            if (empty($relationshipSelfUrl)) {
+                $relationshipSelfUrl = [];
+            }
             foreach ($relationshipSelfUrl as &$urlMember) {
                 foreach ($urlMember as &$url) {
                     $url = $this->getUrlPattern($router, $url, $baseUrl);