Use value() helper in 'when' method to simplify code (#55465)

mohammadrasoulasghari · web-flow · commit 48347e54408a · 2025-04-18T08:44:14.000-04:00
diff --git a/src/Illuminate/Conditionable/Traits/Conditionable.php b/src/Illuminate/Conditionable/Traits/Conditionable.php
@@ -20,7 +20,7 @@ trait Conditionable
      */
     public function when($value = null, ?callable $callback = null, ?callable $default = null)
     {
-        $value = $value instanceof Closure ? $value($this) : $value;
+        $value = value($value, $this);
 
         if (func_num_args() === 0) {
             return new HigherOrderWhenProxy($this);

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ trait Conditionable`
`20`	`20`	`*/`
`21`	`21`	`public function when($value = null, ?callable $callback = null, ?callable $default = null)`
`22`	`22`	`{`
`23`		`- $value = $value instanceof Closure ? $value($this) : $value;`
	`23`	`+ $value = value($value, $this);`
`24`	`24`
`25`	`25`	`if (func_num_args() === 0) {`
`26`	`26`	`return new HigherOrderWhenProxy($this);`