From 8f73fef5d7b9289f268b6346dc207fb488adbff3 Mon Sep 17 00:00:00 2001 From: condor2 Date: Thu, 4 Jan 2024 13:44:11 +0200 Subject: [PATCH] Updated phpstan & php-cs-fixer versions in Lint.yml (#13389) Co-authored-by: Anders Jenbo --- .github/workflows/Lint.yml | 4 ++-- upload/admin/controller/marketplace/modification.php | 4 ++-- upload/catalog/controller/cms/comment.php | 2 +- upload/catalog/language/en-gb/cms/comment.php | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/Lint.yml b/.github/workflows/Lint.yml index d0b3d7fb37c..20c8d724240 100644 --- a/.github/workflows/Lint.yml +++ b/.github/workflows/Lint.yml @@ -52,12 +52,12 @@ jobs: - name: PHPStan run: | - composer require --dev phpstan/phpstan 1.10.41 + composer require --dev phpstan/phpstan 1.10.50 ./system/storage/vendor/bin/phpstan analyze --no-progress - name: Code style if: matrix.php == '8.3' run: | - composer require --dev friendsofphp/php-cs-fixer v3.41.1 + composer require --dev friendsofphp/php-cs-fixer v3.46.0 ./system/storage/vendor/bin/php-cs-fixer fix --dry-run --diff --ansi || true ./system/storage/vendor/bin/php-cs-fixer fix --dry-run --format=checkstyle | cs2pr diff --git a/upload/admin/controller/marketplace/modification.php b/upload/admin/controller/marketplace/modification.php index 9ae54e3dd14..ca7fa4ab31c 100644 --- a/upload/admin/controller/marketplace/modification.php +++ b/upload/admin/controller/marketplace/modification.php @@ -236,7 +236,7 @@ public function refresh(): void { if (is_file($file)) { unlink($file); - // If directory use the remove directory function + // If directory use the remove directory function } elseif (is_dir($file)) { rmdir($file); } @@ -643,7 +643,7 @@ public function clear(): void { if (is_file($file)) { unlink($file); - // If directory use the remove directory function + // If directory use the remove directory function } elseif (is_dir($file)) { rmdir($file); } diff --git a/upload/catalog/controller/cms/comment.php b/upload/catalog/controller/cms/comment.php index 8ad48069e19..c621ef77e23 100644 --- a/upload/catalog/controller/cms/comment.php +++ b/upload/catalog/controller/cms/comment.php @@ -307,7 +307,7 @@ public function add(): void { } } - $this->load->model('cms/article'); + $this->load->model('cms/article'); $article_info = $this->model_cms_article->getArticle($article_id); diff --git a/upload/catalog/language/en-gb/cms/comment.php b/upload/catalog/language/en-gb/cms/comment.php index 1ed59e31c38..2c92503c7d5 100644 --- a/upload/catalog/language/en-gb/cms/comment.php +++ b/upload/catalog/language/en-gb/cms/comment.php @@ -37,4 +37,3 @@ $_['error_interval'] = 'Warning: you must wait %s minutes before making another comment!'; $_['error_login'] = 'You must login to comment on the article or rate it!'; $_['error_status'] = 'Comments are disabled!'; -