From 09bb14ae7f61ab8d0212c399daf99b957ae18706 Mon Sep 17 00:00:00 2001 From: nojimage Date: Fri, 14 Jun 2013 10:43:40 +0900 Subject: [PATCH] fixes declaration warning in php5.4 --- Model/Datasource/RestSource.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Model/Datasource/RestSource.php b/Model/Datasource/RestSource.php index 2638eaa..fd2f2aa 100644 --- a/Model/Datasource/RestSource.php +++ b/Model/Datasource/RestSource.php @@ -90,11 +90,11 @@ public function __construct($config, $Http = null) { /** * Sets method = POST in request if not already set * - * @param AppModel $model + * @param Model $model * @param array $fields Unused * @param array $values Unused */ - public function create($model, $fields = null, $values = null) { + public function create(Model $model, $fields = null, $values = null) { $model->request = array_merge(array('method' => 'POST'), $model->request); return $this->request($model); } @@ -102,10 +102,11 @@ public function create($model, $fields = null, $values = null) { /** * Sets method = GET in request if not already set * - * @param AppModel $model + * @param Model $model * @param array $queryData Unused + * @param integer $recursive Unused */ - public function read($model, $queryData = array()) { + public function read(Model $model, $queryData = array(), $recursive = null) { $model->request = array_merge(array('method' => 'GET'), $model->request); return $this->request($model); } @@ -113,11 +114,12 @@ public function read($model, $queryData = array()) { /** * Sets method = PUT in request if not already set * - * @param AppModel $model + * @param Model $model * @param array $fields Unused * @param array $values Unused + * @param mixed $conditions Unused */ - public function update($model, $fields = null, $values = null) { + public function update(Model $model, $fields = null, $values = null, $conditions = null) { $model->request = array_merge(array('method' => 'PUT'), $model->request); return $this->request($model); } @@ -125,10 +127,10 @@ public function update($model, $fields = null, $values = null) { /** * Sets method = DELETE in request if not already set * - * @param AppModel $model + * @param Model $model * @param mixed $id Unused */ - public function delete($model, $id = null) { + public function delete(Model $model, $id = null) { $model->request = array_merge(array('method' => 'DELETE'), $model->request); return $this->request($model); }