[9.x] Universal HigherOrderWhenProxy (#37632)

* [9.x] Universal HigherOrderWhenProxy

* StyleCI

* Replace by-reference variables with exceptions

Author: inxilpro

Enumerable.php

@@ -271,11 +271,11 @@ public function filter(callable $callback = null);
      * Apply the callback if the value is truthy.
      *
      * @param  bool  $value
-     * @param  callable  $callback
+     * @param  callable|null  $callback
      * @param  callable|null  $default
      * @return static|mixed
      */
-    public function when($value, callable $callback, callable $default = null);
+    public function when($value, callable $callback = null, callable $default = null);
 
     /**
      * Apply the callback if the collection is empty.

HigherOrderWhenProxy.php

@@ -2,17 +2,14 @@
 
 namespace Illuminate\Support;
 
-/**
- * @mixin \Illuminate\Support\Enumerable
- */
 class HigherOrderWhenProxy
 {
     /**
-     * The collection being operated on.
+     * The target being conditionally operated on.
      *
-     * @var \Illuminate\Support\Enumerable
+     * @var mixed
      */
-    protected $collection;
+    protected $target;
 
     /**
      * The condition for proxying.
@@ -24,31 +21,31 @@ class HigherOrderWhenProxy
     /**
      * Create a new proxy instance.
      *
-     * @param  \Illuminate\Support\Enumerable  $collection
+     * @param  mixed  $target
      * @param  bool  $condition
      * @return void
      */
-    public function __construct(Enumerable $collection, $condition)
+    public function __construct($target, $condition)
     {
+        $this->target = $target;
         $this->condition = $condition;
-        $this->collection = $collection;
     }
 
     /**
-     * Proxy accessing an attribute onto the collection.
+     * Proxy accessing an attribute onto the target.
      *
      * @param  string  $key
      * @return mixed
      */
     public function __get($key)
     {
         return $this->condition
-            ? $this->collection->{$key}
-            : $this->collection;
+            ? $this->target->{$key}
+            : $this->target;
     }
 
     /**
-     * Proxy a method call onto the collection.
+     * Proxy a method call on the target.
      *
      * @param  string  $method
      * @param  array  $parameters
@@ -57,7 +54,7 @@ public function __get($key)
     public function __call($method, $parameters)
     {
         return $this->condition
-            ? $this->collection->{$method}(...$parameters)
-            : $this->collection;
+            ? $this->target->{$method}(...$parameters)
+            : $this->target;
     }
 }

Traits/EnumeratesValues.php

@@ -11,7 +11,6 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Enumerable;
 use Illuminate\Support\HigherOrderCollectionProxy;
-use Illuminate\Support\HigherOrderWhenProxy;
 use JsonSerializable;
 use Symfony\Component\VarDumper\VarDumper;
 use Traversable;
@@ -45,6 +44,8 @@
  */
 trait EnumeratesValues
 {
+    use Conditionable;
+
     /**
      * The methods that can be proxied.
      *
@@ -453,29 +454,6 @@ public function sum($callback = null)
         }, 0);
     }
 
-    /**
-     * Apply the callback if the value is truthy.
-     *
-     * @param  bool|mixed  $value
-     * @param  callable|null  $callback
-     * @param  callable|null  $default
-     * @return static|mixed
-     */
-    public function when($value, callable $callback = null, callable $default = null)
-    {
-        if (! $callback) {
-            return new HigherOrderWhenProxy($this, $value);
-        }
-
-        if ($value) {
-            return $callback($this, $value);
-        } elseif ($default) {
-            return $default($this, $value);
-        }
-
-        return $this;
-    }
-
     /**
      * Apply the callback if the collection is empty.
      *
@@ -500,19 +478,6 @@ public function whenNotEmpty(callable $callback, callable $default = null)
         return $this->when($this->isNotEmpty(), $callback, $default);
     }
 
-    /**
-     * Apply the callback if the value is falsy.
-     *
-     * @param  bool  $value
-     * @param  callable  $callback
-     * @param  callable|null  $default
-     * @return static|mixed
-     */
-    public function unless($value, callable $callback, callable $default = null)
-    {
-        return $this->when(! $value, $callback, $default);
-    }
-
     /**
      * Apply the callback unless the collection is empty.
      *