More short closures + isset instead of null checks + etc.

Author: nicolas-grekas

BinaryFileResponse.php

@@ -293,7 +293,7 @@ public function sendContent(): static
     {
         try {
             if (!$this->isSuccessful()) {
-                return parent::sendContent();
+                return $this;
             }
 
             if (0 === $this->maxlen) {

Request.php

@@ -279,16 +279,16 @@ public function initialize(array $query = [], array $request = [], array $attrib
         $this->headers = new HeaderBag($this->server->getHeaders());
 
         $this->content = $content;
-        $this->languages = null;
-        $this->charsets = null;
-        $this->encodings = null;
-        $this->acceptableContentTypes = null;
-        $this->pathInfo = null;
-        $this->requestUri = null;
-        $this->baseUrl = null;
-        $this->basePath = null;
-        $this->method = null;
-        $this->format = null;
+        unset($this->languages);
+        unset($this->charsets);
+        unset($this->encodings);
+        unset($this->acceptableContentTypes);
+        unset($this->pathInfo);
+        unset($this->requestUri);
+        unset($this->baseUrl);
+        unset($this->basePath);
+        unset($this->method);
+        unset($this->format);
     }
 
     /**
@@ -465,16 +465,16 @@ public function duplicate(array $query = null, array $request = null, array $att
             $dup->server = new ServerBag($server);
             $dup->headers = new HeaderBag($dup->server->getHeaders());
         }
-        $dup->languages = null;
-        $dup->charsets = null;
-        $dup->encodings = null;
-        $dup->acceptableContentTypes = null;
-        $dup->pathInfo = null;
-        $dup->requestUri = null;
-        $dup->baseUrl = null;
-        $dup->basePath = null;
-        $dup->method = null;
-        $dup->format = null;
+        unset($dup->languages);
+        unset($dup->charsets);
+        unset($dup->encodings);
+        unset($dup->acceptableContentTypes);
+        unset($dup->pathInfo);
+        unset($dup->requestUri);
+        unset($dup->baseUrl);
+        unset($dup->basePath);
+        unset($dup->method);
+        unset($dup->format);
 
         if (!$dup->get('_format') && $this->get('_format')) {
             $dup->attributes->set('_format', $this->get('_format'));
@@ -1179,7 +1179,7 @@ public function getHost(): string
      */
     public function setMethod(string $method)
     {
-        $this->method = null;
+        unset($this->method);
         $this->server->set('REQUEST_METHOD', $method);
     }
 
@@ -1198,7 +1198,7 @@ public function setMethod(string $method)
      */
     public function getMethod(): string
     {
-        if (null !== $this->method) {
+        if (isset($this->method)) {
             return $this->method;
         }
 
@@ -1246,7 +1246,7 @@ public function getRealMethod(): string
      */
     public function getMimeType(string $format): ?string
     {
-        if (null === static::$formats) {
+        if (!isset(static::$formats)) {
             static::initializeFormats();
         }
 
@@ -1260,7 +1260,7 @@ public function getMimeType(string $format): ?string
      */
     public static function getMimeTypes(string $format): array
     {
-        if (null === static::$formats) {
+        if (!isset(static::$formats)) {
             static::initializeFormats();
         }
 
@@ -1277,7 +1277,7 @@ public function getFormat(?string $mimeType): ?string
             $canonicalMimeType = trim(substr($mimeType, 0, $pos));
         }
 
-        if (null === static::$formats) {
+        if (!isset(static::$formats)) {
             static::initializeFormats();
         }
 
@@ -1302,7 +1302,7 @@ public function getFormat(?string $mimeType): ?string
      */
     public function setFormat(?string $format, string|array $mimeTypes)
     {
-        if (null === static::$formats) {
+        if (!isset(static::$formats)) {
             static::initializeFormats();
         }
 
@@ -1583,13 +1583,13 @@ public function isNoCache(): bool
      */
     public function getPreferredFormat(?string $default = 'html'): ?string
     {
-        if (null !== $this->preferredFormat || null !== $this->preferredFormat = $this->getRequestFormat(null)) {
-            return $this->preferredFormat;
+        if (isset($this->preferredFormat) || null !== $preferredFormat = $this->getRequestFormat(null)) {
+            return $this->preferredFormat ??= $preferredFormat;
         }
 
         foreach ($this->getAcceptableContentTypes() as $mimeType) {
-            if ($this->preferredFormat = $this->getFormat($mimeType)) {
-                return $this->preferredFormat;
+            if ($preferredFormat = $this->getFormat($mimeType)) {
+                return $this->preferredFormat = $preferredFormat;
             }
         }
 
@@ -1636,7 +1636,7 @@ public function getPreferredLanguage(array $locales = null): ?string
      */
     public function getLanguages(): array
     {
-        if (null !== $this->languages) {
+        if (isset($this->languages)) {
             return $this->languages;
         }
 
@@ -1677,11 +1677,7 @@ public function getLanguages(): array
      */
     public function getCharsets(): array
     {
-        if (null !== $this->charsets) {
-            return $this->charsets;
-        }
-
-        return $this->charsets = array_map('strval', array_keys(AcceptHeader::fromString($this->headers->get('Accept-Charset'))->all()));
+        return $this->charsets ??= array_map('strval', array_keys(AcceptHeader::fromString($this->headers->get('Accept-Charset'))->all()));
     }
 
     /**
@@ -1691,11 +1687,7 @@ public function getCharsets(): array
      */
     public function getEncodings(): array
     {
-        if (null !== $this->encodings) {
-            return $this->encodings;
-        }
-
-        return $this->encodings = array_map('strval', array_keys(AcceptHeader::fromString($this->headers->get('Accept-Encoding'))->all()));
+        return $this->encodings ??= array_map('strval', array_keys(AcceptHeader::fromString($this->headers->get('Accept-Encoding'))->all()));
     }
 
     /**
@@ -1705,11 +1697,7 @@ public function getEncodings(): array
      */
     public function getAcceptableContentTypes(): array
     {
-        if (null !== $this->acceptableContentTypes) {
-            return $this->acceptableContentTypes;
-        }
-
-        return $this->acceptableContentTypes = array_map('strval', array_keys(AcceptHeader::fromString($this->headers->get('Accept'))->all()));
+        return $this->acceptableContentTypes ??= array_map('strval', array_keys(AcceptHeader::fromString($this->headers->get('Accept'))->all()));
     }
 
     /**

StreamedResponse.php

@@ -51,7 +51,7 @@ public function __construct(callable $callback = null, int $status = 200, array
      */
     public function setCallback(callable $callback): static
     {
-        $this->callback = $callback;
+        $this->callback = $callback(...);
 
         return $this;
     }
@@ -90,8 +90,8 @@ public function sendContent(): static
 
         $this->streamed = true;
 
-        if (null === $this->callback) {
-            throw new \LogicException('The Response callback must not be null.');
+        if (!isset($this->callback)) {
+            throw new \LogicException('The Response callback must be set.');
         }
 
         ($this->callback)();