From 7e5f326300c19d701b576c53304e0b473285d166 Mon Sep 17 00:00:00 2001 From: Stephen Cuppett Date: Sun, 19 Aug 2012 17:00:26 -0400 Subject: [PATCH] Fix STRICT warnings on PHP 5.4 --- lib/Cake/Model/Datasource/DataSource.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/Cake/Model/Datasource/DataSource.php b/lib/Cake/Model/Datasource/DataSource.php index e5e665fe9bb..06f52640361 100644 --- a/lib/Cake/Model/Datasource/DataSource.php +++ b/lib/Cake/Model/Datasource/DataSource.php @@ -197,9 +197,10 @@ public function create(Model $model, $fields = null, $values = null) { * * @param Model $model The model being read. * @param array $queryData An array of query data used to find the data you want + * @param integer $recursive Number of levels of association * @return mixed */ - public function read(Model $model, $queryData = array()) { + public function read(Model $model, $queryData = array(), $recursive = null) { return false; } @@ -211,9 +212,10 @@ public function read(Model $model, $queryData = array()) { * @param Model $model Instance of the model class being updated * @param array $fields Array of fields to be updated * @param array $values Array of values to be update $fields to. + * @param mixed $conditions * @return boolean Success */ - public function update(Model $model, $fields = null, $values = null) { + public function update(Model $model, $fields = null, $values = null, $conditions = null) { return false; }