From 01de4ae2298f19ad40515df526ad54a5b5e0e575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Attali?= Date: Sat, 22 Nov 2025 14:36:56 +0100 Subject: [PATCH 1/6] Fix SonarQube token --- .github/workflows/code_checks.yaml | 2 +- .gitignore | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/code_checks.yaml b/.github/workflows/code_checks.yaml index 7796be1..d923e01 100644 --- a/.github/workflows/code_checks.yaml +++ b/.github/workflows/code_checks.yaml @@ -68,4 +68,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - uses: sonarsource/sonarcloud-github-action@v2 + uses: SonarSource/sonarqube-scan-action@v6 diff --git a/.gitignore b/.gitignore index c7f6ec3..ff80e3b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ composer.lock # php-cs-fixer .php-cs-fixer.cache + +.idea From 650f8662b9a4d156e496a99c8a5b14fd17fe4452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Attali?= Date: Sat, 22 Nov 2025 14:40:02 +0100 Subject: [PATCH 2/6] Add no security blocking flag --- .github/workflows/code_checks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code_checks.yaml b/.github/workflows/code_checks.yaml index d923e01..38eea9c 100644 --- a/.github/workflows/code_checks.yaml +++ b/.github/workflows/code_checks.yaml @@ -49,7 +49,7 @@ jobs: composer global config --no-plugins allow-plugins.symfony/flex true composer global require --no-progress --no-scripts --no-plugins symfony/flex composer config minimum-stability ${{ matrix.minimum-stability }} - composer update --no-interaction --prefer-dist + composer update --no-interaction --prefer-dist --no-security-blocking - name: PHP-CS-Fixer continue-on-error: ${{ !matrix.is-current }} From 5ce5cc824f11f9ce470e63f700a7c881b88435f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Attali?= Date: Sat, 22 Nov 2025 14:47:06 +0100 Subject: [PATCH 3/6] Add 7.4.* code checks --- .github/workflows/code_checks.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/code_checks.yaml b/.github/workflows/code_checks.yaml index 38eea9c..1ab9686 100644 --- a/.github/workflows/code_checks.yaml +++ b/.github/workflows/code_checks.yaml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['8.2'] + php: [8.2] stability: [prefer-stable] minimum-stability: [stable] symfony-version: [7.0.*] @@ -26,6 +26,10 @@ jobs: - php: '8.4' symfony-version: 7.0.* stability: prefer-stable + - php: '8.4' + symfony-version: 7.4.* + stability: prefer-stable + minimum-stability: dev name: PHP ${{ matrix.php }} - ${{ matrix.symfony-version }} - ${{ matrix.stability }} steps: From 6005b4d72093b9e107997a06050b34cb28c2702d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Attali?= Date: Sat, 22 Nov 2025 14:53:32 +0100 Subject: [PATCH 4/6] Fix deprecated rules --- .php-cs-fixer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index 4165641..efa0cc1 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -11,8 +11,8 @@ '@Symfony:risky' => true, '@PSR1' => true, - '@PER-CS2.0' => true, - '@PER-CS2.0:risky' => true, + '@PER-CS2x0' => true, + '@PER-CS2x0:risky' => true, 'php_unit_internal_class' => false, 'php_unit_test_class_requires_covers' => false, From 2fadc9f49a0cb21a48e09284b627f201eb5f407b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Attali?= Date: Sat, 22 Nov 2025 15:01:27 +0100 Subject: [PATCH 5/6] Fix phpstan TreeBuilder error --- src/DependencyInjection/Configuration.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 79954db..a783009 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -14,6 +14,9 @@ */ class Configuration implements ConfigurationInterface { + /** + * @return TreeBuilder<'array'> + */ public function getConfigTreeBuilder(): TreeBuilder { return new TreeBuilder('calendar'); From 0f150303d9ea4d426a27a5efd06573c987e9ea7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Attali?= Date: Sat, 22 Nov 2025 15:05:08 +0100 Subject: [PATCH 6/6] Fix phpcsfixer rule does not exist --- .github/workflows/code_checks.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/code_checks.yaml b/.github/workflows/code_checks.yaml index 1ab9686..dcb964d 100644 --- a/.github/workflows/code_checks.yaml +++ b/.github/workflows/code_checks.yaml @@ -18,7 +18,7 @@ jobs: stability: [prefer-stable] minimum-stability: [stable] symfony-version: [7.0.*] - is-current: [true] + is-current: [false] include: - php: '8.3' symfony-version: 7.0.* @@ -30,6 +30,7 @@ jobs: symfony-version: 7.4.* stability: prefer-stable minimum-stability: dev + is-current: true name: PHP ${{ matrix.php }} - ${{ matrix.symfony-version }} - ${{ matrix.stability }} steps: