Merge branch '2.3' of ezsystems/ezplatform-query-fieldtype into main (#…

…10)

Merge up of ezsystems/ezplatform-query-fieldtype#62

.github/workflows/browser-tests.yaml

@@ -0,0 +1,19 @@
+name: Browser tests
+
+on:
+    push:
+        branches:
+            - main
+            - '[0-9]+.[0-9]+'
+    pull_request: ~
+
+jobs:
+    query-fieldtype:
+        name: "Page Builder browser tests"
+        uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
+        with:
+            project-edition: 'oss'
+            project-version: '^4.0.x-dev'
+            test-suite:  '--profile=browser --suite=admin-ui --tags=@contentQuery'
+        secrets:
+            SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/ci.yaml

@@ -0,0 +1,72 @@
+name: CI
+
+on:
+    push:
+        branches:
+            - main
+            - '[0-9]+.[0-9]+'
+    pull_request: ~
+
+jobs:
+    cs-fix:
+        name: Run code style check
+        runs-on: "ubuntu-20.04"
+        strategy:
+            matrix:
+                php:
+                    - '8.0'
+        steps:
+            - uses: actions/checkout@v2
+
+            - name: Setup PHP Action
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  coverage: none
+                  extensions: 'pdo_sqlite, gd'
+                  tools: cs2pr
+
+            - uses: "ramsey/composer-install@v1"
+              with:
+                  dependency-versions: "highest"
+
+            - name: Run code style check
+              run: composer run-script check-cs -- --format=checkstyle | cs2pr
+
+    tests:
+        name: Unit tests
+        runs-on: "ubuntu-20.04"
+        timeout-minutes: 15
+
+        strategy:
+            fail-fast: false
+            matrix:
+                php:
+                    - '7.4'
+                    - '8.0'
+                composer-options: [ "" ]
+                include:
+                    - php: '8.1'
+                      composer-options: "--ignore-platform-req php"
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - name: Setup PHP Action
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  coverage: none
+                  extensions: pdo_sqlite, gd
+                  tools: cs2pr
+
+            - uses: "ramsey/composer-install@v1"
+              with:
+                  dependency-versions: "highest"
+                  composer-options: "${{ matrix.composer-options }}"
+
+            - name: Setup problem matchers for PHPUnit
+              run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+            - name: Run unit test suite
+              run: composer test

.github/workflows/cross-merge.yaml

@@ -0,0 +1,12 @@
+name: Ibexa Reusable / Cross Org PR
+
+on:
+  push:
+    branches-ignore:
+      - "temp_*"
+
+jobs:
+  call:
+    uses: ibexa/gh-workflows/.github/workflows/cross-merge.yml@main
+    secrets:
+      robot-token: ${{ secrets.EZROBOT_PAT }}

.php-cs-fixer.php

@@ -21,6 +21,7 @@
                 array_filter([
                     __DIR__ . '/src',
                     __DIR__ . '/tests',
+                    __DIR__ . '/spec',
                 ], 'is_dir')
             )
             ->files()->name('*.php')

composer.json

@@ -54,19 +54,23 @@
         "ibexa/search": "^4.0@dev",
         "ibexa/user": "^4.0@dev",
         "ibexa/http-cache": "^4.0@dev",
-        "phpspec/phpspec": "^6.0",
+        "phpspec/phpspec": "^7.1",
         "ibexa/code-style": "^1.0",
         "friendsofphp/php-cs-fixer": "^3.0"
     },
     "scripts": {
-        "fix-cs": [
-            "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots",
-            "php-cs-fixer --ansi fix --config=.php-cs-fixer-spec.php -v --show-progress=dots"
-        ]
+        "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots",
+        "check-cs": "@fix-cs --dry-run",
+        "test": "phpspec run --format=pretty"
     },
     "extra": {
         "branch-alias": {
             "dev-main": "4.0.x-dev"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true
+        }
     }
 }