Default/Custom Entity Repository for Entity Repository Generator

lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php

@@ -73,6 +73,8 @@ EOT
         $metadatas = $em->getMetadataFactory()->getAllMetadata();
         $metadatas = MetadataFilter::filter($metadatas, $input->getOption('filter'));
 
+        $repositoryName = $em->getConfiguration()->getDefaultRepositoryClassName();
+
         // Process destination directory
         $destPath = realpath($input->getArgument('dest-path'));
 
@@ -91,7 +93,9 @@ EOT
         if (count($metadatas)) {
             $numRepositories = 0;
             $generator = new EntityRepositoryGenerator();
-
+            
+            $generator->setDefaultRepositoryName($repositoryName);
+            
             foreach ($metadatas as $metadata) {
                 if ($metadata->customRepositoryClassName) {
                     $output->writeln(

lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php

@@ -32,20 +32,20 @@ namespace Doctrine\ORM\Tools;
  */
 class EntityRepositoryGenerator
 {
+    protected $_repositoryName = 'Doctrine\ORM\EntityRepository';
+
     protected static $_template =
 '<?php
 
 <namespace>
 
-use Doctrine\ORM\EntityRepository;
-
 /**
  * <className>
  *
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
-class <className> extends EntityRepository
+class <className> extends <repositoryName>
 {
 }
 ';
@@ -60,8 +60,9 @@ class <className> extends EntityRepository
         $className = substr($fullClassName, strrpos($fullClassName, '\\') + 1, strlen($fullClassName));
 
         $variables = array(
-            '<namespace>' => $this->generateEntityRepositoryNamespace($fullClassName),
+            '<namespace>'       => $this->generateEntityRepositoryNamespace($fullClassName),
-            '<className>' => $className
+            '<repositoryName>'  => $this->generateEntityRepositoryName(),
+            '<className>'       => $className
         );
 
         return str_replace(array_keys($variables), array_values($variables), self::$_template);
@@ -74,13 +75,27 @@ class <className> extends EntityRepository
      *
      * @return string $namespace
      */
-    private function generateEntityRepositoryNamespace($fullClassName)
+    protected function generateEntityRepositoryNamespace($fullClassName)
     {
         $namespace = substr($fullClassName, 0, strrpos($fullClassName, '\\'));
-        
+
         return $namespace ? 'namespace ' . $namespace . ';' : '';
     }
 
+    /**
+     * @return string $repositoryName
+     */
+    protected function generateEntityRepositoryName()
+    {
+        $repositoryName = $this->getDefaultRepositoryName();
+
+        if (substr($repositoryName, 0, 1) != '\\') {
+            $repositoryName = '\\'.$repositoryName;
+        }
+
+        return $repositoryName;
+    }
+
     /**
      * @param string $fullClassName
      * @param string $outputDirectory
@@ -103,4 +118,24 @@ class <className> extends EntityRepository
             file_put_contents($path, $code);
         }
     }
+
+    /**
+     * @param string $repositoryName
+     * @return \Doctrine\ORM\Tools\EntityRepositoryGenerator
+     */
+    public function setDefaultRepositoryName($repositoryName)
+    {
+        $this->_repositoryName = $repositoryName;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDefaultRepositoryName()
+    {
+        return $this->_repositoryName;
+    }
+
 }