Skip to content

Commit

Permalink
Merge pull request #868 from doctrine/prepare-release
Browse files Browse the repository at this point in the history
prepare release
  • Loading branch information
dbu authored Apr 3, 2024
2 parents 290a55d + 41983fe commit ada1008
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/test-application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.*'
Expand Down Expand Up @@ -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.*
Expand Down
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
Changelog
=========

2.0 (unreleased)
----------------
2.x
===

2.0.0
-----

### BC Breaks

Expand Down
3 changes: 0 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,10 @@
{"name":"David Buchmann", "email":"[email protected]"},
{"name":"Lukas Kahwe Smith", "email":"[email protected]"}
],
"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",
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ODM/PHPCR/Version.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ final class Version
/**
* Current version of PHPCR ODM.
*/
public const VERSION = '2.0-dev';
public const VERSION = '2.0.0';
}
8 changes: 6 additions & 2 deletions tests/Doctrine/Tests/ODM/PHPCR/Query/QueryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
})
)
;
Expand Down

0 comments on commit ada1008

Please sign in to comment.