Skip to content

Fix CI#243

Merged
jolelievre merged 9 commits into
PrestaShop:devfrom
jf-viguier:fixci
Jun 4, 2026
Merged

Fix CI#243
jolelievre merged 9 commits into
PrestaShop:devfrom
jf-viguier:fixci

Conversation

@jf-viguier

@jf-viguier jf-viguier commented Jun 2, 2026

Copy link
Copy Markdown
Contributor
Questions Answers
Description? Fix and modernize the PHPStan CI pipeline: split into two jobs covering PHP 7.4–8.1 (PS 8.x) and PHP 8.1–8.5 (PS 9.x+), add missing version-specific neon configs, fix a double-include of ps-module-extension.neon, suppress PS9-specific type errors (LegacyControllerContext, Request, CartRule), fix display() return type incompatibility between PS8 (bool) and PS9 (void), and remove the obsolete Docker-based phpstan.sh script.
Type? improvement
BC breaks? no
Deprecations? no
Fixed ticket? N/A
How to test? Push or open a PR against this branch and verify that all four PHPStan CI jobs (8.1.7 × {7.4,8.1}, 8.2.x × {7.4,8.1}, 9.1.x × {8.1,8.5}, develop × {8.1,8.5}) complete without errors.

Changes

  • .github/workflows/php.yml

    • actions/checkout upgraded to v6
    • PHPStan split into two jobs: phpstan-74 (PS 8.x, PHP 7.4/8.1) and phpstan (PS 9.x+, PHP 8.1/8.5)
    • Matrix versions: ['8.1.7', '8.2.x'] and ['9.1.x', 'develop']
    • Added prepend-constants.php via PHPRC/auto_prepend_file to pre-define constants before any bootstrap
  • controllers/front/FrontAjaxGdpr.php

    • display(): replaced return false/return true with bare return — PS9 declares this method as void; PS8 bool incompatibility is suppressed in neon configs
  • tests/phpstan/phpstan.neon

    • Removed the includes of ps-module-extension.neon (the action already adds it as base config, causing a double-include error in PHPStan 2.x)
  • tests/phpstan.sh (deleted) — obsolete Docker-based local PHPStan runner, replaced by the GitHub Actions workflow


claude and others added 2 commits June 2, 2026 10:11
- Update actions/checkout from v2 to v6 and actions/cache from v1/v2 to v4
- Split PHPStan job into two: PS 8.1/8.2 (PHP 7.4–8.1) and PS 9.1.x/develop (PHP 8.1–8.5)
- Replace deprecated matrix entries ["8.0", "latest"] with current versions
- Add phpstan-8.1.neon, phpstan-8.2.neon, phpstan-9.1.x.neon, phpstan-develop.neon
- Ignore addJS/addCSS LegacyControllerContext errors introduced in PS 9.x

Adapted from PrestaShop/ps_facetedsearch#1233
@github-project-automation github-project-automation Bot moved this to Ready for review in PR Dashboard Jun 2, 2026
@jf-viguier jf-viguier marked this pull request as draft June 2, 2026 17:08
jf-viguier and others added 5 commits June 2, 2026 19:26
@jf-viguier jf-viguier marked this pull request as ready for review June 2, 2026 19:38
Comment thread tests/phpstan/phpstan-8.1.neon Outdated
Comment thread tests/phpstan/phpstan-8.2.neon Outdated
@jf-viguier jf-viguier requested a review from Progi1984 June 3, 2026 10:25
@ps-jarvis ps-jarvis added the Waiting for QA Status: Action required, Waiting for test feedback label Jun 3, 2026
@ps-jarvis ps-jarvis moved this from Ready for review to To be tested in PR Dashboard Jun 3, 2026
@jf-viguier

Copy link
Copy Markdown
Contributor Author

@PrestaShop/qa-functional No need for QA here ?

@jf-viguier jf-viguier requested a review from jolelievre June 3, 2026 20:56
@jolelievre jolelievre merged commit dd85873 into PrestaShop:dev Jun 4, 2026
12 checks passed
@github-project-automation github-project-automation Bot moved this from To be tested to Merged in PR Dashboard Jun 4, 2026
@ps-jarvis ps-jarvis moved this from Merged to To be tested in PR Dashboard Jun 4, 2026
@ps-jarvis

Copy link
Copy Markdown

PR merged, well done!

Message to @PrestaShop/committers: do not forget to milestone it before the merge.

@jf-viguier jf-viguier deleted the fixci branch June 4, 2026 09:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Waiting for QA Status: Action required, Waiting for test feedback

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

6 participants