Skip to content

Commit ee0ce44

Browse files
soyukasoyuka
committed
Merge 4.1
2 parents ad54075 + 79fd1eb commit ee0ce44

File tree

32 files changed

+159
-143
lines changed

32 files changed

+159
-143
lines changed

‎CONTRIBUTING.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,10 @@ The last step is to add you feature inside `features/`. You can add your test in
187187
API Platform is split into several components. There are tests for each of these, to run them `cd src/Doctrine/Common` then `composer update` and `./vendor/bin/phpunit`.
188188
We do not provide a way to run all these tests at once yet.
189189

190+
## Changing a version constraint
191+
192+
Preferably change the version inside the root `composer.json`, then use `composer blend --all` to re-map the depedency accross each sub-project automatically.
193+
190194
# License and Copyright Attribution
191195

192196
When you open a Pull Request to the API Platform project, you agree to license your code under the [MIT license](LICENSE)

‎composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
"symfony/http-foundation": "^6.4 || ^7.0",
112112
"symfony/http-kernel": "^6.4 || ^7.0",
113113
"symfony/property-access": "^6.4 || ^7.0",
114-
"symfony/property-info": "^6.4 || ^7.0",
114+
"symfony/property-info": "^6.4 || ^7.1",
115115
"symfony/serializer": "^6.4 || ^7.0",
116116
"symfony/translation-contracts": "^3.3",
117117
"symfony/web-link": "^6.4 || ^7.0",
@@ -125,7 +125,7 @@
125125
"doctrine/dbal": "^4.0",
126126
"doctrine/doctrine-bundle": "^2.11",
127127
"doctrine/mongodb-odm": "^2.10",
128-
"doctrine/mongodb-odm-bundle": "^4.0 || ^5.0",
128+
"doctrine/mongodb-odm-bundle": "^5.0",
129129
"doctrine/orm": "^2.17 || ^3.0",
130130
"elasticsearch/elasticsearch": "^7.17 || ^8.4",
131131
"friends-of-behat/mink-browserkit-driver": "^1.3.1",
@@ -145,14 +145,14 @@
145145
"orchestra/testbench": "^9.1",
146146
"phpspec/prophecy-phpunit": "^2.2",
147147
"phpstan/extension-installer": "^1.1",
148-
"phpstan/phpdoc-parser": "^1.13|^2.0",
148+
"phpstan/phpdoc-parser": "^1.29 || ^2.0",
149149
"phpstan/phpstan": "^1.10",
150150
"phpstan/phpstan-doctrine": "^1.0",
151151
"phpstan/phpstan-phpunit": "^1.0",
152152
"phpstan/phpstan-symfony": "^1.0",
153153
"phpunit/phpunit": "^11.2",
154154
"psr/log": "^1.0 || ^2.0 || ^3.0",
155-
"ramsey/uuid": "^4.0",
155+
"ramsey/uuid": "^4.7",
156156
"ramsey/uuid-doctrine": "^2.0",
157157
"soyuka/contexts": "^3.3.10",
158158
"soyuka/pmu": "^0.0.15",

‎src/Doctrine/Common/composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
],
2525
"require": {
2626
"php": ">=8.2",
27-
"api-platform/metadata": "^3.4 || ^4.0",
28-
"api-platform/state": "^3.4 || ^4.0",
27+
"api-platform/metadata": "^4.1",
28+
"api-platform/state": "^4.1",
2929
"doctrine/collections": "^2.1",
3030
"doctrine/common": "^3.2.2",
3131
"doctrine/persistence": "^3.2"
3232
},
3333
"require-dev": {
34-
"doctrine/mongodb-odm": "^2.6",
34+
"doctrine/mongodb-odm": "^2.10",
3535
"doctrine/orm": "^2.17 || ^3.0",
3636
"phpspec/prophecy-phpunit": "^2.2",
3737
"phpunit/phpunit": "^11.2"
@@ -60,7 +60,7 @@
6060
},
6161
"extra": {
6262
"branch-alias": {
63-
"dev-main": "4.0.x-dev",
63+
"dev-main": "4.2.x-dev",
6464
"dev-3.4": "3.4.x-dev"
6565
},
6666
"symfony": {

‎src/Doctrine/Odm/Tests/Fixtures/CustomConverter.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313

1414
namespace ApiPlatform\Doctrine\Odm\Tests\Fixtures;
1515

16-
use Symfony\Component\Serializer\NameConverter\AdvancedNameConverterInterface;
1716
use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
1817
use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
1918

2019
/**
2120
* Custom converter that will only convert a property named "nameConverted"
2221
* with the same logic as Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter.
2322
*/
24-
class CustomConverter implements AdvancedNameConverterInterface
23+
class CustomConverter implements NameConverterInterface
2524
{
2625
private NameConverterInterface $nameConverter;
2726

‎src/Doctrine/Odm/composer.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@
2626
"require": {
2727
"php": ">=8.2",
2828
"api-platform/doctrine-common": "^4.1",
29-
"api-platform/metadata": "^3.4 || ^4.0",
30-
"api-platform/state": "^3.4 || ^4.0",
31-
"doctrine/mongodb-odm": "^2.2",
29+
"api-platform/metadata": "^4.1",
30+
"api-platform/state": "^4.1",
31+
"doctrine/mongodb-odm": "^2.10",
3232
"symfony/property-info": "^6.4 || ^7.1"
3333
},
3434
"require-dev": {
3535
"doctrine/doctrine-bundle": "^2.11",
3636
"doctrine/mongodb-odm-bundle": "^5.0",
37-
"phpspec/prophecy-phpunit": "^2.0",
38-
"phpunit/phpunit": "^10.0",
37+
"phpspec/prophecy-phpunit": "^2.2",
38+
"phpunit/phpunit": "^11.2",
3939
"symfony/cache": "^6.4 || ^7.0",
4040
"symfony/framework-bundle": "^6.4 || ^7.0",
4141
"symfony/property-access": "^6.4 || ^7.0",
@@ -60,7 +60,7 @@
6060
},
6161
"extra": {
6262
"branch-alias": {
63-
"dev-main": "4.0.x-dev",
63+
"dev-main": "4.2.x-dev",
6464
"dev-3.4": "3.4.x-dev"
6565
},
6666
"symfony": {

‎src/Doctrine/Orm/Tests/Fixtures/CustomConverter.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313

1414
namespace ApiPlatform\Doctrine\Orm\Tests\Fixtures;
1515

16-
use Symfony\Component\Serializer\NameConverter\AdvancedNameConverterInterface;
1716
use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
1817
use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
1918

2019
/**
2120
* Custom converter that will only convert a property named "nameConverted"
2221
* with the same logic as Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter.
2322
*/
24-
class CustomConverter implements AdvancedNameConverterInterface
23+
class CustomConverter implements NameConverterInterface
2524
{
2625
private NameConverterInterface $nameConverter;
2726

‎src/Doctrine/Orm/composer.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
"require": {
2626
"php": ">=8.2",
2727
"api-platform/doctrine-common": "^4.1",
28-
"api-platform/metadata": "^3.4 || ^4.0",
29-
"api-platform/state": "^3.4 || ^4.0",
28+
"api-platform/metadata": "^4.1",
29+
"api-platform/state": "^4.1",
3030
"doctrine/orm": "^2.17 || ^3.0",
31-
"symfony/property-info": "^6.4 || ^7.0"
31+
"symfony/property-info": "^6.4 || ^7.1"
3232
},
3333
"require-dev": {
3434
"doctrine/doctrine-bundle": "^2.11",
35-
"phpspec/prophecy-phpunit": "^2.0",
36-
"phpunit/phpunit": "^10.0",
35+
"phpspec/prophecy-phpunit": "^2.2",
36+
"phpunit/phpunit": "^11.2",
3737
"ramsey/uuid": "^4.7",
3838
"ramsey/uuid-doctrine": "^2.0",
3939
"symfony/cache": "^6.4 || ^7.0",
@@ -60,7 +60,7 @@
6060
},
6161
"extra": {
6262
"branch-alias": {
63-
"dev-main": "4.0.x-dev",
63+
"dev-main": "4.2.x-dev",
6464
"dev-3.4": "3.4.x-dev"
6565
},
6666
"symfony": {

‎src/Documentation/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
],
2222
"require": {
2323
"php": ">=8.2",
24-
"api-platform/metadata": "^3.4 || ^4.0"
24+
"api-platform/metadata": "^4.1"
2525
},
2626
"extra": {
2727
"branch-alias": {
28-
"dev-main": "4.0.x-dev",
28+
"dev-main": "4.2.x-dev",
2929
"dev-3.4": "3.4.x-dev"
3030
},
3131
"symfony": {

‎src/Elasticsearch/composer.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
],
2525
"require": {
2626
"php": ">=8.2",
27-
"api-platform/metadata": "^3.4 || ^4.0",
28-
"api-platform/serializer": "^3.4 || ^4.0",
29-
"api-platform/state": "^3.4 || ^4.0",
27+
"api-platform/metadata": "^4.1",
28+
"api-platform/serializer": "^4.1",
29+
"api-platform/state": "^4.1",
3030
"elasticsearch/elasticsearch": "^7.17 || ^8.4",
3131
"symfony/cache": "^6.4 || ^7.0",
3232
"symfony/console": "^6.4 || ^7.0",
3333
"symfony/property-access": "^6.4 || ^7.0",
34-
"symfony/property-info": "^6.4 || ^7.0",
34+
"symfony/property-info": "^6.4 || ^7.1",
3535
"symfony/serializer": "^6.4 || ^7.0",
3636
"symfony/uid": "^6.4 || ^7.0"
3737
},
@@ -60,7 +60,7 @@
6060
},
6161
"extra": {
6262
"branch-alias": {
63-
"dev-main": "4.0.x-dev",
63+
"dev-main": "4.2.x-dev",
6464
"dev-3.4": "3.4.x-dev"
6565
},
6666
"symfony": {

‎src/GraphQl/Tests/Fixtures/Serializer/NameConverter/CustomConverter.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313

1414
namespace ApiPlatform\GraphQl\Tests\Fixtures\Serializer\NameConverter;
1515

16-
use Symfony\Component\Serializer\NameConverter\AdvancedNameConverterInterface;
1716
use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
1817
use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
1918

2019
/**
2120
* Custom converter that will only convert a property named "nameConverted"
2221
* with the same logic as Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter.
2322
*/
24-
class CustomConverter implements AdvancedNameConverterInterface
23+
class CustomConverter implements NameConverterInterface
2524
{
2625
private NameConverterInterface $nameConverter;
2726

0 commit comments

Comments
 (0)