From 35e49aaf9ff0f0d6a0f1c3f733b5cbdadc3de42a Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sun, 6 Jun 2010 22:41:05 +0200
Subject: [PATCH] Fixed a fatal error in DatabasePlatformMock when linking ORM
 against latest DBAL, added a phpunit configuration.xml to change dependencies
 for tests

---
 tests/Doctrine/Tests/Mocks/DatabasePlatformMock.php |  5 +++++
 tests/Doctrine/Tests/TestInit.php                   | 12 ++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/tests/Doctrine/Tests/Mocks/DatabasePlatformMock.php b/tests/Doctrine/Tests/Mocks/DatabasePlatformMock.php
index f2bbf1215..b2954cf55 100644
--- a/tests/Doctrine/Tests/Mocks/DatabasePlatformMock.php
+++ b/tests/Doctrine/Tests/Mocks/DatabasePlatformMock.php
@@ -82,4 +82,9 @@ class DatabasePlatformMock extends \Doctrine\DBAL\Platforms\AbstractPlatform
     {
         return 'mock';
     }
+
+    protected function initializeDoctrineTypeMappings()
+    {
+        
+    }
 }
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/TestInit.php b/tests/Doctrine/Tests/TestInit.php
index a100c7a35..cd3bf4daa 100644
--- a/tests/Doctrine/Tests/TestInit.php
+++ b/tests/Doctrine/Tests/TestInit.php
@@ -10,10 +10,18 @@ require_once 'PHPUnit/Framework.php';
 require_once 'PHPUnit/TextUI/TestRunner.php';
 require_once __DIR__ . '/../../../lib/vendor/doctrine-common/lib/Doctrine/Common/ClassLoader.php';
 
-$classLoader = new \Doctrine\Common\ClassLoader('Doctrine\Common', __DIR__ . '/../../../lib/vendor/doctrine-common/lib');
+if (isset($GLOBALS['DOCTRINE_COMMON_PATH'])) {
+    $classLoader = new \Doctrine\Common\ClassLoader('Doctrine\Common', $GLOBALS['DOCTRINE_COMMON_PATH']);
+} else {
+    $classLoader = new \Doctrine\Common\ClassLoader('Doctrine\Common', __DIR__ . '/../../../lib/vendor/doctrine-common/lib');
+}
 $classLoader->register();
 
-$classLoader = new \Doctrine\Common\ClassLoader('Doctrine\DBAL', __DIR__ . '/../../../lib/vendor/doctrine-dbal/lib');
+if (isset($GLOBALS['DOCTRINE_DBAL_PATH'])) {
+    $classLoader = new \Doctrine\Common\ClassLoader('Doctrine\DBAL', $GLOBALS['DOCTRINE_DBAL_PATH']);
+} else {
+    $classLoader = new \Doctrine\Common\ClassLoader('Doctrine\DBAL', __DIR__ . '/../../../lib/vendor/doctrine-dbal/lib');
+}
 $classLoader->register();
 
 $classLoader = new \Doctrine\Common\ClassLoader('Doctrine');