Updating to 5.4 strict

webtechnick · Aug 31, 2013 · 9048bce · 9048bce
1 parent 765b7ac
commit 9048bce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Model/DatabaseLoggerAppModel.php b/Model/DatabaseLoggerAppModel.php
@@ -51,7 +51,7 @@ public function delete($id = null, $cascade = true) {
 	* - last : find last record by created date
 	* @param array of options
 	*/
-	function find($type, $options = array()){
+	function find($type = 'first', $options = array()){
 		switch($type){
 		case 'last':
 			$options = array_merge(
@@ -69,7 +69,7 @@ function find($type, $options = array()){
 	* @param string filter
 	* @return conditions array
 	*/
-	function generateFilterConditions($filter = null){
+	function generateFilterConditions($filter = NULL, $pre = ''){
 		$retval = array();
 		if($filter){
 			foreach($this->searchFields as $field){

diff --git a/Model/Log.php b/Model/Log.php
@@ -4,7 +4,7 @@ class Log extends DatabaseLoggerAppModel {
 	var $displayField = 'type';
 	var $searchFields = array('Log.type');
 
-	function beforeSave(){
+	function beforeSave($options = array()){
 		$this->data[$this->alias]['ip'] = env('REMOTE_ADDR');
 		$this->data[$this->alias]['hostname'] = env('HTTP_HOST');
 		$this->data[$this->alias]['uri'] = env('REQUEST_URI');
@@ -54,7 +54,7 @@ function getTypes(){
 		return $retval;
 	}
 
-	function search($params){
+	function search($params = array(), $options = array()){
 		$conditions = parent::search($params);
 		if(isset($params['start_date']) && !empty($params['start_date'])){
 			$params['start_date'] = str_replace('-','/',$params['start_date']);

diff --git a/Test/Case/controllers/LogsControllerTest.php b/Test/Case/controllers/LogsControllerTest.php
@@ -12,7 +12,7 @@ function redirect($url, $status = null, $exit = true) {
 
 class LogsControllerTest extends CakeTestCase {
 	function startTest() {
-		$this->Logs =& new TestLogsController();
+		$this->Logs = new TestLogsController();
 		$this->Logs->constructClasses();
 	}