8000 feature #42088 [Contracts] add return types and bump to v3 (nicolas-g… · symfony/symfony@b28f7e7 · GitHub
[go: up one dir, main page]
Skip to content

Commit b28f7e7

Browse files
derrabusderrabus
committed
feature #42088 [Contracts] add return types and bump to v3 (nicolas-grekas)
This PR was merged into the 6.0 branch. Discussion ---------- [Contracts] add return types and bump to v3 | Q | A | ------------- | --- | Branch? | 6.0 | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | #42058 | License | MIT | Doc PR | - Commits ------- 44b1a7a [Contracts] add return types and bump to v3
2 parents f821d76 + 44b1a7a commit b28f7e7

File tree

92 files changed

+143
-185
lines changed

Some content is hidden

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

92 files changed

+143
-185
lines changed

‎composer.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@
1818
"provide": {
1919
"php-http/async-client-implementation": "*",
2020
"php-http/client-implementation": "*",
21-
"psr/cache-implementation": "1.0|2.0|3.0",
22-
"psr/container-implementation": "1.0",
21+
"psr/cache-implementation": "2.0|3.0",
22+
"psr/container-implementation": "1.1|2.0",
2323
"psr/event-dispatcher-implementation": "1.0",
2424
"psr/http-client-implementation": "1.0",
2525
"psr/link-implementation": "1.0",
2626
"psr/log-implementation": "1.0",
2727
"psr/simple-cache-implementation": "1.0",
28-
"symfony/cache-implementation": "1.0|2.0",
29-
"symfony/event-dispatcher-implementation": "2.0",
30-
"symfony/http-client-implementation": "2.4",
31-
"symfony/service-implementation": "1.0|2.0",
32-
"symfony/translation-implementation": "2.3"
28+
"symfony/cache-implementation": "1.1|2.0|3.0",
29+
"symfony/event-dispatcher-implementation": "2.0|3.0",
30+
"symfony/http-client-implementation": "2.5|3.0",
31+
"symfony/service-implementation": "1.1|2.0|3.0",
32+
"symfony/translation-implementation": "2.3|3.0"
3333
},
3434
"require": {
3535
"php": ">=8.0.2",
@@ -38,12 +38,12 @@
3838
"doctrine/event-manager": "~1.0",
3939
"doctrine/persistence": "^2",
4040
"twig/twig": "^2.13|^3.0.4",
41-
"psr/cache": "^1.0|^2.0|^3.0",
42-
"psr/container": "^1.0",
41+
"psr/cache": "^2.0|^3.0",
42+
"psr/container": "^1.1|^2.0",
4343
"psr/event-dispatcher": "^1.0",
4444
"psr/link": "^1.1",
4545
"psr/log": "~1.0",
46-
"symfony/contracts": "^2.5",
46+
"symfony/contracts": "^2.5|^3.0",
4747
"symfony/polyfill-ctype": "~1.8",
4848
"symfony/polyfill-intl-grapheme": "~1.0",
49< D7C6 code>49
"symfony/polyfill-intl-icu": "~1.0",
@@ -186,7 +186,7 @@
186186
"url": "src/Symfony/Contracts",
187187
"options": {
188188
"versions": {
189-
"symfony/contracts": "2.5.x-dev"
189+
"symfony/contracts": "3.0.x-dev"
190190
}
191191
}
192192
},

‎src/Symfony/Bridge/Doctrine/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"php": ">=8.0.2",
2020
"doctrine/event-manager": "~1.0",
2121
"doctrine/persistence": "^2",
22-
"symfony/deprecation-contracts": "^2.1",
22+
"symfony/deprecation-contracts": "^2.1|^3.0",
2323
"symfony/polyfill-ctype": "~1.8",
2424
"symfony/polyfill-mbstring": "~1.0",
25-
"symfony/service-contracts": "^1.1|^2"
25+
"symfony/service-contracts": "^1.1|^2.0|^3.0"
2626
},
2727
"require-dev": {
2828
"composer/package-versions-deprecated": "^1.8",

‎src/Symfony/Bridge/Monolog/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=8.0.2",
2020
"monolog/monolog": "^1.25.1|^2",
21-
"symfony/service-contracts": "^1.1|^2",
21+
"symfony/service-contracts": "^1.1|^2.0|^3.0",
2222
"symfony/http-kernel": "^5.4|^6.0"
2323
},
2424
"require-dev": {

‎src/Symfony/Bridge/PhpUnit/composer.json‎

-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"php": ">=7.1.3"
2222
},
2323
"require-dev": {
24-
"symfony/deprecation-contracts": "^2.1",
24+
"symfony/deprecation-contracts": "^2.1|^3.0",
2525
"symfony/error-handler": "^5.4|^6.0"
2626
},
2727
"suggest": {

‎src/Symfony/Bridge/Twig/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=8.0.2",
20-
"symfony/translation-contracts": "^1.1|^2",
20+
"symfony/translation-contracts": "^1.1|^2.0|^3.0",
2121
"twig/twig": "^2.13|^3.0.4"
2222
},
2323
"require-dev": {

‎src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function isOptional()
6262
/**
6363
* {@inheritdoc}
6464
*/
65-
public static function getSubscribedServices()
65+
public static function getSubscribedServices(): array
6666
{
6767
return [
6868
'translator' => TranslatorInterface::class,

‎src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ protected function getParameter(string $name)
8686
return $this->container->get('parameter_bag')->get($name);
8787
}
8888

89-
public static function getSubscribedServices()
89+
public static function getSubscribedServices(): array
9090
{
9191
return [
9292
'router' => '?'.RouterInterface::class,

‎src/Symfony/Bundle/FrameworkBundle/Routing/Router.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ private function resolve(mixed $value): mixed
196196
/**
197197
* {@inheritdoc}
198198
*/
199-
public static function getSubscribedServices()
199+
public static function getSubscribedServices(): array
200200
{
201201
return [
202202
'routing.loader' => LoaderInterface::class,

‎src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Symfony\Component\Translation\Loader\LoaderInterface;
2323
use Symfony\Component\Translation\Loader\YamlFileLoader;
2424
use Symfony\Component\Translation\MessageCatalogue;
25+
use Symfony\Contracts\Translation\TranslatorInterface;
2526

2627
class TranslatorTest extends TestCase
2728
{
@@ -310,7 +311,7 @@ protected function getContainer($loader)
310311
return $container;
311312
}
312313

313-
public function getTranslator($loader, $options = [], $loaderFomat = 'loader', $translatorClass = Translator::class, $defaultLocale = 'en', array $enabledLocales = [])
314+
public function getTranslator($loader, $options = [], $loaderFomat = 'loader', $translatorClass = Translator::class, $defaultLocale = 'en', array $enabledLocales = []): TranslatorInterface
314315
{
315316
$translator = $this->createTranslator($loader, $options, $translatorClass, $loaderFomat, $defaultLocale, $enabledLocales);
316317

‎src/Symfony/Bundle/FrameworkBundle/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"symfony/cache": "^5.4|^6.0",
2222
"symfony/config": "^5.4|^6.0",
2323
"symfony/dependency-injection": "^5.4|^6.0",
24-
"symfony/deprecation-contracts": "^2.1",
24+
"symfony/deprecation-contracts": "^2.1|^3.0",
2525
"symfony/event-dispatcher": "^5.4|^6.0",
2626
"symfony/error-handler": "^5.4|^6.0",
2727
"symfony/http-foundation": "^5.4|^6.0",

0 commit comments

Comments
 (0)
0