partkeepr

commit 107ebcb7a3f14d97aa24fb1710ce57de0fa81a83
parent 91475c47bcb2fa7b8b3428e67b6f93d7be733d3f
Author: Timo A. Hummel <timo@netraver.de>
Date:   Fri,  3 Jun 2011 11:23:48 +0200

Fixed stuff to make doctrine orm:generate-proxies work

Diffstat:
A
cli-config.php
 | 
18
++++++++++++++++++
M
src/de/RaumZeitLabor/PartDB2/PartDB2.php
 | 
47
+++++++++++++++++++++++++++++------------------

2 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/cli-config.php b/cli-config.php
@@ -0,0 +1,17 @@
+<?php
+use de\RaumZeitLabor\PartDB2\Service\ServiceManager;
+use de\RaumZeitLabor\PartDB2\PartDB2;
+use Doctrine\Common\ClassLoader;
+
+include("src/de/RaumZeitLabor/PartDB2/PartDB2.php");
+PartDB2::initialize("");
+
+$em = PartDB2::getEM();
+
+$classes = PartDB2::getEntityClasses();
+
+
+$helperSet = new \Symfony\Component\Console\Helper\HelperSet(array(
+    'db' => new \Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper($em->getConnection()),
+    'em' => new \Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper($em)
+));+
\ No newline at end of file
diff --git a/src/de/RaumZeitLabor/PartDB2/PartDB2.php b/src/de/RaumZeitLabor/PartDB2/PartDB2.php
@@ -96,8 +96,8 @@ class PartDB2 {
 		$config = new Configuration;
 		
 		$driverImpl = $config->newDefaultAnnotationDriver(
-			array(__DIR__."/Auth"),
-			array(__DIR__."/Session")
+			array(__DIR__)
+			//array(__DIR__."/Session")
 			
 			);
 		$config->setMetadataDriverImpl($driverImpl);
@@ -122,7 +122,8 @@ class PartDB2 {
 		// Proxy configuration
 		$config->setProxyDir(dirname(dirname(dirname(__DIR__))) . '/Proxies');
 		$config->setProxyNamespace('Proxies');
-		$config->setAutoGenerateProxyClasses(true);
+		$config->setEntityNamespaces(self::getEntityClasses());
+		$config->setAutoGenerateProxyClasses(false);
 		
 		$logger = new \Doctrine\DBAL\Logging\EchoSQLLogger();
         //$config->setSQLLogger($logger);
@@ -152,22 +153,32 @@ class PartDB2 {
 	}
 	
 	public static function getClassMetaData () {
-		$classes = array(
-			PartDB2::getEM()->getClassMetadata('de\RaumZeitLabor\PartDB2\Auth\User'),
-  			PartDB2::getEM()->getClassMetadata('de\RaumZeitLabor\PartDB2\Session\Session'),
-  			PartDB2::getEM()->getClassMetadata('de\RaumZeitLabor\PartDB2\Footprint\Footprint'),
-  			PartDB2::getEM()->getClassMetadata('de\RaumZeitLabor\PartDB2\Category\Category'),
-  			PartDB2::getEM()->getClassMetadata('de\RaumZeitLabor\PartDB2\Part\Part'),
-  			PartDB2::getEM()->getClassMetadata('de\RaumZeitLabor\PartDB2\StorageLocation\StorageLocation'),
-  			PartDB2::getEM()->getClassMetadata('de\RaumZeitLabor\PartDB2\Stock\StockEntry'),
-  			PartDB2::getEM()->getClassMetadata('de\RaumZeitLabor\PartDB2\Manufacturer\Manufacturer'),
-  			PartDB2::getEM()->getClassMetadata('de\RaumZeitLabor\PartDB2\Image\Image'),
-  			PartDB2::getEM()->getClassMetadata('de\RaumZeitLabor\PartDB2\Image\CachedImage'),
-  			PartDB2::getEM()->getClassMetadata('de\RaumZeitLabor\PartDB2\Image\TempImage'),
-  			PartDB2::getEM()->getClassMetadata('de\RaumZeitLabor\PartDB2\Manufacturer\ManufacturerICLogo')
-		);
+		$classes = self::getEntityClasses();
+
+		$aClasses = array();
+		
+		foreach ($classes as $class) {
+			$aClasses[] = PartDB2::getEM()->getClassMetadata($class);
+		}
 		
-		return $classes;
+		return $aClasses;
+	}
+	
+	public static function getEntityClasses () {
+		return array(
+			'de\RaumZeitLabor\PartDB2\Auth\User',
+			'de\RaumZeitLabor\PartDB2\Session\Session',
+			'de\RaumZeitLabor\PartDB2\Footprint\Footprint',
+			'de\RaumZeitLabor\PartDB2\Category\Category',
+			'de\RaumZeitLabor\PartDB2\Part\Part',
+			'de\RaumZeitLabor\PartDB2\StorageLocation\StorageLocation',
+			'de\RaumZeitLabor\PartDB2\Stock\StockEntry',
+			'de\RaumZeitLabor\PartDB2\Manufacturer\Manufacturer',
+			'de\RaumZeitLabor\PartDB2\Image\Image',
+			'de\RaumZeitLabor\PartDB2\Image\CachedImage',
+			'de\RaumZeitLabor\PartDB2\Image\TempImage',
+			'de\RaumZeitLabor\PartDB2\Manufacturer\ManufacturerICLogo'
+		);
 	}
 	
 	/**