Skip to content

Commit ed061e2

Browse files
authored
[12.x] Remove calls to optional() (#58027)
* remove optional * falsy check * last one * types
1 parent 607e835 commit ed061e2

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

src/Illuminate/Cache/DatabaseLock.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ public function forceRelease()
137137
/**
138138
* Returns the owner value written into the driver for this lock.
139139
*
140-
* @return string
140+
* @return string|null
141141
*/
142142
protected function getCurrentOwner()
143143
{
144-
return optional($this->connection->table($this->table)->where('key', $this->name)->first())->owner;
144+
return $this->connection->table($this->table)->where('key', $this->name)->first()?->owner;
145145
}
146146

147147
/**

src/Illuminate/Http/Resources/Json/PaginatedResourceResponse.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,13 @@ public function toResponse($request)
2828
$this->resource->jsonOptions()
2929
), function ($response) use ($request) {
3030
$response->original = $this->resource->resource->map(function ($item) {
31-
return is_array($item) ? Arr::get($item, 'resource') : optional($item)->resource;
31+
if (is_array($item)) {
32+
return Arr::get($item, 'resource');
33+
} elseif (is_object($item)) {
34+
return $item->resource ?? null;
35+
}
36+
37+
return null;
3238
});
3339

3440
$this->resource->withResponse($request, $response);

src/Illuminate/Routing/UrlGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@ public function setRequest(Request $request)
837837
$this->cachedRoot = null;
838838
$this->cachedScheme = null;
839839

840-
tap(optional($this->routeGenerator)->defaultParameters ?: [], function ($defaults) {
840+
tap($this->routeGenerator?->defaultParameters ?: [], function ($defaults) {
841841
$this->routeGenerator = null;
842842

843843
if (! empty($defaults)) {

0 commit comments

Comments
 (0)