From 64eb6c55086d5bc364cefdd8df882c566db79ca9 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Mon, 25 Jul 2022 13:44:17 +0200 Subject: [PATCH] add PHP CS Fixer dependency --- .php-cs-fixer.php | 13 ++++++++++ Application/Core/redirectControllerTrait.php | 4 ++-- IntelliSenseHelper.php | 24 ++++++++++++++----- .../ArticleListController_PRGredirect.php | 2 +- .../ContactController_PRGredirect.php | 5 ++-- ...ManufacturerListController_PRGredirect.php | 2 +- .../SearchController_PRGredirect.php | 2 +- .../VendorListController_PRGredirect.php | 2 +- Modules/Core/Utils_PRGredirect.php | 6 ++--- composer.json | 8 +++++-- 10 files changed, 48 insertions(+), 20 deletions(-) create mode 100644 .php-cs-fixer.php diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php new file mode 100644 index 0000000..244806f --- /dev/null +++ b/.php-cs-fixer.php @@ -0,0 +1,13 @@ +in(__DIR__) +; + +$config = new PhpCsFixer\Config(); +return $config->setRules([ + '@PHP70Migration' => true, + '@PSR12' => true + ]) + ->setFinder($finder) +; \ No newline at end of file diff --git a/Application/Core/redirectControllerTrait.php b/Application/Core/redirectControllerTrait.php index ce3586b..a5fede4 100644 --- a/Application/Core/redirectControllerTrait.php +++ b/Application/Core/redirectControllerTrait.php @@ -27,7 +27,7 @@ trait redirectControllerTrait $utils = Registry::getUtils(); $this->setFncName(null); - $utils->d3PrgRedirect( $this->generatePageNavigationUrl() ); + $utils->d3PrgRedirect($this->generatePageNavigationUrl()); } } @@ -39,4 +39,4 @@ trait redirectControllerTrait return strtoupper($_SERVER['REQUEST_METHOD']) === 'POST' && Registry::getConfig()->getConfigParam('d3PRGredirect_'.$this->getClassKey()) === true; } -} \ No newline at end of file +} diff --git a/IntelliSenseHelper.php b/IntelliSenseHelper.php index df3054e..584823d 100644 --- a/IntelliSenseHelper.php +++ b/IntelliSenseHelper.php @@ -21,16 +21,28 @@ namespace D3\PRGredirects\Modules\Application\Controllers { use OxidEsales\Eshop\Application\Controller\SearchController; use OxidEsales\Eshop\Application\Controller\VendorListController; - 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 VendorListController_PRGredirect_parent extends VendorListController {} + 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 VendorListController_PRGredirect_parent extends VendorListController + { + } } namespace D3\PRGredirects\Modules\Core { use OxidEsales\Eshop\Core\Utils; - class Utils_PRGredirect_parent extends Utils {} + class Utils_PRGredirect_parent extends Utils + { + } } diff --git a/Modules/Application/Controllers/ArticleListController_PRGredirect.php b/Modules/Application/Controllers/ArticleListController_PRGredirect.php index 192029e..a8a5ef3 100644 --- a/Modules/Application/Controllers/ArticleListController_PRGredirect.php +++ b/Modules/Application/Controllers/ArticleListController_PRGredirect.php @@ -32,4 +32,4 @@ class ArticleListController_PRGredirect extends ArticleListController_PRGredirec return $template; } -} \ No newline at end of file +} diff --git a/Modules/Application/Controllers/ContactController_PRGredirect.php b/Modules/Application/Controllers/ContactController_PRGredirect.php index 7397220..4361785 100644 --- a/Modules/Application/Controllers/ContactController_PRGredirect.php +++ b/Modules/Application/Controllers/ContactController_PRGredirect.php @@ -19,11 +19,10 @@ use D3\PRGredirects\Application\Core\redirectControllerTrait; class ContactController_PRGredirect extends ContactController_PRGredirect_parent { + use redirectControllerTrait; /** @var bool */ private $success = true; - use redirectControllerTrait; - /** * @return bool */ @@ -47,4 +46,4 @@ class ContactController_PRGredirect extends ContactController_PRGredirect_parent return $template; } -} \ No newline at end of file +} diff --git a/Modules/Application/Controllers/ManufacturerListController_PRGredirect.php b/Modules/Application/Controllers/ManufacturerListController_PRGredirect.php index 7b64832..5053691 100644 --- a/Modules/Application/Controllers/ManufacturerListController_PRGredirect.php +++ b/Modules/Application/Controllers/ManufacturerListController_PRGredirect.php @@ -32,4 +32,4 @@ class ManufacturerListController_PRGredirect extends ManufacturerListController_ return $template; } -} \ No newline at end of file +} diff --git a/Modules/Application/Controllers/SearchController_PRGredirect.php b/Modules/Application/Controllers/SearchController_PRGredirect.php index e6e7a06..fab7956 100644 --- a/Modules/Application/Controllers/SearchController_PRGredirect.php +++ b/Modules/Application/Controllers/SearchController_PRGredirect.php @@ -32,4 +32,4 @@ class SearchController_PRGredirect extends SearchController_PRGredirect_parent return $template; } -} \ No newline at end of file +} diff --git a/Modules/Application/Controllers/VendorListController_PRGredirect.php b/Modules/Application/Controllers/VendorListController_PRGredirect.php index cbc8a1b..7b267c8 100644 --- a/Modules/Application/Controllers/VendorListController_PRGredirect.php +++ b/Modules/Application/Controllers/VendorListController_PRGredirect.php @@ -32,4 +32,4 @@ class VendorListController_PRGredirect extends VendorListController_PRGredirect_ return $template; } -} \ No newline at end of file +} diff --git a/Modules/Core/Utils_PRGredirect.php b/Modules/Core/Utils_PRGredirect.php index 266e208..42c12a1 100644 --- a/Modules/Core/Utils_PRGredirect.php +++ b/Modules/Core/Utils_PRGredirect.php @@ -22,17 +22,17 @@ class Utils_PRGredirect extends Utils_PRGredirect_parent { public function d3PrgRedirect($url) { - $url = str_ireplace( "&", "&", $url ); + $url = str_ireplace("&", "&", $url); $headerCode = "HTTP/1.1 303 See Other"; try { $this->_simpleRedirect($url, $headerCode); Registry::getSession()->freeze(); - } catch ( Exception $e ) { + } catch (Exception $e) { $e->debugOut(); } $this->showMessageAndExit(''); } -} \ No newline at end of file +} diff --git a/composer.json b/composer.json index 38e76a6..b455fb5 100644 --- a/composer.json +++ b/composer.json @@ -25,14 +25,18 @@ "GPL-3.0-or-later" ], "require": { - "php": ">=7.0", "oxid-esales/oxideshop-ce": "6.3 - 6.10" }, + "require-dev": { + "oxid-esales/oxideshop-ce": "~6.10.0", + "friendsofphp/php-cs-fixer": "^2.19" + }, "extra": { "oxideshop": { "blacklist-filter": [ "*.md", - "composer.json" + "composer.json", + ".php-cs-fixer.php" ], "target-directory": "d3/prg-redirects" }