add PHP CS Fixer dependency

This commit is contained in:
Daniel Seifert 2022-07-25 13:44:17 +02:00
parent c5a029e495
commit 64eb6c5508
Signed by: DanielS
GPG Key ID: 8A7C4C6ED1915C6F
10 changed files with 48 additions and 20 deletions

13
.php-cs-fixer.php Normal file
View File

@ -0,0 +1,13 @@
<?php
$finder = PhpCsFixer\Finder::create()
->in(__DIR__)
;
$config = new PhpCsFixer\Config();
return $config->setRules([
'@PHP70Migration' => true,
'@PSR12' => true
])
->setFinder($finder)
;

View File

@ -27,7 +27,7 @@ trait redirectControllerTrait
$utils = Registry::getUtils(); $utils = Registry::getUtils();
$this->setFncName(null); $this->setFncName(null);
$utils->d3PrgRedirect( $this->generatePageNavigationUrl() ); $utils->d3PrgRedirect($this->generatePageNavigationUrl());
} }
} }
@ -39,4 +39,4 @@ trait redirectControllerTrait
return strtoupper($_SERVER['REQUEST_METHOD']) === 'POST' && return strtoupper($_SERVER['REQUEST_METHOD']) === 'POST' &&
Registry::getConfig()->getConfigParam('d3PRGredirect_'.$this->getClassKey()) === true; Registry::getConfig()->getConfigParam('d3PRGredirect_'.$this->getClassKey()) === true;
} }
} }

View File

@ -21,16 +21,28 @@ namespace D3\PRGredirects\Modules\Application\Controllers {
use OxidEsales\Eshop\Application\Controller\SearchController; use OxidEsales\Eshop\Application\Controller\SearchController;
use OxidEsales\Eshop\Application\Controller\VendorListController; use OxidEsales\Eshop\Application\Controller\VendorListController;
class ArticleListController_PRGredirect_parent extends ArticleListController {} class ArticleListController_PRGredirect_parent extends ArticleListController
class ContactController_PRGredirect_parent extends ContactController {} {
class ManufacturerListController_PRGredirect_parent extends ManufacturerListController {} }
class SearchController_PRGredirect_parent extends SearchController {} class ContactController_PRGredirect_parent extends ContactController
class VendorListController_PRGredirect_parent extends VendorListController {} {
}
class ManufacturerListController_PRGredirect_parent extends ManufacturerListController
{
}
class SearchController_PRGredirect_parent extends SearchController
{
}
class VendorListController_PRGredirect_parent extends VendorListController
{
}
} }
namespace D3\PRGredirects\Modules\Core { namespace D3\PRGredirects\Modules\Core {
use OxidEsales\Eshop\Core\Utils; use OxidEsales\Eshop\Core\Utils;
class Utils_PRGredirect_parent extends Utils {} class Utils_PRGredirect_parent extends Utils
{
}
} }

View File

@ -32,4 +32,4 @@ class ArticleListController_PRGredirect extends ArticleListController_PRGredirec
return $template; return $template;
} }
} }

View File

@ -19,11 +19,10 @@ use D3\PRGredirects\Application\Core\redirectControllerTrait;
class ContactController_PRGredirect extends ContactController_PRGredirect_parent class ContactController_PRGredirect extends ContactController_PRGredirect_parent
{ {
use redirectControllerTrait;
/** @var bool */ /** @var bool */
private $success = true; private $success = true;
use redirectControllerTrait;
/** /**
* @return bool * @return bool
*/ */
@ -47,4 +46,4 @@ class ContactController_PRGredirect extends ContactController_PRGredirect_parent
return $template; return $template;
} }
} }

View File

@ -32,4 +32,4 @@ class ManufacturerListController_PRGredirect extends ManufacturerListController_
return $template; return $template;
} }
} }

View File

@ -32,4 +32,4 @@ class SearchController_PRGredirect extends SearchController_PRGredirect_parent
return $template; return $template;
} }
} }

View File

@ -32,4 +32,4 @@ class VendorListController_PRGredirect extends VendorListController_PRGredirect_
return $template; return $template;
} }
} }

View File

@ -22,17 +22,17 @@ class Utils_PRGredirect extends Utils_PRGredirect_parent
{ {
public function d3PrgRedirect($url) public function d3PrgRedirect($url)
{ {
$url = str_ireplace( "&amp;", "&", $url ); $url = str_ireplace("&amp;", "&", $url);
$headerCode = "HTTP/1.1 303 See Other"; $headerCode = "HTTP/1.1 303 See Other";
try { try {
$this->_simpleRedirect($url, $headerCode); $this->_simpleRedirect($url, $headerCode);
Registry::getSession()->freeze(); Registry::getSession()->freeze();
} catch ( Exception $e ) { } catch (Exception $e) {
$e->debugOut(); $e->debugOut();
} }
$this->showMessageAndExit(''); $this->showMessageAndExit('');
} }
} }

View File

@ -25,14 +25,18 @@
"GPL-3.0-or-later" "GPL-3.0-or-later"
], ],
"require": { "require": {
"php": ">=7.0",
"oxid-esales/oxideshop-ce": "6.3 - 6.10" "oxid-esales/oxideshop-ce": "6.3 - 6.10"
}, },
"require-dev": {
"oxid-esales/oxideshop-ce": "~6.10.0",
"friendsofphp/php-cs-fixer": "^2.19"
},
"extra": { "extra": {
"oxideshop": { "oxideshop": {
"blacklist-filter": [ "blacklist-filter": [
"*.md", "*.md",
"composer.json" "composer.json",
".php-cs-fixer.php"
], ],
"target-directory": "d3/prg-redirects" "target-directory": "d3/prg-redirects"
} }