Skip to content

Commit ada1008

Browse files
authoredApr 3, 2024
Merge pull request #868 from doctrine/prepare-release
prepare release
2 parents 290a55d + 41983fe commit ada1008

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed
 

‎.github/workflows/test-application.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
- php-version: '8.1'
3838
dependencies: lowest
3939
symfony-version: '*'
40+
jackalope-version: '1.*'
4041
- php-version: '8.1'
4142
dependencies: highest
4243
symfony-version: '5.4.*'
@@ -115,6 +116,7 @@ jobs:
115116
- php-version: '8.1'
116117
dependencies: lowest
117118
symfony-version: '*'
119+
jackalope-version: '1.*'
118120
- php-version: '8.1'
119121
dependencies: highest
120122
symfony-version: 5.4.*

‎CHANGELOG.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
Changelog
22
=========
33

4-
2.0 (unreleased)
5-
----------------
4+
2.x
5+
===
6+
7+
2.0.0
8+
-----
69

710
### BC Breaks
811

‎composer.json

-3
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@
1818
{"name":"David Buchmann", "email":"david@liip.ch"},
1919
{"name":"Lukas Kahwe Smith", "email":"smith@pooteeweet.org"}
2020
],
21-
"minimum-stability": "beta",
22-
"prefer-stable": true,
2321
"require": {
2422
"php": "^8.1",
2523
"doctrine/collections": "^2.0",
2624
"doctrine/common": "^2.4 || ^3.0",
27-
"doctrine/annotations": "^1.14.3 || ^2.0",
2825
"doctrine/data-fixtures": "^1.0",
2926
"doctrine/event-manager": "^1.0 || ^2.0",
3027
"doctrine/persistence": "^3.0",

‎lib/Doctrine/ODM/PHPCR/Version.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ final class Version
1010
/**
1111
* Current version of PHPCR ODM.
1212
*/
13-
public const VERSION = '2.0-dev';
13+
public const VERSION = '2.0.0';
1414
}

‎tests/Doctrine/Tests/ODM/PHPCR/Query/QueryTest.php

+6-2
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,13 @@ public function testExecuteParameters(): void
122122
->method('bindValue')
123123
->with(
124124
$this->callback(function (string $key): bool {
125-
return 'kfoo' === $key || 'kbar' === $key;
125+
$this->assertContains($key, ['kfoo', 'kbar']);
126+
127+
return true;
126128
}), $this->callback(function (string $value): bool {
127-
return 'bar' === $value || 'foo' === $value;
129+
$this->assertContains($value, ['bar', 'foo']);
130+
131+
return true;
128132
})
129133
)
130134
;

0 commit comments

Comments
 (0)