laravel
diff --git a/Collapse file
‎src/Illuminate/Cache/DatabaseLock.php‎
Copy file name to clipboardExpand all lines: src/Illuminate/Cache/DatabaseLock.php
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file
‎src/Illuminate/Cache/DatabaseLock.php‎
Copy file name to clipboardExpand all lines: src/Illuminate/Cache/DatabaseLock.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file
‎src/Illuminate/Http/Resources/Json/PaginatedResourceResponse.php‎
Copy file name to clipboardExpand all lines: src/Illuminate/Http/Resources/Json/PaginatedResourceResponse.php
+7-1Lines changed: 7 additions & 1 deletion b/Collapse file
‎src/Illuminate/Http/Resources/Json/PaginatedResourceResponse.php‎
Copy file name to clipboardExpand all lines: src/Illuminate/Http/Resources/Json/PaginatedResourceResponse.php
+7-1Lines changed: 7 additions & 1 deletion
diff --git a/Collapse file
‎src/Illuminate/Routing/UrlGenerator.php‎
Copy file name to clipboardExpand all lines: src/Illuminate/Routing/UrlGenerator.php
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎src/Illuminate/Routing/UrlGenerator.php‎
Copy file name to clipboardExpand all lines: src/Illuminate/Routing/UrlGenerator.php
+1-1Lines changed: 1 addition & 1 deletion
@@ -137,11 +137,11 @@ public function forceRelease()
     /**
      * Returns the owner value written into the driver for this lock.
      *
-     * @return string
+     * @return string|null
      */
     protected function getCurrentOwner()
     {
-        return optional($this->connection->table($this->table)->where('key', $this->name)->first())->owner;
+        return $this->connection->table($this->table)->where('key', $this->name)->first()?->owner;
     }
 
     /**
 
@@ -28,7 +28,13 @@ public function toResponse($request)
             $this->resource->jsonOptions()
         ), function ($response) use ($request) {
             $response->original = $this->resource->resource->map(function ($item) {
-                return is_array($item) ? Arr::get($item, 'resource') : optional($item)->resource;
+                if (is_array($item)) {
+                    return Arr::get($item, 'resource');
+                } elseif (is_object($item)) {
+                    return $item->resource ?? null;
+                }
+
+                return null;
             });
 
             $this->resource->withResponse($request, $response);
 
@@ -837,7 +837,7 @@ public function setRequest(Request $request)
         $this->cachedRoot = null;
         $this->cachedScheme = null;
 
-        tap(optional($this->routeGenerator)->defaultParameters ?: [], function ($defaults) {
+        tap($this->routeGenerator?->defaultParameters ?: [], function ($defaults) {
             $this->routeGenerator = null;
 
             if (! empty($defaults)) {
Original file line number	Diff line number	Diff line change
`@@ -137,11 +137,11 @@ public function forceRelease()`
`137`	`137`	`/**`
`138`	`138`	`* Returns the owner value written into the driver for this lock.`
`139`	`139`	`*`
`140`		`- * @return string`
	`140`	`+ * @return string\|null`
`141`	`141`	`*/`
`142`	`142`	`protected function getCurrentOwner()`
`143`	`143`	`{`
`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;`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`/**`