Merge remote-tracking branch 'origin/4.6' into main

# Conflicts: # composer.json
ibexa · Mar 20, 2024 · 3377b4f · 3377b4f
2 parents 163703a + f3cb1bc
commit 3377b4f
Show file tree

Hide file tree

Showing 12 changed files with 127 additions and 415 deletions.
diff --git a/.github/actions/composer-install/action.yaml b/.github/actions/composer-install/action.yaml
@@ -0,0 +1,14 @@
+name: 'Install Composer dependencies'
+description: 'Set Composer root version from branch alias and install dependencies'
+runs:
+    using: "composite"
+    steps:
+        -   run: |
+                version=$(jq -r '.extra | ."branch-alias" | ."dev-main"' < composer.json)
+                echo "version=$version" >> $GITHUB_ENV
+            shell: bash
+        -   uses: ramsey/composer-install@v2
+            with:
+                dependency-versions: "highest"
+            env:
+                COMPOSER_ROOT_VERSION: ${{ env.version }}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -26,9 +26,7 @@ jobs:
                   extensions: 'pdo_sqlite, gd'
                   tools: cs2pr
 
-            - uses: ramsey/composer-install@v2
-              with:
-                  dependency-versions: highest
+            - uses: ./.github/actions/composer-install
 
             - name: Run code style check
               run: composer run-script check-cs -- --format=checkstyle | cs2pr
@@ -57,9 +55,7 @@ jobs:
                   extensions: pdo_sqlite, gd
                   tools: cs2pr
 
-            - uses: ramsey/composer-install@v2
-              with:
-                  dependency-versions: highest
+            - uses: ./.github/actions/composer-install
 
             - name: Setup problem matchers for PHPUnit
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -109,9 +105,7 @@ jobs:
                     extensions: pdo_pgsql, gd
                     tools: cs2pr
 
-            -   uses: ramsey/composer-install@v2
-                with:
-                    dependency-versions: highest
+            -   uses: ./.github/actions/composer-install
 
             -   name: Setup problem matchers for PHPUnit
                 run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -162,9 +156,7 @@ jobs:
                     extensions: pdo_mysql, gd
                     tools: cs2pr
 
-            -   uses: ramsey/composer-install@v2
-                with:
-                    dependency-versions: highest
+            -   uses: ./.github/actions/composer-install
 
             -   name: Setup problem matchers for PHPUnit
                 run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -201,9 +193,7 @@ jobs:
                   php-version: 7.4
                   coverage: none
 
-            - uses: ramsey/composer-install@v2
-              with:
-                  dependency-versions: highest
+            -   uses: ./.github/actions/composer-install
 
             - name: Run integration test suite
               run: composer integration-solr

diff --git a/composer.json b/composer.json
@@ -25,21 +25,25 @@
         "symfony/translation": "^5.0",
         "symfony/translation-contracts": "^2.0",
         "twig/twig": "^3.0",
-        "ibexa/core": "~5.0.0@dev",
-        "ibexa/content-forms": "~5.0.0@dev",
-        "ibexa/rest": "~5.0.0@dev",
-        "ibexa/http-cache": "~5.0.0@dev"
+        "ibexa/core": "~5.0.x-dev",
+        "ibexa/content-forms": "~5.0.x-dev",
+        "ibexa/rest": "~5.0.x-dev",
+        "ibexa/http-cache": "~5.0.x-dev"
     },
     "require-dev": {
         "dama/doctrine-test-bundle": "^6.7.5",
+        "ibexa/admin-ui": "~5.0.x-dev",
         "ibexa/ci-scripts": "^0.2@dev",
-        "ibexa/doctrine-schema": "~5.0.0@dev",
-        "ibexa/solr": "~5.0.0@dev",
+        "ibexa/doctrine-schema": "~5.0.x-dev",
+        "ibexa/search": "~5.0.x-dev",
+        "ibexa/solr": "~5.0.x-dev",
+        "ibexa/test-core": "~5.0.x-dev",
         "phpstan/phpstan": "^1.9",
         "phpstan/phpstan-symfony": "^1.2",
         "phpstan/phpstan-phpunit": "^1.3",
         "phpunit/phpunit": "^9.5",
         "symfony/finder": "^5.0",
+        "symfony/notifier": "^5.4",
         "symfony/proxy-manager-bridge": "^5.3",
         "matthiasnoback/symfony-config-test": "^4.1",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",

diff --git a/phpunit-integration.xml b/phpunit-integration.xml
@@ -13,6 +13,9 @@
     <testsuite name="integration_persistence">
       <directory>tests/integration/Persistence</directory>
     </testsuite>
+    <testsuite name="integration_translation_extraction">
+      <file>tests/integration/TranslationTest.php</file>
+    </testsuite>
   </testsuites>
   <php>
     <env name="DATABASE_URL" value="sqlite://i@i/test.db" />

diff --git a/src/bundle/Resources/translations/alloy_editor.en.xliff b/src/bundle/Resources/translations/alloy_editor.en.xliff
diff --git a/src/bundle/Resources/translations/ck_editor.en.xliff b/src/bundle/Resources/translations/ck_editor.en.xliff
@@ -8,12 +8,12 @@
     <body>
       <trans-unit id="a31bc2d766bef988d3d4e2e0892c79b64d2aadd9" resname="anchor_btn.error.unique">
         <source>Anchor name must be unique.</source>
-        <target>Anchor name must be unique.</target>
+        <target state="new">Anchor name must be unique.</target>
         <note>key: anchor_btn.error.unique</note>
       </trans-unit>
       <trans-unit id="88d893050d5eea476d9559abba8b7cdda519154a" resname="anchor_btn.error.valid">
         <source>A valid anchor link is needed.</source>
-        <target>A valid anchor link is needed.</target>
+        <target state="new">A valid anchor link is needed.</target>
         <note>key: anchor_btn.error.valid</note>
       </trans-unit>
       <trans-unit id="2fec67b71cd77563c4e494477e691ba9661d95fe" resname="anchor_btn.label">