Author: romanb
Date: 2008-09-12 10:37:05 +0100 (Fri, 12 Sep 2008)
New Revision: 4918
Removed:
trunk/lib/Doctrine/Entity/
trunk/lib/Doctrine/EntityManager/
Modified:
trunk/lib/Doctrine/Entity.php
trunk/lib/Doctrine/EntityManager.php
trunk/tests/Orm/Component/AccessTest.php
trunk/tests/Orm/EntityManagerTest.php
Log:
moved entity/entitymanager exceptions
Modified: trunk/lib/Doctrine/Entity.php
===================================================================
--- trunk/lib/Doctrine/Entity.php 2008-09-12 09:28:18 UTC (rev 4917)
+++ trunk/lib/Doctrine/Entity.php 2008-09-12 09:37:05 UTC (rev 4918)
@@ -453,7 +453,7 @@
}
}
} else {
- throw Doctrine_Entity_Exception::invalidField($fieldName);
+ throw
Doctrine_ORM_Exceptions_EntityException::invalidField($fieldName);
}
}
Modified: trunk/lib/Doctrine/EntityManager.php
===================================================================
--- trunk/lib/Doctrine/EntityManager.php 2008-09-12 09:28:18 UTC (rev
4917)
+++ trunk/lib/Doctrine/EntityManager.php 2008-09-12 09:37:05 UTC (rev
4918)
@@ -350,7 +350,7 @@
public function setFlushMode($flushMode)
{
if ( ! $this->_isFlushMode($flushMode)) {
- throw Doctrine_EntityManager_Exception::invalidFlushMode();
+ throw
Doctrine_ORM_Exceptions_EntityManagerException::invalidFlushMode();
}
$this->_flushMode = $flushMode;
}
Modified: trunk/tests/Orm/Component/AccessTest.php
===================================================================
--- trunk/tests/Orm/Component/AccessTest.php 2008-09-12 09:28:18 UTC (rev
4917)
+++ trunk/tests/Orm/Component/AccessTest.php 2008-09-12 09:37:05 UTC (rev
4918)
@@ -96,7 +96,7 @@
/**
* @test
- * @expectedException Doctrine_Entity_Exception
+ * @expectedException Doctrine_ORM_Exceptions_EntityException
*/
public function shouldNotBeAbleToSetNonExistantField()
{
@@ -105,7 +105,7 @@
/**
* @test
- * @expectedException Doctrine_Entity_Exception
+ * @expectedException Doctrine_ORM_Exceptions_EntityException
*/
public function shouldNotBeAbleToSetNonExistantFieldWithOffset()
{
Modified: trunk/tests/Orm/EntityManagerTest.php
===================================================================
--- trunk/tests/Orm/EntityManagerTest.php 2008-09-12 09:28:18 UTC (rev
4917)
+++ trunk/tests/Orm/EntityManagerTest.php 2008-09-12 09:37:05 UTC (rev
4918)
@@ -14,7 +14,7 @@
try {
$this->_em->setFlushMode('foobar');
$this->fail("Setting invalid flushmode did not trigger
exception.");
- } catch (Doctrine_EntityManager_Exception $expected) {}
+ } catch (Doctrine_ORM_Exceptions_EntityManagerException $expected) {}
$this->_em->setFlushMode($prev);
}
}
\ No newline at end of file
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"doctrine-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.co.uk/group/doctrine-svn?hl=en-GB
-~----------~----~----~----~------~----~------~--~---
