From e9d4fd1320f1349192afef7d16bddcb63dcb6eb5 Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Mon, 12 Oct 2009 23:07:09 -0400
Subject: [PATCH] Add a Horde_Rdo_Exception class, and throw one when we can't
 find an entity class.

---
 framework/Rdo/lib/Horde/Rdo/Base.php      |  4 ++--
 framework/Rdo/lib/Horde/Rdo/Exception.php | 13 +++++++++++++
 framework/Rdo/lib/Horde/Rdo/Mapper.php    |  3 +++
 framework/Rdo/package.xml                 |  2 ++
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 framework/Rdo/lib/Horde/Rdo/Exception.php

diff --git a/framework/Rdo/lib/Horde/Rdo/Base.php b/framework/Rdo/lib/Horde/Rdo/Base.php
index 3d4c5c15f..80e1e3fb0 100644
--- a/framework/Rdo/lib/Horde/Rdo/Base.php
+++ b/framework/Rdo/lib/Horde/Rdo/Base.php
@@ -11,8 +11,8 @@
  * @category Horde
  * @package Horde_Rdo
  */
-abstract class Horde_Rdo_Base implements IteratorAggregate {
-
+abstract class Horde_Rdo_Base implements IteratorAggregate
+{
     /**
      * The Horde_Rdo_Mapper instance associated with this Rdo object. The
      * Mapper takes care of all backend access.
diff --git a/framework/Rdo/lib/Horde/Rdo/Exception.php b/framework/Rdo/lib/Horde/Rdo/Exception.php
new file mode 100644
index 000000000..ccefb0940
--- /dev/null
+++ b/framework/Rdo/lib/Horde/Rdo/Exception.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @category Horde
+ * @package  Horde_Rdo
+ */
+
+/**
+ * @category Horde
+ * @package  Horde_Rdo
+ */
+class Horde_Rdo_Exception extends Exception
+{
+}
diff --git a/framework/Rdo/lib/Horde/Rdo/Mapper.php b/framework/Rdo/lib/Horde/Rdo/Mapper.php
index f95b993c5..ddb9f6968 100644
--- a/framework/Rdo/lib/Horde/Rdo/Mapper.php
+++ b/framework/Rdo/lib/Horde/Rdo/Mapper.php
@@ -196,6 +196,9 @@ abstract class Horde_Rdo_Mapper implements Countable
         // Guess a classname if one isn't explicitly set.
         if (!$this->_classname) {
             $this->_classname = $this->mapperToEntity();
+            if (!$this->_classname) {
+                throw new Horde_Rdo_Exception('Unable to find an entity class (extending Horde_Rdo_Base) for ' . get_class($this));
+            }
         }
 
         $o = new $this->_classname();
diff --git a/framework/Rdo/package.xml b/framework/Rdo/package.xml
index 0c77330a4..845b5cc19 100644
--- a/framework/Rdo/package.xml
+++ b/framework/Rdo/package.xml
@@ -36,6 +36,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
        <file name="Literal.php" role="php" />
       </dir> <!-- /lib/Horde/Rdo/Query -->
       <file name="Base.php" role="php" />
+      <file name="Exception.php" role="php" />
       <file name="Iterator.php" role="php" />
       <file name="List.php" role="php" />
       <file name="Mapper.php" role="php" />
@@ -60,6 +61,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <filelist>
    <install name="lib/Horde/Rdo/Query/Literal.php" as="Horde/Rdo/Query/Literal.php" />
    <install name="lib/Horde/Rdo/Base.php" as="Horde/Rdo/Base.php" />
+   <install name="lib/Horde/Rdo/Exception.php" as="Horde/Rdo/Exception.php" />
    <install name="lib/Horde/Rdo/Iterator.php" as="Horde/Rdo/Iterator.php" />
    <install name="lib/Horde/Rdo/List.php" as="Horde/Rdo/List.php" />
    <install name="lib/Horde/Rdo/Mapper.php" as="Horde/Rdo/Mapper.php" />
-- 
2.11.0