From 620289237de11944cda0e259f8c9283e19329ddf Mon Sep 17 00:00:00 2001 From: Vincent QUATREVIEUX Date: Thu, 19 Mar 2026 16:08:57 +0100 Subject: [PATCH 1/7] chore: Compatibility with bdf-form v2.0 (#FRAM-222) --- .github/workflows/php.yml | 44 +++++++++++++++++++++++++++ Tests/Forms/MyConstraintValidator.php | 2 +- composer.json | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 841bf16..ce8470b 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -65,3 +65,47 @@ jobs: - name: Run test suite run: composer run-script tests + + bdf_form_compatibility: + runs-on: ubuntu-latest + strategy: + matrix: + form-versions: + - package: '1.0' + php: '8.0' + - package: '1.1' + php: '8.0' + - package: '1.2' + php: '8.0' + - package: '1.3' + php: '8.0' + - package: '1.4' + php: '8.0' + - package: '1.6' + php: '8.0' + - package: '1.7' + php: '8.4' + - package: '2.0' + php: '8.4' + name: Compatibility with b2pweb/bdf-form ${{ matrix.form-versions.package }} + + steps: + - uses: actions/checkout@v2 + + - name: Set Timezone + uses: szenius/set-timezone@v1.0 + with: + timezoneLinux: "Europe/Paris" + + - name: Install PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.form-versions.php }} + extensions: json + ini-values: date.timezone=Europe/Paris + + - name: Install dependencies + run: composer req --dev 'b2pweb/bdf-form:~${{ matrix.form-versions.package }}.0' --prefer-dist --no-progress + + - name: Run test suite + run: composer run-script tests diff --git a/Tests/Forms/MyConstraintValidator.php b/Tests/Forms/MyConstraintValidator.php index 59719d3..af78342 100644 --- a/Tests/Forms/MyConstraintValidator.php +++ b/Tests/Forms/MyConstraintValidator.php @@ -19,7 +19,7 @@ public function __construct(A $a) $this->a = $a; } - public function validate($value, Constraint $constraint) + public function validate($value, Constraint $constraint): void { self::$injectedParameter = $this->a; } diff --git a/composer.json b/composer.json index bb70106..575ac59 100755 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "minimum-stability": "dev", "require": { "php": "~7.2 | ~8.0", - "b2pweb/bdf-form": "~1.0", + "b2pweb/bdf-form": "~1.0|~2.0", "symfony/config": "~5.0|~6.0|~7.0", "symfony/dependency-injection": "~5.0|~6.0|~7.0", "symfony/framework-bundle": "~5.0|~6.0|~7.0" From 3022ea497ddc91766e1c9026dbb26d3f0bf2e763 Mon Sep 17 00:00:00 2001 From: Vincent QUATREVIEUX Date: Thu, 19 Mar 2026 16:17:03 +0100 Subject: [PATCH 2/7] ci: disable fail-fast --- .github/workflows/php.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index ce8470b..995c2f3 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -69,6 +69,7 @@ jobs: bdf_form_compatibility: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: form-versions: - package: '1.0' From e3fb4b79b1bf67b18808c965997114857b80638f Mon Sep 17 00:00:00 2001 From: Vincent QUATREVIEUX Date: Thu, 19 Mar 2026 16:19:23 +0100 Subject: [PATCH 3/7] ci: try fix bdf form compatibility job --- .github/workflows/php.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 995c2f3..ec58259 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -106,6 +106,9 @@ jobs: ini-values: date.timezone=Europe/Paris - name: Install dependencies + run: composer install --prefer-dist --no-progress + + - name: Install bdf form run: composer req --dev 'b2pweb/bdf-form:~${{ matrix.form-versions.package }}.0' --prefer-dist --no-progress - name: Run test suite From ed89052113ad3ea78003889a1cf7404eb90a9429 Mon Sep 17 00:00:00 2001 From: Vincent QUATREVIEUX Date: Thu, 19 Mar 2026 16:27:22 +0100 Subject: [PATCH 4/7] ci: try something --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index ec58259..2e18d59 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -109,7 +109,7 @@ jobs: run: composer install --prefer-dist --no-progress - name: Install bdf form - run: composer req --dev 'b2pweb/bdf-form:~${{ matrix.form-versions.package }}.0' --prefer-dist --no-progress + run: composer req --dev 'b2pweb/bdf-form:~${{ matrix.form-versions.package }}.0' - name: Run test suite run: composer run-script tests From 5c5b077977ff16437c65f61cb59ceb7ff6e4ce61 Mon Sep 17 00:00:00 2001 From: Vincent QUATREVIEUX Date: Thu, 19 Mar 2026 16:29:13 +0100 Subject: [PATCH 5/7] ci: try something --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 2e18d59..b9f42ed 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -109,7 +109,7 @@ jobs: run: composer install --prefer-dist --no-progress - name: Install bdf form - run: composer req --dev 'b2pweb/bdf-form:~${{ matrix.form-versions.package }}.0' + run: composer req --dev -W 'b2pweb/bdf-form:~${{ matrix.form-versions.package }}.0' - name: Run test suite run: composer run-script tests From 8af1ad65f511d47434f347514161d2d190c128d7 Mon Sep 17 00:00:00 2001 From: Vincent QUATREVIEUX Date: Thu, 19 Mar 2026 16:30:37 +0100 Subject: [PATCH 6/7] ci: debug --- .github/workflows/php.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index b9f42ed..f893be7 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -108,8 +108,8 @@ jobs: - name: Install dependencies run: composer install --prefer-dist --no-progress - - name: Install bdf form - run: composer req --dev -W 'b2pweb/bdf-form:~${{ matrix.form-versions.package }}.0' +# - name: Install bdf form +# run: composer req --dev -W 'b2pweb/bdf-form:~${{ matrix.form-versions.package }}.0' - name: Run test suite run: composer run-script tests From 6ceb8b672fb05912a01bc680a2325599427a055b Mon Sep 17 00:00:00 2001 From: Vincent QUATREVIEUX Date: Thu, 19 Mar 2026 16:33:25 +0100 Subject: [PATCH 7/7] ci: set bdf-form version using sed --- .github/workflows/php.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index f893be7..d4b833c 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -105,11 +105,12 @@ jobs: extensions: json ini-values: date.timezone=Europe/Paris + - name: Set bdf-form version + run: | + sed -i "s/\"b2pweb\/bdf-form\": \".*\"/\"b2pweb\/bdf-form\": \"~${{ matrix.form-versions.package }}.0\"/g" composer.json + - name: Install dependencies run: composer install --prefer-dist --no-progress -# - name: Install bdf form -# run: composer req --dev -W 'b2pweb/bdf-form:~${{ matrix.form-versions.package }}.0' - - name: Run test suite run: composer run-script tests