[5.6] Use value() helper in whenLoaded()

[rodrigopedra]

When using a resource it can be useful to pass a Closure as the $default value so it is only evaluated if needed.

Currently the ConditionallyLoadsAttributes attributes already uses value($default) when returning the $default value in the ->when() method, but in the other methods it was missing.

My use case:

// in a Resource
    public function toArray( $request )
    {
        return [
            'id'          => $this->resource->id,
            'name'        => $this->resource->name,
            'description' => $this->resource->description,
            'users_count' => $this->whenLoaded('users',
                function () {return $this->resource->users->count();},
                function () {return $this->resource->users()->count();} // not possible today
            )
        ];
    }

[derekmd]

The transform() global helper function already calls the Closure in that $default argument:

        if (is_callable($default)) {
            return $default($value);
        }

>>> transform('', function () { return 'foo'; }, function () { return 'bar'; })
=> "bar"

[rodrigopedra]

Thanks! Pushed a new commit just adding value() helper in the whenLoaded() method

[sisve]

Can you add a test that verifies this new behavior? It will mostly be used to avoid regressions in case someone accidentally removes this code change in the future.

[rodrigopedra]

Hi @sisve , thanks for the suggestion, I wrote some tests to both then when() and whenLoaded() methods to test against default values. If you can review it I'll appreciate.