TASK: Reduce breakiness and Increase PhpStan happiness

Author: Bernhard Schmitt

Neos.Flow/Classes/Http/Client/Browser.php

@@ -148,7 +148,7 @@ public function removeAutomaticRequestHeader($name)
      * @throws InfiniteRedirectionException
      * @api
      */
-    public function request(string|UriInterface $uri, $method = 'GET', array $arguments = [], array $files = [], array $server = [], $content = null): ResponseInterface
+    public function request($uri, $method = 'GET', array $arguments = [], array $files = [], array $server = [], $content = null)
     {
         if (is_string($uri)) {
             $uri = new Uri($uri);

Neos.Flow/Classes/Http/Client/CurlEngine.php

@@ -42,9 +42,10 @@ class CurlEngine implements RequestEngineInterface
      *
      * @param integer $optionName One of the CURLOPT_* constants
      * @param mixed $value The value to set
+     * @return void
      * @throws \InvalidArgumentException
      */
-    public function setOption($optionName, $value): void
+    public function setOption($optionName, $value)
     {
         if ($optionName === CURLOPT_HTTPHEADER) {
             throw new InvalidArgumentException("Setting CURL headers is only possible via the request object and not by using the setOption method.", 1633334307);

Neos.Flow/Classes/Http/ContentStream.php

@@ -105,7 +105,7 @@ public function detach()
      * @param string|resource $stream
      * @param string $mode
      */
-    public function replace(mixed $stream, $mode = 'r'): void
+    public function replace($stream, $mode = 'r'): void
     {
         $this->close();
         if (is_string($stream)) {

Neos.Flow/Classes/Http/Cookie.php

@@ -113,8 +113,8 @@ class Cookie
      *
      * @param string $name The cookie name as a valid token (RFC 2616)
      * @param mixed $value The value to store in the cookie. Must be possible to cast into a string.
-     * @param integer|\DateTimeInterface $expires Date and time after which this cookie expires.
-     * @param ?integer $maximumAge Number of seconds until the cookie expires.
+     * @param int|\DateTimeInterface $expires Date and time after which this cookie expires.
+     * @param ?int $maximumAge Number of seconds until the cookie expires.
      * @param ?string $domain The host to which the user agent will send this cookie
      * @param string $path The path describing the scope of this cookie
      * @param boolean $secure If this cookie should only be sent through a "secure" channel by the user agent
@@ -123,21 +123,25 @@ class Cookie
      * @api
      * @throws \InvalidArgumentException
      */
-    public function __construct($name, $value = null, int|\DateTimeInterface $expires = 0, ?int $maximumAge = null, $domain = null, $path = '/', $secure = false, $httpOnly = true, $sameSite = null)
+    public function __construct($name, $value = null, $expires = 0, $maximumAge = null, $domain = null, $path = '/', $secure = false, $httpOnly = true, $sameSite = null)
     {
         if (preg_match(self::PATTERN_TOKEN, $name) !== 1) {
             throw new \InvalidArgumentException('The parameter "name" passed to the Cookie constructor must be a valid token as per RFC 2616, Section 2.2.', 1345101977);
         }
         if ($expires instanceof \DateTimeInterface) {
             $expires = $expires->getTimestamp();
         }
-        if ($maximumAge !== null) {
+        if (!is_int($expires)) {
+            throw new \InvalidArgumentException('The parameter "expires" passed to the Cookie constructor must be a unix timestamp or a DateTimeInterface object.', 1345108785);
+        }
+        /** @phpstan-ignore booleanAnd.alwaysFalse (until $maximumAge is typed ?int in php) */
+        if ($maximumAge !== null && !is_int($maximumAge)) {
             throw new \InvalidArgumentException('The parameter "maximumAge" passed to the Cookie constructor must be an integer value.', 1345108786);
         }
         if ($domain !== null && preg_match(self::PATTERN_DOMAIN, $domain) !== 1) {
             throw new \InvalidArgumentException('The parameter "domain" passed to the Cookie constructor must be a valid domain as per RFC 6265, Section 4.1.2.3.', 1345116246);
         }
-        if (preg_match(self::PATTERN_PATH, $path) !== 1) {
+        if ($path !== null && preg_match(self::PATTERN_PATH, $path) !== 1) {
             throw new \InvalidArgumentException('The parameter "path" passed to the Cookie constructor must be a valid path as per RFC 6265, Section 4.1.1.', 1345123078);
         }
 

Neos.Flow/Classes/Http/Middleware/MiddlewaresChain.php

@@ -31,7 +31,10 @@ final class MiddlewaresChain implements RequestHandlerInterface
      */
     private $stepCallbacks = [];
 
-    public function __construct(MiddlewareInterface ...$middlewaresChain)
+    /**
+     * @param MiddlewareInterface[] $middlewaresChain
+     */
+    public function __construct(array $middlewaresChain)
     {
         $this->chain = $middlewaresChain;
     }

Neos.Flow/Classes/Http/Middleware/MiddlewaresChainFactory.php

@@ -53,6 +53,6 @@ public function create(array $chainConfiguration): MiddlewaresChain
             $middlewaresChain[] = $middleware;
         }
 
-        return new MiddlewaresChain(...$middlewaresChain);
+        return new MiddlewaresChain($middlewaresChain);
     }
 }

Neos.Flow/Classes/Http/RequestHandler.php

@@ -149,8 +149,9 @@ protected function resolveDependencies()
     /**
      * Send the HttpResponse of the component context to the browser and flush all output buffers.
      * @param ResponseInterface $response
+     * @return void
      */
-    protected function sendResponse(ResponseInterface $response): void
+    protected function sendResponse(ResponseInterface $response)
     {
         ob_implicit_flush();
         foreach (ResponseInformationHelper::prepareHeaders($response) as $prepareHeader) {

Neos.Flow/Classes/Http/UploadedFile.php

@@ -73,9 +73,10 @@ public function __construct($streamOrFile, $size, $errorStatus, $clientFilename
      * Depending on the value set file or stream variable
      *
      * @param string|StreamInterface|resource $streamOrFile
+     * @return void
      * @throws InvalidArgumentException
      */
-    protected function setStreamOrFile($streamOrFile): void
+    protected function setStreamOrFile($streamOrFile)
     {
         if (is_string($streamOrFile)) {
             $this->file = $streamOrFile;
@@ -173,21 +174,21 @@ public function getStream()
      * @see http://php.net/is_uploaded_file
      * @see http://php.net/move_uploaded_file
      * @param string $targetPath Path to which to move the uploaded file.
+     * @return void
      * @throws RuntimeException if the upload was not successful.
      * @throws InvalidArgumentException if the $path specified is invalid.
      * @throws RuntimeException on any error during the move operation, or on
      *     the second or subsequent call to the method.
      * @api PSR-7
      */
-    public function moveTo(string $targetPath): void
+    public function moveTo(string $targetPath)
     {
         $this->throwExceptionIfNotAccessible();
 
         if (empty($targetPath)) {
             throw new InvalidArgumentException('Invalid path provided to move uploaded file to. Must be a non-empty string', 1479747624);
         }
 
-        /** @phpstan-ignore identical.alwaysTrue (FLOW_SAPITYPE can also be "Web") */
         if ($this->stream !== null || ($this->file !== null && FLOW_SAPITYPE === 'CLI')) {
             $this->moved = $this->writeFile($targetPath);
         }
@@ -274,9 +275,10 @@ public function getClientMediaType()
     }
 
     /**
+     * @return void
      * @throws RuntimeException if is moved or not ok
      */
-    protected function throwExceptionIfNotAccessible(): void
+    protected function throwExceptionIfNotAccessible()
     {
         if (!$this->isOk()) {
             throw new RuntimeException('UploadedFile has the following error: ' . Files::getUploadErrorMessage($this->error), 1479743608);