Add return types, round 1

symfony · Jul 13, 2021 · 3b2fe57 · 3b2fe57
1 parent ab2c46b
commit 3b2fe57
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/InputBag.php b/InputBag.php
@@ -84,7 +84,7 @@ public function set(string $key, mixed $value)
     /**
      * {@inheritdoc}
      */
-    public function filter(string $key, mixed $default = null, int $filter = \FILTER_DEFAULT, mixed $options = [])
+    public function filter(string $key, mixed $default = null, int $filter = \FILTER_DEFAULT, mixed $options = []): mixed
     {
         $value = $this->has($key) ? $this->all()[$key] : $default;
 

diff --git a/Request.php b/Request.php
@@ -507,9 +507,6 @@ public function __clone()
         $this->headers = clone $this->headers;
     }
 
-    /**
-     * Returns the request as a string.
-     */
     public function __toString(): string
     {
         $content = $this->getContent();
@@ -901,7 +898,7 @@ public function getBaseUrl()
      *
      * @return string The raw URL (i.e. not urldecoded)
      */
-    private function getBaseUrlReal()
+    private function getBaseUrlReal(): string
     {
         if (null === $this->baseUrl) {
             $this->baseUrl = $this->prepareBaseUrl();
@@ -2007,7 +2004,7 @@ private function getUrlencodedPrefix(string $string, string $prefix): ?string
         return null;
     }
 
-    private static function createRequestFromFactory(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null): self
+    private static function createRequestFromFactory(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null): static
     {
         if (self::$requestFactory) {
             $request = (self::$requestFactory)($query, $request, $attributes, $cookies, $files, $server, $content);

diff --git a/Session/SessionBagProxy.php b/Session/SessionBagProxy.php
@@ -88,7 +88,7 @@ public function getStorageKey(): string
     /**
      * {@inheritdoc}
      */
-    public function clear()
+    public function clear(): mixed
     {
         return $this->bag->clear();
     }

diff --git a/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -373,11 +373,7 @@ public function __construct(string $driverName = null, int $errorMode = null)
         $this->errorMode = null !== $errorMode ?: \PDO::ERRMODE_EXCEPTION;
     }
 
-    /**
-     * @return mixed
-     */
-    #[\ReturnTypeWillChange]
-    public function getAttribute($attribute)
+    public function getAttribute($attribute): mixed
     {
         if (\PDO::ATTR_ERRMODE === $attribute) {
             return $this->errorMode;