Upgrade syntax

Model/Behavior/ResetBehavior.php

@@ -117,27 +117,27 @@ class ResetBehavior extends ModelBehavior {
 		while ($rows = $Model->find('all', $params)) {
 			foreach ($rows as $row) {
 				$Model->create();
-				$fields = $params['fields'];
+				$fieldList = $params['fields'];
 				if (!empty($updateFields)) {
-					$fields = $updateFields;
+					$fieldList = $updateFields;
 				}
-				if ($fields && !in_array($Model->primaryKey, $fields)) {
-					$fields[] = $Model->primaryKey;
+				if ($fieldList && !in_array($Model->primaryKey, $fieldList)) {
+					$fieldList[] = $Model->primaryKey;
 				}
 
 				if ($callback) {
 					if (is_callable($callback)) {
-						$parameters = array(&$row, &$fields);
+						$parameters = array(&$row, &$fieldList);
 						$row = call_user_func_array($callback, $parameters);
 					} else {
-						$row = $Model->{$callback}($row, $fields);
+						$row = $Model->{$callback}($row, $fieldList);
 					}
 					if (!$row) {
 						continue;
 					}
 				}
 
-				$res = $Model->save($row, $validate, $fields);
+				$res = $Model->save($row, compact('validate', 'fieldList'));
 				if (!$res) {
 					throw new CakeException(print_r($Model->validationErrors, true));
 				}

Model/Behavior/SluggedBehavior.php

@@ -481,7 +481,11 @@ class SluggedBehavior extends ModelBehavior {
 		while ($rows = $Model->find('all', $params)) {
 			foreach ($rows as $row) {
 				$Model->create();
-				if (!$Model->save($row, true, array_merge(array($Model->primaryKey, $slugField), $label))) {
+				$options = array(
+					'validate' => true,
+					'fieldList' => array_merge(array($Model->primaryKey, $slugField), $label)
+				);
+				if (!$Model->save($row, $options)) {
 					throw new RuntimeException(print_r($row[$Model->alias], true) . ': ' . print_r($Model->validationErrors, true));
 				}
 			}

Model/Behavior/SoftDeleteBehavior.php

@@ -155,7 +155,11 @@ class SoftDeleteBehavior extends ModelBehavior {
 
 		$model->create();
 		$model->set($model->primaryKey, $id);
-		return (bool)$model->save(array($model->alias => $data), false, array_keys($data));
+		$options = array(
+			'validate' => false,
+			'fieldList' => array_keys($data)
+		);
+		return (bool)$model->save(array($model->alias => $data), $options);
 	}
 
 	/**
@@ -185,7 +189,11 @@ class SoftDeleteBehavior extends ModelBehavior {
 
 		$model->create();
 		$model->set($model->primaryKey, $id);
-		$result = $model->save(array($model->alias => $data), false, array_keys($data));
+		$options = array(
+			'validate' => false,
+			'fieldList' => array_keys($data)
+		);
+		$result = $model->save(array($model->alias => $data), $options);
 		$this->softDelete($model, $runtime);
 		return $result;
 	}

Model/Behavior/TypographicBehavior.php

@@ -166,7 +166,7 @@ class TypographicBehavior extends ModelBehavior {
 				}
 				if ($changed) {
 					if (!$dryRun) {
-						$Model->save($record, false);
+						$Model->save($record, array('validate' => false));
 					}
 					$count++;
 				}

Model/MyModel.php

@@ -1551,7 +1551,11 @@ class MyModel extends Model {
 	 */
 	public function update($id, $data, $validate = false) {
 		$this->id = $id;
-		return $this->save($data, $validate, array_keys($data));
+		$options = array(
+			'validate' => $validate,
+			'fieldList' => array_keys($data)
+		);
+		return $this->save($data, $options);
 	}
 
 	/**

Test/Case/Controller/Component/Auth/DirectAuthenticateTest.php

@@ -150,7 +150,7 @@ class DirectAuthenticateTest extends CakeTestCase {
 		$PluginModel = ClassRegistry::init('TestPlugin.TestPluginAuthUser');
 		$user['id'] = 1;
 		$user['username'] = 'gwoo';
-		$PluginModel->save($user, false);
+		$PluginModel->save($user, array('validate' => false));
 
 		$this->auth->settings['userModel'] = 'TestPlugin.TestPluginAuthUser';
 		$this->auth->settings['fields']['username'] = 'username';

Test/Case/Model/Behavior/PasswordableBehaviorTest.php

@@ -386,7 +386,8 @@ class PasswordableBehaviorTest extends CakeTestCase {
 		);
 		$this->User->set($data);
 		// Test whitelist setting - only "password" needs to gets auto-added
-		$is = $this->User->save(null, true, array('id', 'pwd', 'pwd_repeat', 'pwd_current'));
+		$options = array('validate' => true, 'fieldList' => array('id', 'pwd', 'pwd_repeat', 'pwd_current'));
+		$is = $this->User->save(null, $options);
 		$this->assertTrue(!empty($is));
 
 		$user = $this->User->get($uid);
@@ -409,7 +410,8 @@ class PasswordableBehaviorTest extends CakeTestCase {
 		// Test whitelist setting - only "password" gets auto-added, pwd, pwd_repeat etc need to be added manually
 		// NOTE that I had to remove the code for adding those fields from the behavior (as it was not functional)
 		// So of course, this won't work now as expected. But feel free to try to add them in the behavior. Results will be the same.
-		$is = $this->User->save(null, true, array('id', 'name'));
+		$options = array('validate' => true, 'fieldList' => array('id', 'name'));
+		$is = $this->User->save(null, $options);
 
 		if ((float)Configure::version() >= 2.5) {
 			// Validation errors triggered - as expected

Test/Case/Model/CodeKeyTest.php

@@ -51,7 +51,7 @@ class CodeKeyTest extends MyCakeTestCase {
 			'key' => 'x'
 		);
 		$this->CodeKey->create();
-		$this->CodeKey->save($data, false);
+		$this->CodeKey->save($data, array('validate' => false));
 		$count = $this->CodeKey->find('count');
 		$this->CodeKey->garbageCollector();
 		$count2 = $this->CodeKey->find('count');

Test/Case/Model/MyModelTest.php

@@ -824,7 +824,7 @@ class MyModelTest extends MyCakeTestCase {
 		$this->Post->create($data);
 		$res = $this->Post->validates();
 		$this->assertTrue($res);
-		$res = $this->Post->save($res, false);
+		$res = $this->Post->save($res, array('validate' => false));
 		$this->assertTrue((bool)$res);
 
 		$this->Post->create();
@@ -844,7 +844,7 @@ class MyModelTest extends MyCakeTestCase {
 		$this->Post->create($data);
 		$res = $this->Post->validates();
 		$this->assertTrue($res);
-		$res = $this->Post->save($res, false);
+		$res = $this->Post->save($res, array('validate' => false));
 		$this->assertTrue((bool)$res);
 
 		$this->Post->create();

Test/Case/Model/TokenTest.php

@@ -51,7 +51,7 @@ class TokenTest extends MyCakeTestCase {
 			'key' => 'x'
 		);
 		$this->Token->create();
-		$this->Token->save($data, false);
+		$this->Token->save($data, array('validate' => false));
 		$count = $this->Token->find('count');
 		$this->Token->garbageCollector();
 		$count2 = $this->Token->find('count');