diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 1a23e1c08..dca90c232 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -37,6 +37,7 @@ jobs: - php-version: '8.1' dependencies: lowest symfony-version: '*' + jackalope-version: '1.*' - php-version: '8.1' dependencies: highest symfony-version: '5.4.*' @@ -115,6 +116,7 @@ jobs: - php-version: '8.1' dependencies: lowest symfony-version: '*' + jackalope-version: '1.*' - php-version: '8.1' dependencies: highest symfony-version: 5.4.* diff --git a/CHANGELOG.md b/CHANGELOG.md index 0693a5be6..85d567ffb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ Changelog ========= -2.0 (unreleased) ----------------- +2.x +=== + +2.0.0 +----- ### BC Breaks diff --git a/composer.json b/composer.json index d7bcb2740..15fe4acd2 100644 --- a/composer.json +++ b/composer.json @@ -18,13 +18,10 @@ {"name":"David Buchmann", "email":"david@liip.ch"}, {"name":"Lukas Kahwe Smith", "email":"smith@pooteeweet.org"} ], - "minimum-stability": "beta", - "prefer-stable": true, "require": { "php": "^8.1", "doctrine/collections": "^2.0", "doctrine/common": "^2.4 || ^3.0", - "doctrine/annotations": "^1.14.3 || ^2.0", "doctrine/data-fixtures": "^1.0", "doctrine/event-manager": "^1.0 || ^2.0", "doctrine/persistence": "^3.0", diff --git a/lib/Doctrine/ODM/PHPCR/Version.php b/lib/Doctrine/ODM/PHPCR/Version.php index 136b5bf67..3aa31c8d3 100644 --- a/lib/Doctrine/ODM/PHPCR/Version.php +++ b/lib/Doctrine/ODM/PHPCR/Version.php @@ -10,5 +10,5 @@ final class Version /** * Current version of PHPCR ODM. */ - public const VERSION = '2.0-dev'; + public const VERSION = '2.0.0'; } diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Query/QueryTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Query/QueryTest.php index d3a3c5642..08ccaa392 100644 --- a/tests/Doctrine/Tests/ODM/PHPCR/Query/QueryTest.php +++ b/tests/Doctrine/Tests/ODM/PHPCR/Query/QueryTest.php @@ -122,9 +122,13 @@ public function testExecuteParameters(): void ->method('bindValue') ->with( $this->callback(function (string $key): bool { - return 'kfoo' === $key || 'kbar' === $key; + $this->assertContains($key, ['kfoo', 'kbar']); + + return true; }), $this->callback(function (string $value): bool { - return 'bar' === $value || 'foo' === $value; + $this->assertContains($value, ['bar', 'foo']); + + return true; }) ) ;