Author: Russ
Date: 2010-03-17 13:31:20 +0100 (Wed, 17 Mar 2010)
New Revision: 28575
Modified:
plugins/sfDoctrinePlugin/branches/1.3-2.0/config/cli-config.php
plugins/sfDoctrinePlugin/branches/1.3-2.0/config/sfDoctrine2PluginConfiguration.class.php
plugins/sfDoctrinePlugin/branches/1.3-2.0/lib/task/sfDoctrineBaseTask.class.php
Log:
[1.4][sfDoctrine2Plugin] Support user defined (multiple) class dirs - closes
#8070
Modified: plugins/sfDoctrinePlugin/branches/1.3-2.0/config/cli-config.php
===================================================================
--- plugins/sfDoctrinePlugin/branches/1.3-2.0/config/cli-config.php
2010-03-17 11:44:51 UTC (rev 28574)
+++ plugins/sfDoctrinePlugin/branches/1.3-2.0/config/cli-config.php
2010-03-17 12:31:20 UTC (rev 28575)
@@ -4,6 +4,4 @@
$databaseManager = new sfDatabaseManager($configuration);
$names = $databaseManager->getNames();
$em = $databaseManager->getDatabase(end($names))->getEntityManager();
-$args = array(
- 'class-dir' => sfConfig::get('sf_lib_dir').'/entities/Entities'
-);
\ No newline at end of file
+$args = array();
\ No newline at end of file
Modified:
plugins/sfDoctrinePlugin/branches/1.3-2.0/config/sfDoctrine2PluginConfiguration.class.php
===================================================================
---
plugins/sfDoctrinePlugin/branches/1.3-2.0/config/sfDoctrine2PluginConfiguration.class.php
2010-03-17 11:44:51 UTC (rev 28574)
+++
plugins/sfDoctrinePlugin/branches/1.3-2.0/config/sfDoctrine2PluginConfiguration.class.php
2010-03-17 12:31:20 UTC (rev 28575)
@@ -46,10 +46,6 @@
$classLoader->setBasePath(__DIR__.'/../lib/vendor/doctrine');
$classLoader->register();
- $classLoader = new \Doctrine\Common\IsolatedClassLoader('Entities');
-
$classLoader->setBasePath(sfConfig::get('sf_lib_dir').'/entities/doctrine');
- $classLoader->register();
-
$this->dispatcher->connect('component.method_not_found', array($this,
'componentMethodNotFound'));
}
Modified:
plugins/sfDoctrinePlugin/branches/1.3-2.0/lib/task/sfDoctrineBaseTask.class.php
===================================================================
---
plugins/sfDoctrinePlugin/branches/1.3-2.0/lib/task/sfDoctrineBaseTask.class.php
2010-03-17 11:44:51 UTC (rev 28574)
+++
plugins/sfDoctrinePlugin/branches/1.3-2.0/lib/task/sfDoctrineBaseTask.class.php
2010-03-17 12:31:20 UTC (rev 28575)
@@ -43,8 +43,10 @@
return $args;
}
- protected function callDoctrineCli($task, $arguments = array(), $em = true)
+ protected function callDoctrineCli($task, $arguments = array())
{
+ $this->databaseManager = new sfDatabaseManager($this->configuration);
+ $em = $this->getEntityManager();
$args = array(
'./doctrine',
$task
@@ -52,14 +54,13 @@
$args = array_merge($args, $arguments);
$args[] = '--config='.__DIR__.'/../../config/cli-config.php';
+ $args[] = '--class-dir=' . join(",",
$em->getConfiguration()->getMetadataDriverImpl()->getPaths());
$printer = new sfDoctrineCliPrinter();
$printer->setFormatter($this->formatter);
- $this->databaseManager = new sfDatabaseManager($this->configuration);
-
$config = new \Doctrine\Common\Cli\Configuration;
- $config->setAttribute("em", $this->getEntityManager());
+ $config->setAttribute("em", $em);
$cli = new \Doctrine\Common\Cli\CliController($config);
$cli->run($args);
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
