diff --git a/Application/Core/redirectControllerTrait.php b/Application/Core/redirectControllerTrait.php index a5fede4..68ca4de 100644 --- a/Application/Core/redirectControllerTrait.php +++ b/Application/Core/redirectControllerTrait.php @@ -20,13 +20,16 @@ use OxidEsales\Eshop\Core\Registry; trait redirectControllerTrait { - protected function d3DoPRGRedirect() + /** + * @return void + */ + protected function d3DoPRGRedirect(): void { if ($this->d3ShouldDoPRGredirect()) { /** @var Utils_PRGredirect $utils */ $utils = Registry::getUtils(); - $this->setFncName(null); + $this->setFncName(''); $utils->d3PrgRedirect($this->generatePageNavigationUrl()); } } diff --git a/Modules/Core/Utils_PRGredirect.php b/Modules/Core/Utils_PRGredirect.php index 42c12a1..c30c42d 100644 --- a/Modules/Core/Utils_PRGredirect.php +++ b/Modules/Core/Utils_PRGredirect.php @@ -15,12 +15,16 @@ declare(strict_types=1); namespace D3\PRGredirects\Modules\Core; -use Exception; +use OxidEsales\Eshop\Core\Exception\StandardException; use OxidEsales\Eshop\Core\Registry; class Utils_PRGredirect extends Utils_PRGredirect_parent { - public function d3PrgRedirect($url) + /** + * @param string $url + * @return void + */ + public function d3PrgRedirect(string $url): void { $url = str_ireplace("&", "&", $url); $headerCode = "HTTP/1.1 303 See Other"; @@ -29,7 +33,7 @@ class Utils_PRGredirect extends Utils_PRGredirect_parent $this->_simpleRedirect($url, $headerCode); Registry::getSession()->freeze(); - } catch (Exception $e) { + } catch (StandardException $e) { $e->debugOut(); } diff --git a/phpstan.neon b/phpstan.neon index 2c922fe..9c98f3a 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -4,5 +4,5 @@ parameters: paths: - Application - Modules - level: 0 - phpVersion: 80000 + level: 9 + phpVersion: 70100