Once Remember Null Values (#53949)

laravel · Dec 17, 2024 · aec8ad4 · aec8ad4
1 parent 3ac290c
commit aec8ad4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/Illuminate/Support/Once.php b/src/Illuminate/Support/Once.php
@@ -57,14 +57,14 @@ public function value(Onceable $onceable)
 
         $hash = $onceable->hash;
 
-        if (isset($this->values[$object][$hash])) {
-            return $this->values[$object][$hash];
-        }
-
         if (! isset($this->values[$object])) {
             $this->values[$object] = [];
         }
 
+        if (array_key_exists($hash, $this->values[$object])) {
+            return $this->values[$object][$hash];
+        }
+
         return $this->values[$object][$hash] = call_user_func($onceable->callable);
     }
 

diff --git a/tests/Support/OnceTest.php b/tests/Support/OnceTest.php
@@ -343,6 +343,26 @@ public function testGlobalClosures()
 
         $this->assertNotSame($first, $third);
     }
+
+    public function testMemoizationNullValues()
+    {
+        $instance = new class
+        {
+            public $i = 0;
+
+            public function null()
+            {
+                return once(function () {
+                    $this->i++;
+
+                    return null;
+                });
+            }
+        };
+
+        $this->assertSame($instance->null(), $instance->null());
+        $this->assertSame(1, $instance->i);
+    }
 }
 
 $letter = 'a';