Merge pull request #23 from nokimaro/master

Multiple albums and artists for MusicRecording
Torann · Aug 18, 2017 · dbf7249 · dbf7249
2 parents cb3ae42 + 52d6004
commit dbf7249
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 10 deletions.
diff --git a/src/ContextTypes/MusicAbstractContext.php b/src/ContextTypes/MusicAbstractContext.php
@@ -38,17 +38,26 @@ protected function setGenreAttribute($items)
     /**
      * Set artist attribute
      *
-     * @param array|string $item
+     * @param array|string $items
      * @return array
      */
-    protected function setByArtistAttribute($item)
+    protected function setByArtistAttribute($items)
     {
-        if ( ! is_array($item))
+        if ( ! is_array($items))
         {
-            return $item;
+            return $items;
         }
 
-        return $this->getNestedContext(MusicGroup::class, $item);
+        //Check if not multidimensional array (for backward compatibility)
+        if((count($items) == count($items, COUNT_RECURSIVE)))
+        {
+            return $this->getNestedContext(MusicGroup::class, $items);
+        }
+
+        //multiple artists
+        return array_map(function ($item) {
+            return $this->getNestedContext(MusicGroup::class, $item);
+        }, $items);
     }
 
     /**

diff --git a/src/ContextTypes/MusicRecording.php b/src/ContextTypes/MusicRecording.php
@@ -26,17 +26,26 @@ class MusicRecording extends MusicAbstractContext
     /**
      * Set in album attribute
      *
-     * @param array|string $item
+     * @param array|string $items
      * @return array
      */
-    protected function setInAlbumAttribute($item)
+    protected function setInAlbumAttribute($items)
     {
-        if ( ! is_array($item))
+        if ( ! is_array($items))
         {
-            return $item;
+            return $items;
+        }
+
+        //Check if not multidimensional array (for backward compatibility)
+        if((count($items) == count($items, COUNT_RECURSIVE)))
+        {
+            return $this->getNestedContext(MusicAlbum::class, $items);
         }
 
-        return $this->getNestedContext(MusicAlbum::class, $item);
+        //multiple albums
+        return array_map(function ($item) {
+            return $this->getNestedContext(MusicAlbum::class, $item);
+        }, $items);
     }
 
     /**