Allow passing array to AssociationCollection::type().

cakephp · Jun 7, 2015 · 0d612cd · 0d612cd
1 parent 3953c1e
commit 0d612cd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/ORM/AssociationCollection.php b/src/ORM/AssociationCollection.php
@@ -111,14 +111,17 @@ public function keys()
     /**
      * Get an array of associations matching a specific type.
      *
-     * @param string $class The type of associations you want. For example 'BelongsTo'
+     * @param string|array $class The type of associations you want.
+     *   For example 'BelongsTo' or array like ['BelongsTo', 'HasOne']
      * @return array An array of Association objects.
      */
     public function type($class)
     {
+        $class = (array)$class;
+
         $out = array_filter($this->_items, function ($assoc) use ($class) {
             list(, $name) = namespaceSplit(get_class($assoc));
-            return $class === $name;
+            return in_array($name, $class);
         });
         return array_values($out);
     }

diff --git a/tests/TestCase/ORM/AssociationCollectionTest.php b/tests/TestCase/ORM/AssociationCollectionTest.php
@@ -147,6 +147,10 @@ public function testType()
         $this->assertSame([$belongsTo], $this->associations->type('BelongsTo'));
         $this->assertSame([$belongsToMany], $this->associations->type('BelongsToMany'));
         $this->assertSame([], $this->associations->type('HasMany'));
+        $this->assertSame(
+            [$belongsTo, $belongsToMany],
+            $this->associations->type(['BelongsTo', 'BelongsToMany'])
+        );
     }
 
     /**