Use ?-> instead of optional (#40354)

Author: lucasmichot

src/Illuminate/Database/Concerns/ManagesTransactions.php

@@ -48,7 +48,7 @@ public function transaction(Closure $callback, $attempts = 1)
                 $this->transactions = max(0, $this->transactions - 1);
 
                 if ($this->transactions == 0) {
-                    optional($this->transactionsManager)->commit($this->getName());
+                    $this->transactionsManager?->commit($this->getName());
                 }
             } catch (Throwable $e) {
                 $this->handleCommitTransactionException(
@@ -83,7 +83,7 @@ protected function handleTransactionException(Throwable $e, $currentAttempt, $ma
             $this->transactions > 1) {
             $this->transactions--;
 
-            optional($this->transactionsManager)->rollback(
+            $this->transactionsManager?->rollback(
                 $this->getName(), $this->transactions
             );
 
@@ -116,7 +116,7 @@ public function beginTransaction()
 
         $this->transactions++;
 
-        optional($this->transactionsManager)->begin(
+        $this->transactionsManager?->begin(
             $this->getName(), $this->transactions
         );
 
@@ -194,7 +194,7 @@ public function commit()
         $this->transactions = max(0, $this->transactions - 1);
 
         if ($this->transactions == 0) {
-            optional($this->transactionsManager)->commit($this->getName());
+            $this->transactionsManager?->commit($this->getName());
         }
 
         $this->fireConnectionEvent('committed');
@@ -258,7 +258,7 @@ public function rollBack($toLevel = null)
 
         $this->transactions = $toLevel;
 
-        optional($this->transactionsManager)->rollback(
+        $this->transactionsManager?->rollback(
             $this->getName(), $this->transactions
         );
 
@@ -297,7 +297,7 @@ protected function handleRollBackException(Throwable $e)
         if ($this->causedByLostConnection($e)) {
             $this->transactions = 0;
 
-            optional($this->transactionsManager)->rollback(
+            $this->transactionsManager?->rollback(
                 $this->getName(), $this->transactions
             );
         }

src/Illuminate/Http/Client/PendingRequest.php

@@ -919,7 +919,7 @@ public function buildRecorderHandler()
                 $promise = $handler($request, $options);
 
                 return $promise->then(function ($response) use ($request, $options) {
-                    optional($this->factory)->recordRequestResponsePair(
+                    $this->factory?->recordRequestResponsePair(
                         (new Request($request))->withData($options['laravel_data']),
                         new Response($response)
                     );
@@ -1056,7 +1056,7 @@ public function getPromise()
      */
     protected function dispatchRequestSendingEvent()
     {
-        if ($dispatcher = optional($this->factory)->getDispatcher()) {
+        if ($dispatcher = $this->factory?->getDispatcher()) {
             $dispatcher->dispatch(new RequestSending($this->request));
         }
     }
@@ -1069,7 +1069,7 @@ protected function dispatchRequestSendingEvent()
      */
     protected function dispatchResponseReceivedEvent(Response $response)
     {
-        if (! ($dispatcher = optional($this->factory)->getDispatcher()) ||
+        if (! ($dispatcher = $this->factory?->getDispatcher()) ||
             ! $this->request) {
             return;
         }
@@ -1084,7 +1084,7 @@ protected function dispatchResponseReceivedEvent(Response $response)
      */
     protected function dispatchConnectionFailedEvent()
     {
-        if ($dispatcher = optional($this->factory)->getDispatcher()) {
+        if ($dispatcher = $this->factory?->getDispatcher()) {
             $dispatcher->dispatch(new ConnectionFailed($this->request));
         }
     }

src/Illuminate/Http/Client/Response.php

@@ -137,7 +137,7 @@ public function reason()
      */
     public function effectiveUri()
     {
-        return optional($this->transferStats)->getEffectiveUri();
+        return $this->transferStats?->getEffectiveUri();
     }
 
     /**
@@ -252,7 +252,7 @@ public function cookies()
      */
     public function handlerStats()
     {
-        return optional($this->transferStats)->getHandlerStats() ?? [];
+        return $this->transferStats?->getHandlerStats() ?? [];
     }
 
     /**

src/Illuminate/Session/Middleware/StartSession.php

@@ -95,7 +95,7 @@ protected function handleRequestWhileBlocking(Request $request, $session, Closur
 
             return $this->handleStatefulRequest($request, $session, $next);
         } finally {
-            optional($lock)->release();
+            $lock?->release();
         }
     }
 

src/Illuminate/View/AnonymousComponent.php

@@ -51,7 +51,7 @@ public function data()
         $this->attributes = $this->attributes ?: $this->newAttributeBag();
 
         return array_merge(
-            optional($this->data['attributes'] ?? null)->getAttributes() ?: [],
+            ($this->data['attributes'] ?? null)?->getAttributes() ?: [],
             $this->attributes->getAttributes(),
             $this->data,
             ['attributes' => $this->attributes]

tests/Integration/Http/Fixtures/AuthorResourceWithOptionalRelationship.php

@@ -14,7 +14,7 @@ public function toArray($request)
                 return 'not loaded';
             }),
             'latest_post_title' => $this->whenLoaded('posts', function () {
-                return optional($this->posts->first())->title ?: 'no posts yet';
+                return $this->posts->first()?->title ?: 'no posts yet';
             }, 'not loaded'),
         ];
     }