tests/mock/defaults.stest.php @@ -404,7 +404,7 @@ class Snap_MockObject { $returns_at_default[] = $sig; } } - + // > 1 return is an exception if (count($returns_at_call_count) > 1) { // error here @@ -525,16 +525,29 @@ class Snap_MockObject { continue; } + // look at every param submitted versus the params in the signature + // once we have a non-match, we fail out the test. + // if we get all the way through then add the signature to our + // match list $param_match = TRUE; foreach ($params as $idx => $param) { - // more params in sig than sent to us - if (!in_array($idx, array_keys($method_params))) { + // more params in sig than sent to us, and this wasn't an anything expectation + if (!in_array($idx, array_keys($method_params)) && is_object($param) && strtolower(get_class($param)) != 'snap_anything_expectation') { $param_match = FALSE; break; } + // if this is an anything expectation, and there was no param (optional), + // make the method param anything we want. + if (strtolower(get_class($param)) == 'snap_anything_expectation' && !isset($method_params[$idx])) { + $method_param = NULL; + } + else { + $method_param = $method_params[$idx]; + } + // run a match, if it fails, it is a non match - if (!$param->match($method_params[$idx])) { + if (!$param->match($method_param)) { $param_match = FALSE; break; } @@ -562,6 +575,7 @@ class Snap_MockObject { if (!isset($this->signatures[$method_name])) { return NULL; } + foreach ($this->signatures[$method_name] as $signature => $details) { if (count($details['params']) == 0) { return $signature; core/mock/mock.php 4f612243f2ec94f5e0994b44450657110bb8693f Jakob Heuser jakob@felocity.org http://github.com/Jakobo/snaptest/commit/c0205490f0a3df909b635072e8fdda385972a878 c0205490f0a3df909b635072e8fdda385972a878 2008-08-19T11:11:19-07:00 2008-08-19T11:11:19-07:00 fixed bug where mock objects were unable to return a proper signature with optional parameters Signed-off-by: Jakob Heuser <jakob@felocity.org> 5db7bffc5ffcde48ded6c1be1928627abc38ff2d Jakob Heuser jakob@felocity.org