Revert update to Nette 3.0

Author: enumag

composer.json

@@ -14,20 +14,19 @@
     "require": {
         "php": "^7.1.0",
         "codeception/codeception": "^2.3.2",
-        "nette/bootstrap": "^3.0.0",
-        "nette/di": "^3.0.0@dev",
-        "nette/http": "^3.0.0@dev"
+        "nette/bootstrap": "^2.4.0",
+        "nette/di": "^2.4.0",
+        "nette/http": "^2.4.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.8.0",
-        "nette/application": "^3.0.0",
-        "nette/caching": "^3.0.0",
-        "latte/latte": "^3.0.0",
+        "nette/application": "^2.4.0",
+        "nette/caching": "^2.4.0",
+        "latte/latte": "^2.4.0",
         "phpstan/phpstan": "^0.9.0",
         "phpstan/phpstan-nette": "^0.9.0",
         "tracy/tracy": "^2.4.0"
     },
-    "minimum-stability": "alpha",
     "autoload": {
         "psr-4": {
             "Arachne\\Codeception\\": "src"

src/Http/Request.php

@@ -36,17 +36,17 @@ public function reset(): void
         $this->request = $this->factory->createHttpRequest();
     }
 
-    public function getCookie(string $key)
+    public function getCookie($key, $default = null)
     {
-        return $this->request->getCookie($key);
+        return $this->request->getCookie($key, $default);
     }
 
     public function getCookies(): array
     {
         return $this->request->getCookies();
     }
 
-    public function getFile(string $key)
+    public function getFile($key)
     {
         return $this->request->getFile($key);
     }
@@ -56,9 +56,9 @@ public function getFiles(): array
         return $this->request->getFiles();
     }
 
-    public function getHeader(string $header): ?string
+    public function getHeader($header, $default = null): ?string
     {
-        return $this->request->getHeader($header);
+        return $this->request->getHeader($header, $default);
     }
 
     public function getHeaders(): array
@@ -71,12 +71,12 @@ public function getMethod(): string
         return $this->request->getMethod();
     }
 
-    public function getPost(?string $key = null)
+    public function getPost($key = null, $default = null)
     {
         return $this->request->getPost(...func_get_args());
     }
 
-    public function getQuery(?string $key = null)
+    public function getQuery($key = null, $default = null)
     {
         return $this->request->getQuery(...func_get_args());
     }
@@ -106,7 +106,7 @@ public function isAjax(): bool
         return $this->request->isAjax();
     }
 
-    public function isMethod(string $method): bool
+    public function isMethod($method): bool
     {
         return $this->request->isMethod($method);
     }

src/Http/Response.php

@@ -4,8 +4,8 @@
 
 namespace Arachne\Codeception\Http;
 
-use Nette\Http\Helpers;
 use Nette\Http\IResponse;
+use Nette\Http\Response as HttpResponse;
 use Nette\Utils\DateTime;
 
 /**
@@ -31,40 +31,62 @@ public function reset(): void
         $this->headers = [];
     }
 
-    public function setCode(int $code): self
+    /**
+     * @param int $code
+     */
+    public function setCode($code): self
     {
         $this->code = $code;
 
         return $this;
     }
 
-    public function getCode(): int
+    /**
+     * @return int
+     */
+    public function getCode()
     {
         return $this->code;
     }
 
-    public function setHeader(string $name, string $value): self
+    /**
+     * @param string $name
+     * @param string $value
+     */
+    public function setHeader($name, $value): self
     {
         $this->headers[$name] = $value;
 
         return $this;
     }
 
-    public function addHeader(string $name, string $value): self
+    /**
+     * @param string $name
+     * @param string $value
+     */
+    public function addHeader($name, $value): self
     {
         $this->headers[$name] = $value;
 
         return $this;
     }
 
-    public function setContentType(string $type, ?string $charset = null): self
+    /**
+     * @param string $type
+     * @param string $charset
+     */
+    public function setContentType($type, $charset = null): self
     {
         $this->setHeader('Content-Type', $type.($charset ? '; charset='.$charset : ''));
 
         return $this;
     }
 
-    public function redirect(string $url, int $code = self::S302_FOUND): void
+    /**
+     * @param string $url
+     * @param int    $code
+     */
+    public function redirect($url, $code = self::S302_FOUND): void
     {
         $this->setCode($code);
         $this->setHeader('Location', $url);
@@ -84,35 +106,65 @@ public function setExpiration($time): self
 
         $time = DateTime::from($time);
         $this->setHeader('Cache-Control', 'max-age='.($time->format('U') - time()));
-        $this->setHeader('Expires', Helpers::formatDate($time));
+        $this->setHeader('Expires', HttpResponse::date($time));
 
         return $this;
     }
 
-    public function isSent(): bool
+    /**
+     * @return bool
+     */
+    public function isSent()
     {
         return false;
     }
 
-    public function getHeader(string $name): ?string
+    /**
+     * @param string $name
+     * @param mixed  $default
+     *
+     * @return mixed
+     */
+    public function getHeader($name, $default = null)
     {
-        return $this->headers[$name] ?? null;
+        return isset($this->headers[$name]) ? $this->headers[$name] : $default;
     }
 
-    public function getHeaders(): array
+    /**
+     * @return array
+     */
+    public function getHeaders()
     {
         return $this->headers;
     }
 
     /**
+     * @param string              $name
+     * @param string              $value
      * @param string|int|DateTime $time
+     * @param string              $path
+     * @param string              $domain
+     * @param bool                $secure
+     * @param bool                $httpOnly
+     *
+     * @return self
      */
-    public function setCookie(string $name, string $value, $time, ?string $path = null, ?string $domain = null, ?bool $secure = null, ?bool $httpOnly = null, ?string $sameSite = null): self
+    public function setCookie($name, $value, $time, $path = null, $domain = null, $secure = null, $httpOnly = null)
     {
         return $this;
     }
 
-    public function deleteCookie(string $name, ?string $path = null, ?string $domain = null, ?bool $secure = null): void
+    /**
+     * @param string $name
+     * @param string $path
+     * @param string $domain
+     * @param bool   $secure
+     */
+    public function deleteCookie($name, $path = null, $domain = null, $secure = null)
+    {
+    }
+
+    public function removeDuplicateCookies()
     {
     }
 }

tests/functional/src/Fixtures/ArticlePresenter.php

@@ -13,10 +13,10 @@ class ArticlePresenter extends Presenter
 {
     public function actionRedirect(): void
     {
-        $this->redirectPermanent('page');
+        $this->redirect(301, 'page');
     }
 
-    public function formatTemplateFiles(): array
+    public function formatTemplateFiles()
     {
         $name = $this->getName();
         $presenter = substr($name, strrpos(':'.$name, ':'));