Added ArrayCollectionTest::testDerivedClassCreation.

composer.json

@@ -21,6 +21,11 @@
     "autoload": {
         "psr-0": { "Doctrine\\Common\\Collections\\": "lib/" }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Doctrine\\Tests\\": "tests/Doctrine/Tests"
+        }
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "1.3.x-dev"

phpunit.xml.dist

@@ -9,7 +9,6 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="./tests/Doctrine/Tests/TestInit.php"
 >
     <testsuites>
         <testsuite name="Doctrine Collections Test Suite">
@@ -22,7 +21,7 @@
             <directory>./lib/Doctrine/</directory>
         </whitelist>
     </filter>
-    
+
     <groups>
         <exclude>
             <group>performance</group>

tests/Doctrine/Tests/Common/Collections/ArrayCollectionTest.php

@@ -21,6 +21,7 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Criteria;
+use Doctrine\Tests\DerivedArrayCollection;
 
 /**
  * Tests for {@see \Doctrine\Common\Collections\ArrayCollection}
@@ -315,4 +316,21 @@ public function testMultiColumnSortAppliesAllSorts()
                 ->toArray()
         );
     }
+
+    /**
+     * Tests that methods that create a new instance can be called in a derived
+     * class that implements different constructor semantics.
+     */
+    public function testDerivedClassCreation()
+    {
+        $collection = new DerivedArrayCollection(new \stdClass);
+        $closure = function () {
+            // Intentionally empty.
+        };
+
+        self::assertInstanceOf('Doctrine\Tests\DerivedArrayCollection', $collection->map($closure));
+        self::assertInstanceOf('Doctrine\Tests\DerivedArrayCollection', $collection->filter($closure));
+        self::assertContainsOnlyInstancesOf('Doctrine\Tests\DerivedArrayCollection', $collection->partition($closure));
+        self::assertInstanceOf('Doctrine\Tests\DerivedArrayCollection', $collection->matching(new Criteria));
+    }
 }

tests/Doctrine/Tests/DerivedArrayCollection.php

@@ -0,0 +1,21 @@
+<?php
+namespace Doctrine\Tests;
+
+use Doctrine\Common\Collections\ArrayCollection;
+
+final class DerivedArrayCollection extends ArrayCollection
+{
+    private $foo;
+
+    public function __construct(\stdClass $foo, array $elements = array())
+    {
+        $this->foo = $foo;
+
+        parent::__construct($elements);
+    }
+
+    protected function createFrom(array $elements)
+    {
+        return new static($this->foo, $elements);
+    }
+}