Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,6 @@ jobs:
php: ${{ fromJSON(github.event_name == 'pull_request' && '["8.2","8.5"]' || '["8.2","8.3","8.4","8.5"]') }}
shard:
- graphql-doctrine
- misc
include:
- php: '8.5'
shard: graphql-doctrine
Expand Down Expand Up @@ -494,7 +493,6 @@ jobs:
run: |
case "${{ matrix.shard }}" in
graphql-doctrine) paths="features/graphql features/doctrine" ;;
misc) paths="features/filter features/issues features/security features/serializer features/http_cache features/sub_resources features/json features/xml features/push_relations features/mercure" ;;
esac
echo "paths=$paths" >> $GITHUB_OUTPUT
- name: Run Behat tests (PHP ${{ matrix.php }} ${{ matrix.shard }})
Expand Down Expand Up @@ -824,7 +822,7 @@ jobs:
continue-on-error: true

elasticsearch:
name: Behat (PHP ${{ matrix.php }}) (Elasticsearch ${{ matrix.elasticsearch-version }})
name: PHPUnit (PHP ${{ matrix.php }}) (Elasticsearch ${{ matrix.elasticsearch-version }})
runs-on: ubuntu-22.04
timeout-minutes: 20
strategy:
Expand Down Expand Up @@ -888,11 +886,11 @@ jobs:
fi
- name: Clear test app cache
run: tests/Fixtures/app/console cache:clear --ansi
- name: Run Behat tests
run: vendor/bin/behat --out=std --format=progress --profile=elasticsearch --no-interaction
- name: Run PHPUnit tests
run: vendor/bin/phpunit tests/Functional/Elasticsearch/

opensearch:
name: Behat (PHP ${{ matrix.php }}) (OpenSearch ${{ matrix.opensearch-version }})
name: PHPUnit (PHP ${{ matrix.php }}) (OpenSearch ${{ matrix.opensearch-version }})
runs-on: ubuntu-22.04
timeout-minutes: 20
strategy:
Expand Down Expand Up @@ -946,8 +944,8 @@ jobs:
composer require --dev opensearch-project/opensearch-php "^2.5" -W
- name: Clear test app cache
run: tests/Fixtures/app/console cache:clear --ansi
- name: Run Behat tests
run: vendor/bin/behat --out=std --format=progress --profile=opensearch --no-interaction
- name: Run PHPUnit tests
run: vendor/bin/phpunit tests/Functional/Elasticsearch/

phpunit-no-deprecations:
name: PHPUnit (PHP ${{ matrix.php }}) (no deprecations)
Expand Down
43 changes: 0 additions & 43 deletions behat.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -92,36 +92,6 @@ mercure:
filters:
tags: '@mercure'

elasticsearch:
suites:
default: false
elasticsearch: &elasticsearch-suite
paths:
- '%paths.base%/features/elasticsearch'
contexts:
- 'ApiPlatform\Tests\Behat\CommandContext'
- 'ApiPlatform\Tests\Behat\ElasticsearchContext'
- 'ApiPlatform\Tests\Behat\JsonContext'
- 'Behat\MinkExtension\Context\MinkContext'
- 'behatch:context:rest'
filters:
tags: '@elasticsearch&&~@mercure&&~@query_parameter_validator'

opensearch:
suites:
default: false
opensearch:
paths:
- '%paths.base%/features/elasticsearch'
contexts:
- 'ApiPlatform\Tests\Behat\CommandContext'
- 'ApiPlatform\Tests\Behat\ElasticsearchContext'
- 'ApiPlatform\Tests\Behat\JsonContext'
- 'Behat\MinkExtension\Context\MinkContext'
- 'behatch:context:rest'
filters:
tags: '@elasticsearch&&~@mercure&&~@query_parameter_validator'

default-coverage:
suites:
default: &default-coverage-suite
Expand Down Expand Up @@ -180,19 +150,6 @@ mercure-coverage:
- 'Behat\MinkExtension\Context\MinkContext'
- 'behatch:context:rest'

elasticsearch-coverage:
suites:
default: false
elasticsearch: &elasticsearch-coverage-suite
<<: *elasticsearch-suite
contexts:
- 'ApiPlatform\Tests\Behat\CommandContext'
- 'ApiPlatform\Tests\Behat\ElasticsearchContext'
- 'ApiPlatform\Tests\Behat\JsonContext'
- 'ApiPlatform\Tests\Behat\CoverageContext'
- 'Behat\MinkExtension\Context\MinkContext'
- 'behatch:context:rest'

legacy:
suites:
default:
Expand Down
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@
"doctrine/common": "^3.2.2",
"doctrine/dbal": "^4.0",
"doctrine/doctrine-bundle": "^2.11 || ^3.1",
"doctrine/mongodb-odm": "^2.16",
"doctrine/mongodb-odm-bundle": "^5.6",
"doctrine/orm": "^2.17 || ^3.0",
"elasticsearch/elasticsearch": "^7.17 || ^8.4 || ^9.0",
"friends-of-behat/mink-browserkit-driver": "^1.3.1",
Expand All @@ -146,8 +148,8 @@
"illuminate/support": "^11.0 || ^12.0 || ^13.0",
"jangregor/phpstan-prophecy": "^2.1.11",
"justinrainbow/json-schema": "^6.5.2",
"mcp/sdk": ">=0.4 <1.0",
"laravel/framework": "^11.0 || ^12.0 || ^13.0",
"mcp/sdk": ">=0.4 <1.0",
"orchestra/testbench": "^10.9 || ^11.0",
"phpspec/prophecy-phpunit": "^2.2",
"phpstan/extension-installer": "^1.1",
Expand Down

This file was deleted.

27 changes: 0 additions & 27 deletions features/mongodb/filters.feature

This file was deleted.

108 changes: 0 additions & 108 deletions features/security/README.md

This file was deleted.

32 changes: 0 additions & 32 deletions features/security/send_security_headers.feature

This file was deleted.

Loading
Loading