Browse files

Fixing describe() signature to match latest lithium's Source signatur…

…e, and implementing __toString() in BaseEntity
  • Loading branch information...
1 parent e87e4aa commit b1fb2211eb2b4b0194682bb29a713c2b4f0da2ca @mariano committed Oct 25, 2012
Showing with 11 additions and 2 deletions.
  1. +1 −1 extensions/data/source/Doctrine.php
  2. +10 −1 models/BaseEntity.php
View
2 extensions/data/source/Doctrine.php
@@ -188,7 +188,7 @@ public function sources($class = null) {}
* - `'type'`: The field type name
* @todo
*/
- public function describe($entity, array $meta = array()) {}
+ public function describe($entity, $schema = array(), array $meta = array()) {}
/**
* Defines or modifies the default settings of a relationship between two models.
View
11 models/BaseEntity.php
@@ -260,5 +260,14 @@ protected function _getData($allProperties = false) {
}
return $data;
}
+
+ /**
+ * String representation
+ *
+ * @return string String representation
+ */
+ public function __toString() {
+ return get_class($this) . '@' . spl_object_hash($this);
+ }
}
-?>
+?>

0 comments on commit b1fb221

Please sign in to comment.