new branch for DDC-753

FabioBatSilva · FabioBatSilva · commit 84cd22d7f776 · 2011-09-08T14:36:13.000-03:00
diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php
@@ -516,4 +516,31 @@ public function getClassMetadataFactoryName()
         }
         return $this->_attributes['classMetadataFactoryName'];
     }
+    
+    /**
+     * Set default repository class.
+     * 
+     * @since 2.2
+     * @param string $className
+     * @throws ORMException If not implements Doctrine\Common\Persistence\ObjectRepository
+     */
+    public function setDefaultRepositoryClassName($className)
+    {
+        if (!is_subclass_of($className, 'Doctrine\Common\Persistence\ObjectRepository')) {
+            throw ORMException::invalidObjectRepository($className);
+        }
+        $this->_attributes['defaultRepositoryClassName'] = $className;
+    }
+
+    /**
+     * Get default repository class.
+     * 
+     * @since 2.2
+     * @return string
+     */
+    public function getDefaultRepositoryClassName()
+    {
+        return isset($this->_attributes['defaultRepositoryClassName']) ?
+                $this->_attributes['defaultRepositoryClassName'] : 'Doctrine\ORM\EntityRepository';
+    }
 }
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -1519,12 +1519,17 @@ protected function _storeAssociationMapping(array $assocMapping)
      * Registers a custom repository class for the entity class.
      *
      * @param string $mapperClassName  The class name of the custom mapper.
+     * @throws MappingException If not implements Doctrine\Common\Persistence\ObjectRepository
      */
     public function setCustomRepositoryClass($repositoryClassName)
     {
         if ($repositoryClassName !== null && strpos($repositoryClassName, '\\') === false 
                 && strlen($this->namespace) > 0) {
             $repositoryClassName = $this->namespace . '\\' . $repositoryClassName;
+            
+            if (!is_subclass_of($repositoryClassName, 'Doctrine\Common\Persistence\ObjectRepository')) {
+                throw MappingException::invalidObjectRepository($repositoryClassName);
+            }
         }
         $this->customRepositoryClassName = $repositoryClassName;
     }
diff --git a/lib/Doctrine/ORM/ORMException.php b/lib/Doctrine/ORM/ORMException.php
@@ -130,4 +130,9 @@ public static function unknownEntityNamespace($entityNamespaceAlias)
             "Unknown Entity namespace alias '$entityNamespaceAlias'."
         );
     }
+    
+    public static function invalidObjectRepository($className) {
+        return new self("Invalid repository class '".$className."'. ".
+                "it must implement Doctrine\Common\Persistence\ObjectRepository.");
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1519,12 +1519,17 @@ protected function _storeAssociationMapping(array $assocMapping)`
`1519`	`1519`	`* Registers a custom repository class for the entity class.`
`1520`	`1520`	`*`
`1521`	`1521`	`* @param string $mapperClassName The class name of the custom mapper.`
	`1522`	`+ * @throws MappingException If not implements Doctrine\Common\Persistence\ObjectRepository`
`1522`	`1523`	`*/`
`1523`	`1524`	`public function setCustomRepositoryClass($repositoryClassName)`
`1524`	`1525`	`{`
`1525`	`1526`	`if ($repositoryClassName !== null && strpos($repositoryClassName, '\\') === false`
`1526`	`1527`	`&& strlen($this->namespace) > 0) {`
`1527`	`1528`	`$repositoryClassName = $this->namespace . '\\' . $repositoryClassName;`
	`1529`	`+`
	`1530`	`+ if (!is_subclass_of($repositoryClassName, 'Doctrine\Common\Persistence\ObjectRepository')) {`
	`1531`	`+ throw MappingException::invalidObjectRepository($repositoryClassName);`
	`1532`	`+ }`
`1528`	`1533`	`}`
`1529`	`1534`	`$this->customRepositoryClassName = $repositoryClassName;`
`1530`	`1535`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,4 +130,9 @@ public static function unknownEntityNamespace($entityNamespaceAlias)`
`130`	`130`	`"Unknown Entity namespace alias '$entityNamespaceAlias'."`
`131`	`131`	`);`
`132`	`132`	`}`
	`133`	`+`
	`134`	`+ public static function invalidObjectRepository($className) {`
	`135`	`+ return new self("Invalid repository class '".$className."'. ".`
	`136`	`+ "it must implement Doctrine\Common\Persistence\ObjectRepository.");`
	`137`	`+ }`
`133`	`138`	`}`