Add ability include to resource array attributes with scalar values.

Also include meta to response when serialized target is array.

Author: suslin

Diff for: src/Helpers/DataAttributesHelper.php

@@ -119,7 +119,7 @@ public static function setResponseDataAttributes(array &$mappings, array &$array
             }
 
             if (\is_array($value) && !array_key_exists(Serializer::CLASS_IDENTIFIER_KEY, $value)) {
-                if (self::containsClassIdentifierKey($value)) {
+                if (self::containsClassIdentifierKey($value) || self::arrayWithScalarValue($value)) {
                     $attributes[$keyName] = $value;
                 }
             }
@@ -186,4 +186,28 @@ protected static function containsClassIdentifierKey(array $input, $foundIdentif
 
         return !$foundIdentifierKey;
     }
+
+    /**
+     * @param array $input
+     *
+     * @return bool
+     */
+    protected static function arrayWithScalarValue(array $input)
+    {
+        if (!is_array($input)) {
+            return false;
+        }
+
+        if (!empty($input[Serializer::SCALAR_VALUE])) {
+            $input = $input[Serializer::SCALAR_VALUE];
+
+            if (\is_array($input)) {
+                foreach ($input as $value) {
+                    return self::isScalarValue($value);
+                }
+            }
+        }
+
+        return false;
+    }
 }

Diff for: src/Helpers/DataIncludedHelper.php

@@ -44,7 +44,7 @@ public static function setResponseDataIncluded(array &$mappings, array $array, a
                             //Remove those resources that do not to appear in the getIncludedResources array.
                             foreach ($inArrayValue as $position => $includableValue) {
                                 if (!empty($mappings[$parentType]) && $mappings[$parentType]->isFilteringIncludedResources()
-                                    && false === in_array(
+                                    && isset($includableValue[Serializer::CLASS_IDENTIFIER_KEY]) && false === in_array(
                                         $includableValue[Serializer::CLASS_IDENTIFIER_KEY],
                                         $mappings[$parentType]->getIncludedResources(),
                                         true

Diff for: src/JsonApiTransformer.php

@@ -213,6 +213,7 @@ protected function serializedArray(array $value)
         $data = array_filter($data);
 
         $this->setResponseLinks($value, $data);
+        $this->setResponseMeta($data);
         $this->setResponseVersion($data);
 
         return (empty($data['data'])) ? array_merge(['data' => []], $data) : $data;