Skip to content

Commit a41e8de

Browse files
soyukasoyuka
committed
use type-info 7.3, rename to nativeType, implement metadata leftovers
uncomment deprecations
1 parent 3a78472 commit a41e8de

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+590
-182
lines changed

‎composer.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@
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": "^7.1",
114+
"symfony/property-info": "^6.4 || ^7.1",
115115
"symfony/serializer": "^6.4 || ^7.0",
116116
"symfony/translation-contracts": "^3.3",
117-
"symfony/type-info": "^7.2",
117+
"symfony/type-info": "^7.3-dev",
118118
"symfony/web-link": "^6.4 || ^7.0",
119119
"willdurand/negotiation": "^3.1"
120120
},
@@ -165,7 +165,7 @@
165165
"symfony/console": "^6.4 || ^7.0",
166166
"symfony/css-selector": "^6.4 || ^7.0",
167167
"symfony/dependency-injection": "^6.4 || ^7.0",
168-
"symfony/doctrine-bridge": "^7.1",
168+
"symfony/doctrine-bridge": "^6.4.2 || ^7.1",
169169
"symfony/dom-crawler": "^6.4 || ^7.0",
170170
"symfony/error-handler": "^6.4 || ^7.0",
171171
"symfony/event-dispatcher": "^6.4 || ^7.0",
@@ -209,5 +209,11 @@
209209
"symfony/web-profiler-bundle": "To use the data collector.",
210210
"webonyx/graphql-php": "To support GraphQL."
211211
},
212-
"type": "library"
212+
"type": "library",
213+
"repositories": [
214+
{
215+
"type": "vcs",
216+
"url": "https://github.com/symfony/type-info"
217+
}
218+
]
213219
}

‎docs/composer.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"symfony/property-info": "^7.0",
2626
"symfony/runtime": "^7.0",
2727
"symfony/security-bundle": "^7.0",
28+
"symfony/type-info": "^7.3-dev",
2829
"symfony/serializer": "^7.0",
2930
"symfony/validator": "^7.0",
3031
"symfony/yaml": "^7.0",
@@ -50,5 +51,11 @@
5051
"name": "api-platform/api-platform",
5152
"url": "https://github.com/api-platform/api-platform"
5253
}
53-
}
54+
},
55+
"repositories": [
56+
{
57+
"type": "vcs",
58+
"url": "https://github.com/symfony/type-info"
59+
}
60+
]
5461
}

‎src/Doctrine/Common/composer.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
"doctrine/mongodb-odm": "^2.10",
3535
"doctrine/orm": "^2.17 || ^3.0",
3636
"phpspec/prophecy-phpunit": "^2.2",
37-
"phpunit/phpunit": "^11.2"
37+
"phpunit/phpunit": "^11.2",
38+
"symfony/type-info": "^7.3-dev"
3839
},
3940
"conflict": {
4041
"doctrine/persistence": "<1.3"
@@ -73,5 +74,11 @@
7374
},
7475
"scripts": {
7576
"test": "./vendor/bin/phpunit"
76-
}
77+
},
78+
"repositories": [
79+
{
80+
"type": "vcs",
81+
"url": "https://github.com/symfony/type-info"
82+
}
83+
]
7784
}

‎src/Doctrine/Odm/PropertyInfo/DoctrineExtractor.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public function getType(string $class, string $property, array $context = []): ?
115115
*/
116116
public function getTypes($class, $property, array $context = []): ?array
117117
{
118-
// trigger_deprecation('api-platform/core', '4.2', 'The "%s()" method is deprecated, use "%s::getType()" instead.', __METHOD__, self::class);
118+
trigger_deprecation('api-platform/core', '4.2', 'The "%s()" method is deprecated, use "%s::getType()" instead.', __METHOD__, self::class);
119119

120120
if (null === $metadata = $this->getMetadata($class)) {
121121
return null;
@@ -173,7 +173,7 @@ public function getTypes($class, $property, array $context = []): ?array
173173
}
174174
}
175175

176-
$builtinType = $this->getPhpTypeLegacy($typeOfField);
176+
$builtinType = $this->getNativeTypeLegacy($typeOfField);
177177

178178
return $builtinType ? [new LegacyType($builtinType, $nullable)] : null;
179179
}
@@ -230,7 +230,7 @@ private function getTypeIdentifier(string $doctrineType): ?TypeIdentifier
230230
};
231231
}
232232

233-
private function getPhpTypeLegacy(string $doctrineType): ?string
233+
private function getNativeTypeLegacy(string $doctrineType): ?string
234234
{
235235
return match ($doctrineType) {
236236
MongoDbType::INTEGER, MongoDbType::INT, MongoDbType::INTID, MongoDbType::KEY => LegacyType::BUILTIN_TYPE_INT,

‎src/Doctrine/Odm/composer.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
"api-platform/metadata": "^4.1",
3030
"api-platform/state": "^4.1",
3131
"doctrine/mongodb-odm": "^2.10",
32-
"symfony/property-info": "^7.1",
33-
"symfony/type-info": "^7.2"
32+
"symfony/property-info": "^6.4 || ^7.1",
33+
"symfony/type-info": "^7.3-dev"
3434
},
3535
"require-dev": {
3636
"doctrine/doctrine-bundle": "^2.11",
@@ -74,5 +74,11 @@
7474
},
7575
"scripts": {
7676
"test": "./vendor/bin/phpunit"
77-
}
77+
},
78+
"repositories": [
79+
{
80+
"type": "vcs",
81+
"url": "https://github.com/symfony/type-info"
82+
}
83+
]
7884
}

‎src/Doctrine/Orm/composer.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"api-platform/metadata": "^4.1",
2929
"api-platform/state": "^4.1",
3030
"doctrine/orm": "^2.17 || ^3.0",
31-
"symfony/property-info": "^7.1"
31+
"symfony/property-info": "^6.4 || ^7.1"
3232
},
3333
"require-dev": {
3434
"doctrine/doctrine-bundle": "^2.11",
@@ -40,6 +40,7 @@
4040
"symfony/framework-bundle": "^6.4 || ^7.0",
4141
"symfony/property-access": "^6.4 || ^7.0",
4242
"symfony/serializer": "^6.4 || ^7.0",
43+
"symfony/type-info": "^7.3-dev",
4344
"symfony/uid": "^6.4 || ^7.0",
4445
"symfony/validator": "^6.4 || ^7.0",
4546
"symfony/yaml": "^6.4 || ^7.0"
@@ -73,5 +74,11 @@
7374
},
7475
"scripts": {
7576
"test": "./vendor/bin/phpunit"
76-
}
77+
},
78+
"repositories": [
79+
{
80+
"type": "vcs",
81+
"url": "https://github.com/symfony/type-info"
82+
}
83+
]
7784
}

‎src/Documentation/composer.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,11 @@
3838
},
3939
"require-dev": {
4040
"phpunit/phpunit": "^11.2"
41-
}
41+
},
42+
"repositories": [
43+
{
44+
"type": "vcs",
45+
"url": "https://github.com/symfony/type-info"
46+
}
47+
]
4248
}

‎src/Elasticsearch/composer.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,14 @@
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": "^7.1",
34+
"symfony/property-info": "^6.4 || ^7.1",
3535
"symfony/serializer": "^6.4 || ^7.0",
3636
"symfony/uid": "^6.4 || ^7.0"
3737
},
3838
"require-dev": {
3939
"phpspec/prophecy-phpunit": "^2.2",
40-
"phpunit/phpunit": "^11.2"
40+
"phpunit/phpunit": "^11.2",
41+
"symfony/type-info": "^7.3-dev"
4142
},
4243
"autoload": {
4344
"psr-4": {
@@ -73,5 +74,11 @@
7374
},
7475
"scripts": {
7576
"test": "./vendor/bin/phpunit"
76-
}
77+
},
78+
"repositories": [
79+
{
80+
"type": "vcs",
81+
"url": "https://github.com/symfony/type-info"
82+
}
83+
]
7784
}

‎src/GraphQl/composer.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"api-platform/metadata": "^4.1",
2525
"api-platform/state": "^4.1",
2626
"api-platform/serializer": "^4.1",
27-
"symfony/property-info": "^7.1",
27+
"symfony/property-info": "^6.4 || ^7.1",
2828
"symfony/serializer": "^6.4 || ^7.0",
2929
"webonyx/graphql-php": "^15.0",
3030
"willdurand/negotiation": "^3.1"
@@ -35,6 +35,7 @@
3535
"twig/twig": "^1.42.3 || ^2.12 || ^3.0",
3636
"symfony/mercure-bundle": "*",
3737
"symfony/routing": "^6.4 || ^7.0",
38+
"symfony/type-info": "^7.3-dev",
3839
"phpunit/phpunit": "^11.2"
3940
},
4041
"autoload": {
@@ -76,5 +77,11 @@
7677
},
7778
"scripts": {
7879
"test": "./vendor/bin/phpunit"
79-
}
80+
},
81+
"repositories": [
82+
{
83+
"type": "vcs",
84+
"url": "https://github.com/symfony/type-info"
85+
}
86+
]
8087
}

‎src/Hal/composer.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,13 @@
6161
"test": "./vendor/bin/phpunit"
6262
},
6363
"require-dev": {
64+
"symfony/type-info": "^7.3-dev",
6465
"phpunit/phpunit": "^11.2"
65-
}
66+
},
67+
"repositories": [
68+
{
69+
"type": "vcs",
70+
"url": "https://github.com/symfony/type-info"
71+
}
72+
]
6673
}

‎src/HttpCache/composer.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"symfony/dependency-injection": "^6.4 || ^7.0",
3333
"phpspec/prophecy-phpunit": "^2.2",
3434
"symfony/http-client": "^6.4 || ^7.0",
35+
"symfony/type-info": "^7.3-dev",
3536
"phpunit/phpunit": "^11.2"
3637
},
3738
"autoload": {
@@ -67,5 +68,11 @@
6768
},
6869
"scripts": {
6970
"test": "./vendor/bin/phpunit"
70-
}
71+
},
72+
"repositories": [
73+
{
74+
"type": "vcs",
75+
"url": "https://github.com/symfony/type-info"
76+
}
77+
]
7178
}

‎src/Hydra/composer.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
"api-platform/doctrine-common": "^4.1",
4040
"phpspec/prophecy": "^1.19",
4141
"phpspec/prophecy-phpunit": "^2.2",
42-
"phpunit/phpunit": "^11.2"
42+
"phpunit/phpunit": "^11.2",
43+
"symfony/type-info": "^7.3-dev"
4344
},
4445
"autoload": {
4546
"psr-4": {
@@ -74,5 +75,11 @@
7475
},
7576
"scripts": {
7677
"test": "./vendor/bin/phpunit"
77-
}
78+
},
79+
"repositories": [
80+
{
81+
"type": "vcs",
82+
"url": "https://github.com/symfony/type-info"
83+
}
84+
]
7885
}

‎src/JsonApi/composer.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
"require-dev": {
3434
"phpspec/prophecy": "^1.19",
3535
"phpspec/prophecy-phpunit": "^2.2",
36-
"phpunit/phpunit": "^11.2"
36+
"phpunit/phpunit": "^11.2",
37+
"symfony/type-info": "^7.3-dev"
3738
},
3839
"autoload": {
3940
"psr-4": {
@@ -68,5 +69,11 @@
6869
},
6970
"scripts": {
7071
"test": "./vendor/bin/phpunit"
71-
}
72+
},
73+
"repositories": [
74+
{
75+
"type": "vcs",
76+
"url": "https://github.com/symfony/type-info"
77+
}
78+
]
7279
}

‎src/JsonLd/composer.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,13 @@
6666
"test": "./vendor/bin/phpunit"
6767
},
6868
"require-dev": {
69-
"phpunit/phpunit": "^11.2"
70-
}
69+
"phpunit/phpunit": "^11.2",
70+
"symfony/type-info": "^7.3-dev"
71+
},
72+
"repositories": [
73+
{
74+
"type": "vcs",
75+
"url": "https://github.com/symfony/type-info"
76+
}
77+
]
7178
}

0 commit comments

Comments
 (0)