From da15d40ac696e158a140f1c1031e18f6f7e0b554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Potock=C3=BD?= <potockyjakub@gmail.com>
Date: Thu, 12 Jun 2025 09:59:47 +0200
Subject: [PATCH 1/3] [12.x] Introduce `ComputesOnceableHashInterface`

---
 .../Support/ComputesOnceableHashInterface.php     | 15 +++++++++++++++
 src/Illuminate/Support/Onceable.php               | 13 ++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 src/Illuminate/Contracts/Support/ComputesOnceableHashInterface.php

diff --git a/src/Illuminate/Contracts/Support/ComputesOnceableHashInterface.php b/src/Illuminate/Contracts/Support/ComputesOnceableHashInterface.php
new file mode 100644
index 000000000000..5080d419b790
--- /dev/null
+++ b/src/Illuminate/Contracts/Support/ComputesOnceableHashInterface.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Illuminate\Contracts\Support;
+
+interface ComputesOnceableHashInterface
+{
+    /**
+     * Compute the hash of the onceable dependency.
+     *
+     * @return string
+     */
+    public function computeOnceableHash();
+}
diff --git a/src/Illuminate/Support/Onceable.php b/src/Illuminate/Support/Onceable.php
index 3b55d79227cc..262f623c6344 100644
--- a/src/Illuminate/Support/Onceable.php
+++ b/src/Illuminate/Support/Onceable.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Support;
 
 use Closure;
+use Illuminate\Contracts\Support\ComputesOnceableHashInterface;
 use Laravel\SerializableClosure\Support\ReflectionClosure;
 
 class Onceable
@@ -61,7 +62,17 @@ protected static function hashFromTrace(array $trace, callable $callable)
         }
 
         $uses = array_map(
-            fn (mixed $argument) => is_object($argument) ? spl_object_hash($argument) : $argument,
+            static function (mixed $argument) {
+                if ($argument instanceof ComputesOnceableHashInterface) {
+                    return $argument->computeOnceableHash();
+                }
+
+                if (is_object($argument)) {
+                    return spl_object_hash($argument);
+                }
+
+                return $argument;
+            },
             $callable instanceof Closure ? (new ReflectionClosure($callable))->getClosureUsedVariables() : [],
         );
 

From 49fcd1c524784c7976e840fe6cb222510435adae Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Thu, 12 Jun 2025 09:06:33 -0500
Subject: [PATCH 2/3] formatting

---
 .../Support/ComputesOnceableHashInterface.php     | 15 ---------------
 src/Illuminate/Contracts/Support/HasOnceHash.php  | 15 +++++++++++++++
 src/Illuminate/Support/Onceable.php               |  6 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 src/Illuminate/Contracts/Support/ComputesOnceableHashInterface.php
 create mode 100644 src/Illuminate/Contracts/Support/HasOnceHash.php

diff --git a/src/Illuminate/Contracts/Support/ComputesOnceableHashInterface.php b/src/Illuminate/Contracts/Support/ComputesOnceableHashInterface.php
deleted file mode 100644
index 5080d419b790..000000000000
--- a/src/Illuminate/Contracts/Support/ComputesOnceableHashInterface.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Illuminate\Contracts\Support;
-
-interface ComputesOnceableHashInterface
-{
-    /**
-     * Compute the hash of the onceable dependency.
-     *
-     * @return string
-     */
-    public function computeOnceableHash();
-}
diff --git a/src/Illuminate/Contracts/Support/HasOnceHash.php b/src/Illuminate/Contracts/Support/HasOnceHash.php
new file mode 100644
index 000000000000..7081bee418ff
--- /dev/null
+++ b/src/Illuminate/Contracts/Support/HasOnceHash.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Illuminate\Contracts\Support;
+
+interface HasOnceHash
+{
+    /**
+     * Compute the hash that should be used to represent the object when given to a function using "once".
+     *
+     * @return string
+     */
+    public function onceHash();
+}
diff --git a/src/Illuminate/Support/Onceable.php b/src/Illuminate/Support/Onceable.php
index 262f623c6344..3621e393e39c 100644
--- a/src/Illuminate/Support/Onceable.php
+++ b/src/Illuminate/Support/Onceable.php
@@ -3,7 +3,7 @@
 namespace Illuminate\Support;
 
 use Closure;
-use Illuminate\Contracts\Support\ComputesOnceableHashInterface;
+use Illuminate\Contracts\Support\HasOnceHash;
 use Laravel\SerializableClosure\Support\ReflectionClosure;
 
 class Onceable
@@ -63,8 +63,8 @@ protected static function hashFromTrace(array $trace, callable $callable)
 
         $uses = array_map(
             static function (mixed $argument) {
-                if ($argument instanceof ComputesOnceableHashInterface) {
-                    return $argument->computeOnceableHash();
+                if ($argument instanceof HasOnceHash) {
+                    return $argument->onceHash();
                 }
 
                 if (is_object($argument)) {

From 24c774f5ed4d6d31d0dbbca94317a0875bcec61a Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Thu, 12 Jun 2025 09:07:22 -0500
Subject: [PATCH 3/3] Remove declare

---
 src/Illuminate/Contracts/Support/HasOnceHash.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Illuminate/Contracts/Support/HasOnceHash.php b/src/Illuminate/Contracts/Support/HasOnceHash.php
index 7081bee418ff..e9ec6e59463f 100644
--- a/src/Illuminate/Contracts/Support/HasOnceHash.php
+++ b/src/Illuminate/Contracts/Support/HasOnceHash.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Illuminate\Contracts\Support;
 
 interface HasOnceHash