From 8143d397881867fb921332250f50ebf18b35d524 Mon Sep 17 00:00:00 2001
From: ppetermann <ppetermann@625475ce-881a-0410-a577-b389adb331d8>
Date: Fri, 28 Sep 2007 15:55:56 +0000
Subject: [PATCH] fixed bug in Cache, made Array.php compliant to its/the
interfaces documentation (returning false instead of null when nothing found)
and changed if statement in Hydrate to react on false, not on null too
---
lib/Doctrine/Cache/Array.php | 2 +-
lib/Doctrine/Hydrate.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/Doctrine/Cache/Array.php b/lib/Doctrine/Cache/Array.php
index 1c3be50fb..92e635e95 100644
--- a/lib/Doctrine/Cache/Array.php
+++ b/lib/Doctrine/Cache/Array.php
@@ -52,7 +52,7 @@ class Doctrine_Cache_Array implements Countable, Doctrine_Cache_Interface
if (isset($this->data[$id])) {
return $this->data[$id];
}
- return null;
+ return false;
}
/**
* Test if a cache is available or not (for the given id)
diff --git a/lib/Doctrine/Hydrate.php b/lib/Doctrine/Hydrate.php
index afad6a9dd..a777f7274 100644
--- a/lib/Doctrine/Hydrate.php
+++ b/lib/Doctrine/Hydrate.php
@@ -786,10 +786,10 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
// calculate hash for dql query
$hash = md5($dql . var_export($params, true));
- $cached = ($this->_expireCache) ? null : $cacheDriver->fetch($hash);
+ $cached = ($this->_expireCache) ? false : $cacheDriver->fetch($hash);
- if ($cached === null) {
+ if ($cached === false) {
// cache miss
$stmt = $this->_execute($params);
$array = $this->parseData2($stmt, Doctrine::HYDRATE_ARRAY);