Merge branch '6.4' into 7.0

* 6.4: fix typo Add types to private and internal properties [Workflow] Cleaning code [Scheduler] Fix NPE in debug:scheduler command
symfony · Jul 25, 2023 · f49be6a · f49be6a
2 parents 0d77261 + f6397b7
commit f49be6a
Showing 1 changed file with 9 additions and 34 deletions.
diff --git a/AbstractBrowser.php b/AbstractBrowser.php
@@ -192,11 +192,7 @@ public function getCookieJar(): CookieJar
      */
     public function getCrawler(): Crawler
     {
-        if (null === $this->crawler) {
-            throw new BadMethodCallException(sprintf('The "request()" method must be called before "%s()".', __METHOD__));
-        }
-
-        return $this->crawler;
+        return $this->crawler ?? throw new BadMethodCallException(sprintf('The "request()" method must be called before "%s()".', __METHOD__));
     }
 
     /**
@@ -216,11 +212,7 @@ public function useHtml5Parser(bool $useHtml5Parser): static
      */
     public function getInternalResponse(): Response
     {
-        if (null === $this->internalResponse) {
-            throw new BadMethodCallException(sprintf('The "request()" method must be called before "%s()".', __METHOD__));
-        }
-
-        return $this->internalResponse;
+        return $this->internalResponse ?? throw new BadMethodCallException(sprintf('The "request()" method must be called before "%s()".', __METHOD__));
     }
 
     /**
@@ -233,23 +225,15 @@ public function getInternalResponse(): Response
      */
     public function getResponse(): object
     {
-        if (null === $this->response) {
-            throw new BadMethodCallException(sprintf('The "request()" method must be called before "%s()".', __METHOD__));
-        }
-
-        return $this->response;
+        return $this->response ?? throw new BadMethodCallException(sprintf('The "request()" method must be called before "%s()".', __METHOD__));
     }
 
     /**
      * Returns the current BrowserKit Request instance.
      */
     public function getInternalRequest(): Request
     {
-        if (null === $this->internalRequest) {
-            throw new BadMethodCallException(sprintf('The "request()" method must be called before "%s()".', __METHOD__));
-        }
-
-        return $this->internalRequest;
+        return $this->internalRequest ?? throw new BadMethodCallException(sprintf('The "request()" method must be called before "%s()".', __METHOD__));
     }
 
     /**
@@ -262,11 +246,7 @@ public function getInternalRequest(): Request
      */
     public function getRequest(): object
     {
-        if (null === $this->request) {
-            throw new BadMethodCallException(sprintf('The "request()" method must be called before "%s()".', __METHOD__));
-        }
-
-        return $this->request;
+        return $this->request ?? throw new BadMethodCallException(sprintf('The "request()" method must be called before "%s()".', __METHOD__));
     }
 
     /**
@@ -288,11 +268,9 @@ public function click(Link $link): Crawler
      */
     public function clickLink(string $linkText): Crawler
     {
-        if (null === $this->crawler) {
-            throw new BadMethodCallException(sprintf('The "request()" method must be called before "%s()".', __METHOD__));
-        }
+        $crawler = $this->crawler ?? throw new BadMethodCallException(sprintf('The "request()" method must be called before "%s()".', __METHOD__));
 
-        return $this->click($this->crawler->selectLink($linkText)->link());
+        return $this->click($crawler->selectLink($linkText)->link());
     }
 
     /**
@@ -319,11 +297,8 @@ public function submit(Form $form, array $values = [], array $serverParameters =
      */
     public function submitForm(string $button, array $fieldValues = [], string $method = 'POST', array $serverParameters = []): Crawler
     {
-        if (null === $this->crawler) {
-            throw new BadMethodCallException(sprintf('The "request()" method must be called before "%s()".', __METHOD__));
-        }
-
-        $buttonNode = $this->crawler->selectButton($button);
+        $crawler = $this->crawler ?? throw new BadMethodCallException(sprintf('The "request()" method must be called before "%s()".', __METHOD__));
+        $buttonNode = $crawler->selectButton($button);
 
         if (0 === $buttonNode->count()) {
             throw new InvalidArgumentException(sprintf('There is no button with "%s" as its content, id, value or name.', $button));