Made the ODM compatible with Common 2.2 again

doctrine · Jul 19, 2012 · e373044 · e373044
1 parent 48add00
commit e373044
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
         "php": ">=5.3.2",
         "symfony/yaml": ">=2.0",
         "symfony/console": ">=2.0",
-        "doctrine/common": ">=2.3.0,<2.5-dev",
+        "doctrine/common": ">=2.2.0,<2.5-dev",
         "doctrine/mongodb": "dev-master"
     },
     "minimum-stability": "dev",

diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataFactory.php
@@ -127,7 +127,7 @@ protected function isEntity(ClassMetadataInterface $class)
     /**
      * {@inheritDoc}
      */
-    protected function doLoadMetadata($class, $parent, $rootEntityFound, array $nonSuperclassParents)
+    protected function doLoadMetadata($class, $parent, $rootEntityFound, array $nonSuperclassParents = array())
     {
         /** @var $class ClassMetadata */
         /** @var $parent ClassMetadata */