Remove redundant check

driesvints · driesvints · commit 86fd558b4e5d · 2021-04-27T16:01:46.000+02:00
diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -1516,7 +1516,7 @@ protected function prepareValuesAndOther($parameters)
             $values = $this->convertValuesToBoolean($values);
         }
 
-        if ($this->shouldConvertToNull($parameters[0]) || is_null($other)) {
+        if (is_null($other)) {
             $values = $this->convertValuesToNull($values);
         }
 
@@ -1534,17 +1534,6 @@ protected function shouldConvertToBoolean($parameter)
         return in_array('boolean', Arr::get($this->rules, $parameter, []));
     }
 
-    /**
-     * Check if parameter should be converted to null.
-     *
-     * @param  string  $parameter
-     * @return bool
-     */
-    protected function shouldConvertToNull($parameter)
-    {
-        return in_array('nullable', Arr::get($this->rules, $parameter, []));
-    }
-
     /**
      * Convert the given values to boolean if they are string "true" / "false".
      *
@@ -1573,11 +1562,7 @@ protected function convertValuesToBoolean($values)
     protected function convertValuesToNull($values)
     {
         return array_map(function ($value) {
-            if ($value === 'null') {
-                return null;
-            }
-
-            return $value;
+            return Str::lower($value) === 'null' ? null : $value;
         }, $values);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1516,7 +1516,7 @@ protected function prepareValuesAndOther($parameters)`
`1516`	`1516`	`$values = $this->convertValuesToBoolean($values);`
`1517`	`1517`	`}`
`1518`	`1518`
`1519`		`- if ($this->shouldConvertToNull($parameters[0]) \|\| is_null($other)) {`
	`1519`	`+ if (is_null($other)) {`
`1520`	`1520`	`$values = $this->convertValuesToNull($values);`
`1521`	`1521`	`}`
`1522`	`1522`
`@@ -1534,17 +1534,6 @@ protected function shouldConvertToBoolean($parameter)`
`1534`	`1534`	`return in_array('boolean', Arr::get($this->rules, $parameter, []));`
`1535`	`1535`	`}`
`1536`	`1536`
`1537`		`- /**`
`1538`		`- * Check if parameter should be converted to null.`
`1539`		`- *`
`1540`		`- * @param string $parameter`
`1541`		`- * @return bool`
`1542`		`- */`
`1543`		`- protected function shouldConvertToNull($parameter)`
`1544`		`- {`
`1545`		`- return in_array('nullable', Arr::get($this->rules, $parameter, []));`
`1546`		`- }`
`1547`		`-`
`1548`	`1537`	`/**`
`1549`	`1538`	`* Convert the given values to boolean if they are string "true" / "false".`
`1550`	`1539`	`*`
`@@ -1573,11 +1562,7 @@ protected function convertValuesToBoolean($values)`
`1573`	`1562`	`protected function convertValuesToNull($values)`
`1574`	`1563`	`{`
`1575`	`1564`	`return array_map(function ($value) {`
`1576`		`- if ($value === 'null') {`
`1577`		`- return null;`
`1578`		`- }`
`1579`		`-`
`1580`		`- return $value;`
	`1565`	`+ return Str::lower($value) === 'null' ? null : $value;`
`1581`	`1566`	`}, $values);`
`1582`	`1567`	`}`
`1583`	`1568`