Don't run validation rules for data that's not getting set. Fixes #1584

Author: lonnieezell

system/Model.php

@@ -727,6 +727,7 @@ public function update($id = null, $data = null)
 		{
 			if ($this->validate($data) === false)
 			{
+				dd($this->errors());
 				return false;
 			}
 		}
@@ -1253,18 +1254,28 @@ public function validate($data): bool
 		{
 			$data = (array) $data;
 		}
-		dd($this->validationRules);
+
+		$rules = $this->validationRules;
+		$rules = $this->cleanValidationRules($rules, $data);
+
+		// If no data existed that needs validation
+		// our job is done here.
+		if (empty($rules))
+		{
+			return true;
+		}
+
 		// ValidationRules can be either a string, which is the group name,
 		// or an array of rules.
-		if (is_string($this->validationRules))
+		if (is_string($rules))
 		{
-			$valid = $this->validation->run($data, $this->validationRules, $this->DBGroup);
+			$valid = $this->validation->run($data, $rules, $this->DBGroup);
 		}
 		else
 		{
 			// Replace any placeholders (i.e. {id}) in the rules with
 			// the value found in $data, if exists.
-			$rules = $this->fillPlaceholders($this->validationRules, $data);
+			$rules = $this->fillPlaceholders($rules, $data);
 
 			$this->validation->setRules($rules, $this->validationMessages);
 			$valid = $this->validation->run($data, null, $this->DBGroup);
@@ -1275,6 +1286,33 @@ public function validate($data): bool
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Removes any rules that apply to fields that have not been set
+	 * currently so that rules don't block updating when only updating
+	 * a partial row.
+	 *
+	 * @param array $rules
+	 *
+	 * @return array
+	 */
+	protected function cleanValidationRules(array $rules, array $data = null)
+	{
+		if (empty($data))
+		{
+			return [];
+		}
+
+		foreach ($rules as $field => $rule)
+		{
+			if (! array_key_exists($field, $data))
+			{
+				unset($rules[$field]);
+			}
+		}
+
+		return $rules;
+	}
+
 	/**
 	 * Replace any placeholders within the rules with the values that
 	 * match the 'key' of any properties being set. For example, if

tests/system/Database/Live/ModelTest.php

@@ -515,17 +515,73 @@ public function testSkipValidation()
 												   ->insert($data));
 	}
 
-	public function testValidationSkipsNonExistingFields()
+	public function testCleanValidationRemovesAllWhenNoDataProvided()
 	{
-		$model = new ValidModel($this->db);
+		$model   = new Model($this->db);
+		$cleaner = $this->getPrivateMethodInvoker($model, 'cleanValidationRules');
+
+		$rules = [
+			'name' => 'required',
+			'foo'  => 'bar',
+		];
+
+		$rules = $cleaner($rules, null);
+
+		$this->assertEmpty($rules);
+	}
+
+	public function testCleanValidationRemovesOnlyForFieldsNotProvided()
+	{
+		$model   = new Model($this->db);
+		$cleaner = $this->getPrivateMethodInvoker($model, 'cleanValidationRules');
+
+		$rules = [
+			'name' => 'required',
+			'foo'  => 'required',
+		];
 
 		$data = [
-			'description' => 'some great marketing stuff',
-			'id'          => 42,
-			'token'       => 42,
+			'foo' => 'bar',
+		];
+
+		$rules = $cleaner($rules, $data);
+
+		$this->assertTrue(array_key_exists('foo', $rules));
+		$this->assertFalse(array_key_exists('name', $rules));
+	}
+
+	public function testCleanValidationReturnsAllWhenAllExist()
+	{
+		$model   = new Model($this->db);
+		$cleaner = $this->getPrivateMethodInvoker($model, 'cleanValidationRules');
+
+		$rules = [
+			'name' => 'required',
+			'foo'  => 'required',
 		];
 
-		$this->assertEquals(5, $model->insert($data));
+		$data = [
+			'foo'  => 'bar',
+			'name' => null,
+		];
+
+		$rules = $cleaner($rules, $data);
+
+		$this->assertTrue(array_key_exists('foo', $rules));
+		$this->assertTrue(array_key_exists('name', $rules));
+	}
+
+	public function testValidationPassesWithMissingFields()
+	{
+		$model = new ValidModel();
+
+		$data = [
+			'foo' => 'bar',
+		];
+
+		$result = $model->validate($data);
+
+		$this->assertTrue($result);
 	}
 
 	//--------------------------------------------------------------------
@@ -893,6 +949,7 @@ public function testUpdateWithValidation()
 		$data['description'] = 'This is a second test!';
 		unset($data['name']);
 
-		$this->assertTrue($model->update($id, $data));
+		$result = $model->update($id, $data);
+		$this->assertTrue($result);
 	}
 }