Merge branch 'master' of https://github.com/opencart/opencart

mhcwebdesign · Jan 4, 2024 · 32b2d20 · 32b2d20
2 parents 241592d + 8f73fef
commit 32b2d20
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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/language/en-gb/cms/comment.php b/upload/catalog/language/en-gb/cms/comment.php
@@ -39,4 +39,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!';
-