Merge pull request #3966 from benjaminbellamy/patch-1

fix: add dot_array_search to required_with and required_without

Author: paulbalandan

system/Validation/Rules.php

@@ -384,18 +384,15 @@ public function required_with($str = null, string $fields = null, array $data =
 
 		foreach ($fields as $field)
 		{
-			if (array_key_exists($field, $data))
+			if (
+				(array_key_exists($field, $data) && ! empty($data[$field])) ||
+				(strpos($field, '.') !== false && ! empty(dot_array_search($field, $data)))	
+			)
 			{
 				$requiredFields[] = $field;
 			}
 		}
 
-		// Remove any keys with empty values since, that means they
-		// weren't truly there, as far as this is concerned.
-		$requiredFields = array_filter($requiredFields, function ($item) use ($data) {
-			return ! empty($data[$item]);
-		});
-
 		return empty($requiredFields);
 	}
 
@@ -438,7 +435,10 @@ public function required_without($str = null, string $fields = null, array $data
 		// any of the fields are not present in $data
 		foreach ($fields as $field)
 		{
-			if (! array_key_exists($field, $data))
+			if (
+				(strpos($field, '.') === false && (! array_key_exists($field, $data) || empty($data[$field]))) ||
+				(strpos($field, '.') !== false && empty(dot_array_search($field, $data)))
+			)
 			{
 				return false;
 			}

tests/system/Validation/RulesTest.php

@@ -1499,7 +1499,7 @@ public function testRequiredWith($field, $check, $expected = false)
 			'foo' => 'bar',
 			'bar' => 'something',
 			'baz' => null,
-			'ar'  => [],// Was running into issues with array values
+			'array'  => ['nonEmptyField1'=>'value1','nonEmptyField2'=>'value2', 'emptyField1'=>null, 'emptyField2'=>null],
 		];
 
 		$this->validation->setRules([
@@ -1544,6 +1544,26 @@ public function requiredWithProvider()
 				null,
 				true,
 			],
+			[
+				'array.emptyField1',
+				'array.emptyField2',
+				true,
+			],
+			[
+				'array.nonEmptyField1',
+				'array.emptyField2',
+				true,
+			],
+			[
+				'array.emptyField1',
+				'array.nonEmptyField2',
+				false,
+			],
+			[
+				'array.nonEmptyField1',
+				'array.nonEmptyField2',
+				true,
+			],
 		];
 	}
 
@@ -1561,6 +1581,7 @@ public function testRequiredWithout($field, $check, $expected = false)
 			'foo' => 'bar',
 			'bar' => 'something',
 			'baz' => null,
+			'array'  => ['nonEmptyField1'=>'value1','nonEmptyField2'=>'value2', 'emptyField1'=>null, 'emptyField2'=>null],
 		];
 
 		$this->validation->setRules([
@@ -1600,6 +1621,26 @@ public function requiredWithoutProvider()
 				null,
 				true,
 			],
+			[
+				'array.emptyField1',
+				'array.emptyField2',
+				false,
+			],
+			[
+				'array.nonEmptyField1',
+				'array.emptyField2',
+				true,
+			],
+			[
+				'array.emptyField1',
+				'array.nonEmptyField2',
+				true,
+			],
+				[
+				'array.nonEmptyField1',
+				'array.nonEmptyField2',
+				true,
+			],			
 		];
 	}