From 48295ea4aaadad8e8cc6bbe8864bddf0101b19e3 Mon Sep 17 00:00:00 2001 From: Mikolaj Adamczyk Date: Wed, 8 Jul 2026 15:46:13 +0200 Subject: [PATCH 1/2] Fixed translations (#68) * Fixed translations * CI fixes --- .github/pull_request_template.md | 18 ------ .github/workflows/backend-ci.yaml | 58 ++++++++----------- .../translations/ibexa_search.en.xliff | 34 +++++------ 3 files changed, 41 insertions(+), 69 deletions(-) delete mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index 70ff30a..0000000 --- a/.github/pull_request_template.md +++ /dev/null @@ -1,18 +0,0 @@ -| Question | Answer -| ------------- | --- -| Tickets | [IBX-XXXXX](https://issues.ibexa.co/browse/IBX-XXXXX) -| Bug fix? | yes/no -| New feature? | yes/no -| BC breaks? | yes/no -| Tests pass? | yes/no -| Doc needed? | yes/no -| License | [GPL-2.0](https://github.com/ibexa/search/blob/main/LICENSE) - - - - - - -#### Checklist: -- [ ] Implement tests -- [ ] Coding standards (`$ composer fix-cs`) diff --git a/.github/workflows/backend-ci.yaml b/.github/workflows/backend-ci.yaml index d1362bf..d377b62 100644 --- a/.github/workflows/backend-ci.yaml +++ b/.github/workflows/backend-ci.yaml @@ -10,35 +10,30 @@ on: jobs: cs-fix: name: Run code style check - runs-on: "ubuntu-24.04" + runs-on: "ubuntu-26.04" strategy: matrix: php: - '8.1' steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - - name: Setup PHP Action - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - coverage: none - extensions: 'pdo_sqlite, gd' - tools: cs2pr + - uses: ibexa/gh-workflows/actions/composer-install@main + with: + gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }} + gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }} + satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }} + satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }} - - uses: ramsey/composer-install@v3 - with: - dependency-versions: "highest" + - name: Run code style check + run: composer run-script check-cs -- --format=checkstyle | cs2pr - - name: Run code style check - run: composer run-script check-cs -- --format=checkstyle | cs2pr - - - name: Run PHPStan analysis - run: composer run-script phpstan + - name: Run PHPStan analysis + run: composer run-script phpstan tests: name: Unit tests - runs-on: "ubuntu-24.04" + runs-on: "ubuntu-26.04" timeout-minutes: 15 strategy: @@ -50,22 +45,17 @@ jobs: - '8.4' steps: - - uses: actions/checkout@v6 - - - name: Setup PHP Action - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - coverage: none - extensions: pdo_sqlite, gd - tools: cs2pr + - uses: actions/checkout@v7 - - uses: ramsey/composer-install@v3 - with: - dependency-versions: "highest" + - uses: ibexa/gh-workflows/actions/composer-install@main + with: + gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }} + gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }} + satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }} + satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }} - - name: Setup problem matchers for PHPUnit - run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" + - name: Setup problem matchers for PHPUnit + run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - - name: Run unit test suite - run: composer test + - name: Run unit test suite + run: composer test diff --git a/src/bundle/Resources/translations/ibexa_search.en.xliff b/src/bundle/Resources/translations/ibexa_search.en.xliff index be39cc4..bd36b80 100644 --- a/src/bundle/Resources/translations/ibexa_search.en.xliff +++ b/src/bundle/Resources/translations/ibexa_search.en.xliff @@ -8,7 +8,7 @@ Viewing %viewing% out of %total% items - Viewing %viewing% out of %total% items + Viewing %viewing% out of %total% items key: pagination.viewing @@ -23,17 +23,17 @@ Created - Created + Created key: search.created Creator - Creator + Creator key: search.creator Search results (%total%) - Search results (%total%) + Search results (%total%) key: search.header @@ -43,67 +43,67 @@ Last modified - Last modified + Last modified key: search.last.modified Modified - Modified + Modified key: search.modified Name - Name + Name key: search.name No results found for "%query%". - No results found for "%query%". + No results found for "%query%". key: search.no_result Search - Search + Search key: search.search Section - Section + Section key: search.section All - All + All key: search.section.any Check the spelling of keywords. - Check the spelling of keywords. + Check the spelling of keywords. key: search.tips.check_spelling Try different keywords. - Try different keywords. + Try different keywords. key: search.tips.different_keywords Try fewer keywords. Reducing keywords results in more matches. - Try fewer keywords. Reducing keywords results in more matches. + Try fewer keywords. Reducing keywords results in more matches. key: search.tips.fewer_keywords Some helpful search tips: - Some helpful search tips: + Some helpful search tips: key: search.tips.headline Try more general keywords. - Try more general keywords. + Try more general keywords. key: search.tips.more_general_keywords Translations - Translations + Translations key: search.translations From 351e9f6410f486781479815471a12cc208ec20ca Mon Sep 17 00:00:00 2001 From: mikolaj Date: Wed, 8 Jul 2026 15:58:23 +0200 Subject: [PATCH 2/2] Fixed PHPStan baseline for renamed DataTransformerInterface generic template params symfony/form 7.4.14 renamed the DataTransformerInterface generic template params from T, R to TValue, TTransformedValue, leaving the ignored error patterns for DateIntervalTransformer and UsersTransformer unmatched. --- phpstan-baseline.neon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 868c476..0da652c 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -115,7 +115,7 @@ parameters: path: src/bundle/Form/DataTransformer/DateIntervalTransformer.php - - message: '#^Class Ibexa\\Bundle\\Search\\Form\\DataTransformer\\DateIntervalTransformer implements generic interface Symfony\\Component\\Form\\DataTransformerInterface but does not specify its types\: T, R$#' + message: '#^Class Ibexa\\Bundle\\Search\\Form\\DataTransformer\\DateIntervalTransformer implements generic interface Symfony\\Component\\Form\\DataTransformerInterface but does not specify its types\: TValue, TTransformedValue$#' identifier: missingType.generics count: 1 path: src/bundle/Form/DataTransformer/DateIntervalTransformer.php @@ -145,7 +145,7 @@ parameters: path: src/bundle/Form/DataTransformer/DateIntervalTransformer.php - - message: '#^Class Ibexa\\Bundle\\Search\\Form\\DataTransformer\\UsersTransformer implements generic interface Symfony\\Component\\Form\\DataTransformerInterface but does not specify its types\: T, R$#' + message: '#^Class Ibexa\\Bundle\\Search\\Form\\DataTransformer\\UsersTransformer implements generic interface Symfony\\Component\\Form\\DataTransformerInterface but does not specify its types\: TValue, TTransformedValue$#' identifier: missingType.generics count: 1 path: src/bundle/Form/DataTransformer/UsersTransformer.php