Added passing loaded relationship to value callback (#50167)

laravel · Feb 21, 2024 · f7c57c4 · f7c57c4
1 parent 500fb9f
commit f7c57c4
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Illuminate/Http/Resources/ConditionallyLoadsAttributes.php b/src/Illuminate/Http/Resources/ConditionallyLoadsAttributes.php
@@ -266,15 +266,17 @@ protected function whenLoaded($relationship, $value = null, $default = null)
             return value($default);
         }
 
+        $loadedValue = $this->resource->{$relationship};
+
         if (func_num_args() === 1) {
-            return $this->resource->{$relationship};
+            return $loadedValue;
         }
 
-        if ($this->resource->{$relationship} === null) {
+        if ($loadedValue === null) {
             return;
         }
 
-        return value($value);
+        return value($value, $loadedValue);
     }
 
     /**