From e028eed675f0ee13e24b92de6e54a1293d6aec86 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Wed, 30 Jul 2025 08:28:15 +0200 Subject: [PATCH 1/2] Release 1.2.1 --- CHANGELOG.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0fa639..7d0e8bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,9 +11,16 @@ Versioning](https://semver.org/spec/v2.0.0.html). ### Updated + +## [1.2.1] + - Update GitHub workflows runner images - D10 compatibility - updating RequestStack +## [1.2.0] + +- Drupal 10 compatibility + ## [1.1.3] ### Updated @@ -44,7 +51,9 @@ Versioning](https://semver.org/spec/v2.0.0.html). - Added OS2Forms sync module -[Unreleased]: https://github.com/itk-dev/os2forms_sync/compare/1.1.3...HEAD +[Unreleased]: https://github.com/itk-dev/os2forms_sync/compare/1.2.1...HEAD +[1.2.1]: https://github.com/itk-dev/os2forms_sync/compare/1.2.0...1.2.1 +[1.2.0]: https://github.com/itk-dev/os2forms_sync/compare/1.1.3...1.2.0 [1.1.3]: https://github.com/itk-dev/os2forms_sync/compare/1.1.2...1.1.3 [1.1.2]: https://github.com/itk-dev/os2forms_sync/compare/1.1.1...1.1.2 [1.1.1]: https://github.com/itk-dev/os2forms_sync/compare/1.1.0...1.1.1 From a6ed4220855bcfed4b9716bda007c461101de2c5 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Wed, 30 Jul 2025 08:38:41 +0200 Subject: [PATCH 2/2] Updates image versions and actions --- .github/workflows/pr.yaml | 8 ++++---- CHANGELOG.md | 1 - README.md | 12 ++++++------ src/Controller/WebformController.php | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 2cf59f8..e7ed253 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [ '8.1' ] + php-versions: [ '8.3' ] dependency-version: [ prefer-lowest, prefer-stable ] steps: - uses: actions/checkout@master @@ -55,7 +55,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [ '8.1' ] + php-versions: [ '8.3' ] dependency-version: [ prefer-lowest, prefer-stable ] steps: - uses: actions/checkout@master @@ -88,7 +88,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [ '8.1' ] + php-versions: [ '8.3' ] dependency-version: [ prefer-lowest, prefer-stable ] steps: - uses: actions/checkout@master @@ -113,7 +113,7 @@ jobs: run: | # We need a Drupal project to run drupal-check (cf. https://github.com/mglaman/drupal-check#usage) # Install Drupal - composer --no-interaction create-project drupal/recommended-project:^9 --stability=dev drupal + composer --no-interaction create-project drupal/recommended-project:^10 --stability=dev drupal # Copy our module source code into the Drupal module folder. mkdir -p drupal/web/modules/contrib/os2forms_sync cp -r os2forms_sync.* composer.json src drupal/web/modules/contrib/os2forms_sync diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d0e8bc..63f298f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,6 @@ Versioning](https://semver.org/spec/v2.0.0.html). ### Updated - ## [1.2.1] - Update GitHub workflows runner images diff --git a/README.md b/README.md index 04c6d49..3ff1166 100644 --- a/README.md +++ b/README.md @@ -32,16 +32,16 @@ drush os2forms-sync:import --help ## Coding standards ```sh -docker run --rm --interactive --tty --volume ${PWD}:/app itkdev/php8.1-fpm:latest composer install -docker run --rm --interactive --tty --volume ${PWD}:/app itkdev/php8.1-fpm:latest composer coding-standards-check +docker run --rm --interactive --tty --volume ${PWD}:/app itkdev/php8.3-fpm:latest composer install +docker run --rm --interactive --tty --volume ${PWD}:/app itkdev/php8.3-fpm:latest composer coding-standards-check -docker run --rm --interactive --tty --volume ${PWD}:/app node:18 yarn --cwd /app install -docker run --rm --interactive --tty --volume ${PWD}:/app node:18 yarn --cwd /app coding-standards-check +docker run --rm --interactive --tty --volume ${PWD}:/app node:20 yarn --cwd /app install +docker run --rm --interactive --tty --volume ${PWD}:/app node:20 yarn --cwd /app coding-standards-check ``` ## Code analysis ```sh -docker run --rm --interactive --tty --volume ${PWD}:/app itkdev/php8.1-fpm:latest composer install -docker run --rm --interactive --tty --volume ${PWD}:/app itkdev/php8.1-fpm:latest composer code-analysis +docker run --rm --interactive --tty --volume ${PWD}:/app itkdev/php8.3-fpm:latest composer install +docker run --rm --interactive --tty --volume ${PWD}:/app itkdev/php8.3-fpm:latest composer code-analysis ``` diff --git a/src/Controller/WebformController.php b/src/Controller/WebformController.php index 5f0f08d..c4e3233 100644 --- a/src/Controller/WebformController.php +++ b/src/Controller/WebformController.php @@ -126,7 +126,7 @@ public function index(): array { $form = $this->webformHelper->getSubmissionForm($attributes['elements']); // Make sure that the form cannot be submitted (hopefully). $form['#attributes']['onsubmit'] = 'return false'; - $renderedForm = $this->renderer->renderPlain($form); + $renderedForm = $this->renderer->renderInIsolation($form); } catch (\Throwable $t) { $form = [ @@ -137,7 +137,7 @@ public function index(): array { ], ], ]; - $renderedForm = $this->renderer->renderPlain($form); + $renderedForm = $this->renderer->renderInIsolation($form); } $sourceUrl = $webform->sourceUrl;