Skip to content

[8.x] Use value helper when applicable #36994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2021
Merged

[8.x] Use value helper when applicable #36994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/Illuminate/Database/Eloquent/Concerns/HidesAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,7 @@ public function makeVisible($attributes)
*/
public function makeVisibleIf($condition, $attributes)
{
$condition = $condition instanceof Closure ? $condition($this) : $condition;

return $condition ? $this->makeVisible($attributes) : $this;
return value($condition, $this) ? $this->makeVisible($attributes) : $this;
}

/**
Expand All @@ -123,8 +121,6 @@ public function makeHidden($attributes)
*/
public function makeHiddenIf($condition, $attributes)
{
$condition = $condition instanceof Closure ? $condition($this) : $condition;

return value($condition) ? $this->makeHidden($attributes) : $this;
return value($condition, $this) ? $this->makeHidden($attributes) : $this;
}
}
7 changes: 1 addition & 6 deletions src/Illuminate/Foundation/Testing/Concerns/InteractsWithViews.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Illuminate\Foundation\Testing\Concerns;

use Closure;
use Illuminate\Support\Facades\View as ViewFacade;
use Illuminate\Support\MessageBag;
use Illuminate\Support\Str;
Expand Down Expand Up @@ -57,11 +56,7 @@ protected function component(string $componentClass, array $data = [])
{
$component = $this->app->make($componentClass, $data);

$view = $component->resolveView();

if ($view instanceof Closure) {
$view = $view($data);
}
$view = value($component->resolveView(), $data);

return $view instanceof View
? new TestView($view->with($component->data()))
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Foundation/helpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ function rescue(callable $callback, $rescue = null, $report = true)
report($e);
}

return $rescue instanceof Closure ? $rescue($e) : $rescue;
return value($rescue, $e);
}
}
}
Expand Down
8 changes: 2 additions & 6 deletions src/Illuminate/View/Concerns/ManagesComponents.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Illuminate\View\Concerns;

use Closure;
use Illuminate\Contracts\Support\Htmlable;
use Illuminate\Contracts\View\View;
use Illuminate\Support\Arr;
Expand Down Expand Up @@ -84,9 +83,7 @@ public function renderComponent()

$data = $this->componentData();

if ($view instanceof Closure) {
$view = $view($data);
}
$view = value($view, $data);

if ($view instanceof View) {
return $view->with($data)->render();
Expand Down Expand Up @@ -151,8 +148,7 @@ public function endSlot()
$this->slotStack[$this->currentComponent()]
);

$this->slots[$this->currentComponent()]
[$currentSlot] = new HtmlString(trim(ob_get_clean()));
$this->slots[$this->currentComponent()][$currentSlot] = new HtmlString(trim(ob_get_clean()));
}

/**
Expand Down