Skip to content

Drop v1 contracts packages everywhere #48810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 29, 2022
Merged

Drop v1 contracts packages everywhere #48810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Symfony/Bridge/Doctrine/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"php": ">=8.1",
"doctrine/event-manager": "^1.2|^2",
"doctrine/persistence": "^2|^3",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.0",
"symfony/service-contracts": "^1.1|^2|^3"
"symfony/service-contracts": "^2.5|^3"
},
"require-dev": {
"symfony/stopwatch": "^5.4|^6.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Monolog/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"require": {
"php": ">=8.1",
"monolog/monolog": "^1.25.1|^2|^3",
"symfony/service-contracts": "^1.1|^2|^3",
"symfony/service-contracts": "^2.5|^3",
"symfony/http-kernel": "^5.4|^6.0"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/PhpUnit/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"php": ">=7.1.3"
},
"require-dev": {
"symfony/deprecation-contracts": "^2.1|^3.0",
"symfony/deprecation-contracts": "^2.5|^3.0",
"symfony/error-handler": "^5.4|^6.0"
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/ProxyManager/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"php": ">=8.1",
"friendsofphp/proxy-manager-lts": "^1.0.2",
"symfony/dependency-injection": "^6.3",
"symfony/deprecation-contracts": "^2.1|^3"
"symfony/deprecation-contracts": "^2.5|^3"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why bump deprecation-contracts? better not if not needed don't you think?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For consistency, mainly. 2.5 is the release we still maintain in our LTS branch. Do you want to define a different target 2.x minor version for each contracts package? If so, let's define them and I adjust the PR.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK.
I looked for bumping to v3 but that'd make our packages less compatible with third party packages.

},
"require-dev": {
"symfony/config": "^6.1"
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Twig/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": ">=8.1",
"symfony/translation-contracts": "^1.1|^2|^3",
"symfony/translation-contracts": "^2.5|^3",
"twig/twig": "^2.13|^3.0.4"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"symfony/cache": "^5.4|^6.0",
"symfony/config": "^6.1",
"symfony/dependency-injection": "^6.2",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/error-handler": "^6.1",
"symfony/event-dispatcher": "^5.4|^6.0",
"symfony/http-foundation": "^6.2",
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Cache/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"php": ">=8.1",
"psr/cache": "^2.0|^3.0",
"psr/log": "^1.1|^2|^3",
"symfony/cache-contracts": "^1.1.7|^2|^3",
"symfony/service-contracts": "^1.1|^2|^3",
"symfony/cache-contracts": "^2.5|^3",
"symfony/service-contracts": "^2.5|^3",
"symfony/var-exporter": "^6.2"
},
"require-dev": {
Expand Down
7 changes: 4 additions & 3 deletions src/Symfony/Component/Config/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@
],
"require": {
"php": ">=8.1",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/filesystem": "^5.4|^6.0",
"symfony/polyfill-ctype": "~1.8"
},
"require-dev": {
"symfony/event-dispatcher": "^5.4|^6.0",
"symfony/finder": "^5.4|^6.0",
"symfony/messenger": "^5.4|^6.0",
"symfony/service-contracts": "^1.1|^2|^3",
"symfony/service-contracts": "^2.5|^3",
"symfony/yaml": "^5.4|^6.0"
},
"conflict": {
"symfony/finder": "<5.4"
"symfony/finder": "<5.4",
"symfony/service-contracts": "<2.5"
},
"suggest": {
"symfony/yaml": "To use the yaml reference dumper"
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Console/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
],
"require": {
"php": ">=8.1",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/polyfill-mbstring": "~1.0",
"symfony/service-contracts": "^1.1|^2|^3",
"symfony/service-contracts": "^2.5|^3",
"symfony/string": "^5.4|^6.0"
},
"require-dev": {
Expand Down
5 changes: 0 additions & 5 deletions src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
use Symfony\Component\DependencyInjection\Tests\Fixtures\WithTarget;
use Symfony\Component\DependencyInjection\TypedReference;
use Symfony\Component\ExpressionLanguage\Expression;
use Symfony\Contracts\Service\Attribute\Required;

require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';

Expand Down Expand Up @@ -705,10 +704,6 @@ public function testSetterInjection()

public function testSetterInjectionWithAttribute()
{
if (!class_exists(Required::class)) {
$this->markTestSkipped('symfony/service-contracts 2.2 required');
}

$container = new ContainerBuilder();
$container->register(Foo::class);

Expand Down
9 changes: 0 additions & 9 deletions src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Tests\Fixtures\WitherStaticReturnType;
use Symfony\Contracts\Service\Attribute\Required;

require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';

Expand Down Expand Up @@ -57,10 +56,6 @@ public function testSetterInjection()

public function testSetterInjectionWithAttribute()
{
if (!class_exists(Required::class)) {
$this->markTestSkipped('symfony/service-contracts 2.2 required');
}

$container = new ContainerBuilder();
$container->register(Foo::class);

Expand Down Expand Up @@ -145,10 +140,6 @@ public function testWitherWithStaticReturnTypeInjection()

public function testWitherInjectionWithAttribute()
{
if (!class_exists(Required::class)) {
$this->markTestSkipped('symfony/service-contracts 2.2 required');
}

$container = new ContainerBuilder();
$container->register(Foo::class);

Expand Down
5 changes: 0 additions & 5 deletions ...mfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredPropertiesPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredPropertiesPass;
use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Contracts\Service\Attribute\Required;

require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
require_once __DIR__.'/../Fixtures/includes/autowiring_classes_74.php';
Expand All @@ -41,10 +40,6 @@ public function testInjection()

public function testAttribute()
{
if (!class_exists(Required::class)) {
$this->markTestSkipped('symfony/service-contracts 2.2 required');
}

$container = new ContainerBuilder();
$container->register(Foo::class);

Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/DependencyInjection/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"require": {
"php": ">=8.1",
"psr/container": "^1.1|^2.0",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/service-contracts": "^1.1.6|^2.0|^3.0",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/service-contracts": "^2.5|^3.0",
"symfony/var-exporter": "^6.2"
},
"require-dev": {
Expand Down
5 changes: 4 additions & 1 deletion src/Symfony/Component/ErrorHandler/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@
"require-dev": {
"symfony/http-kernel": "^5.4|^6.0",
"symfony/serializer": "^5.4|^6.0",
"symfony/deprecation-contracts": "^2.1|^3"
"symfony/deprecation-contracts": "^2.5|^3"
},
"conflict": {
"symfony/deprecation-contracts": "<2.5"
},
"autoload": {
"psr-4": { "Symfony\\Component\\ErrorHandler\\": "" },
Expand Down
7 changes: 4 additions & 3 deletions src/Symfony/Component/EventDispatcher/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,21 @@
],
"require": {
"php": ">=8.1",
"symfony/event-dispatcher-contracts": "^2|^3"
"symfony/event-dispatcher-contracts": "^2.5|^3"
},
"require-dev": {
"symfony/dependency-injection": "^5.4|^6.0",
"symfony/expression-language": "^5.4|^6.0",
"symfony/config": "^5.4|^6.0",
"symfony/error-handler": "^5.4|^6.0",
"symfony/http-foundation": "^5.4|^6.0",
"symfony/service-contracts": "^1.1|^2|^3",
"symfony/service-contracts": "^2.5|^3",
"symfony/stopwatch": "^5.4|^6.0",
"psr/log": "^1|^2|^3"
},
"conflict": {
"symfony/dependency-injection": "<5.4"
"symfony/dependency-injection": "<5.4",
"symfony/service-contracts": "<2.5"
},
"provide": {
"psr/event-dispatcher-implementation": "1.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/ExpressionLanguage/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"require": {
"php": ">=8.1",
"symfony/cache": "^5.4|^6.0",
"symfony/service-contracts": "^1.1|^2|^3"
"symfony/service-contracts": "^2.5|^3"
},
"autoload": {
"psr-4": { "Symfony\\Component\\ExpressionLanguage\\": "" },
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Component/Form/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
],
"require": {
"php": ">=8.1",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/event-dispatcher": "^5.4|^6.0",
"symfony/options-resolver": "^5.4|^6.0",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-intl-icu": "^1.21",
"symfony/polyfill-mbstring": "~1.0",
"symfony/property-access": "^5.4|^6.0",
"symfony/service-contracts": "^1.1|^2|^3"
"symfony/service-contracts": "^2.5|^3"
},
"require-dev": {
"doctrine/collections": "^1.0|^2.0",
Expand Down Expand Up @@ -52,7 +52,7 @@
"symfony/framework-bundle": "<5.4",
"symfony/http-kernel": "<5.4",
"symfony/translation": "<5.4",
"symfony/translation-contracts": "<1.1.7",
"symfony/translation-contracts": "<2.5",
"symfony/twig-bridge": "<5.4"
},
"suggest": {
Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,6 @@ private static function startVulcain(HttpClientInterface $client)
throw new SkippedTestSuiteError('Testing with the "vulcain" is not supported on Windows.');
}

if (['application/json'] !== $client->request('GET', 'http://127.0.0.1:8057/json')->getHeaders()['content-type']) {
throw new SkippedTestSuiteError('symfony/http-client-contracts >= 2.0.1 required');
}

$process = new Process(['vulcain'], null, [
'DEBUG' => 1,
'UPSTREAM' => 'http://127.0.0.1:8057',
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/HttpClient/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"require": {
"php": ">=8.1",
"psr/log": "^1|^2|^3",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/http-client-contracts": "^3",
"symfony/service-contracts": "^1.0|^2|^3"
"symfony/service-contracts": "^2.5|^3"
},
"require-dev": {
"amphp/amp": "^2.5",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/HttpFoundation/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": ">=8.1",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/polyfill-mbstring": "~1.1",
"symfony/polyfill-php83": "^1.27"
},
Expand Down
8 changes: 5 additions & 3 deletions src/Symfony/Component/HttpKernel/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": ">=8.1",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/error-handler": "^6.1",
"symfony/event-dispatcher": "^5.4|^6.0",
"symfony/http-foundation": "^5.4|^6.0",
Expand All @@ -34,12 +34,12 @@
"symfony/dom-crawler": "^5.4|^6.0",
"symfony/expression-language": "^5.4|^6.0",
"symfony/finder": "^5.4|^6.0",
"symfony/http-client-contracts": "^1.1|^2|^3",
"symfony/http-client-contracts": "^2.5|^3",
"symfony/process": "^5.4|^6.0",
"symfony/routing": "^5.4|^6.0",
"symfony/stopwatch": "^5.4|^6.0",
"symfony/translation": "^5.4|^6.0",
"symfony/translation-contracts": "^1.1|^2|^3",
"symfony/translation-contracts": "^2.5|^3",
"symfony/uid": "^5.4|^6.0",
"psr/cache": "^1.0|^2.0|^3.0",
"twig/twig": "^2.13|^3.0.4"
Expand All @@ -56,9 +56,11 @@
"symfony/dependency-injection": "<6.2",
"symfony/doctrine-bridge": "<5.4",
"symfony/http-client": "<5.4",
"symfony/http-client-contracts": "<2.5",
"symfony/mailer": "<5.4",
"symfony/messenger": "<5.4",
"symfony/translation": "<5.4",
"symfony/translation-contracts": "<2.5",
"symfony/twig-bridge": "<5.4",
"symfony/validator": "<5.4",
"twig/twig": "<2.13"
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Ldap/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"require": {
"php": ">=8.1",
"ext-ldap": "*",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/options-resolver": "^5.4|^6.0"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Mailer/Bridge/OhMySmtp/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"require": {
"php": ">=8.1",
"psr/event-dispatcher": "^1",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/mailer": "^5.4|^6.0"
},
"require-dev": {
Expand Down
5 changes: 3 additions & 2 deletions src/Symfony/Component/Mailer/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@
"psr/log": "^1|^2|^3",
"symfony/event-dispatcher": "^5.4|^6.0",
"symfony/mime": "^6.2",
"symfony/service-contracts": "^1.1|^2|^3"
"symfony/service-contracts": "^2.5|^3"
},
"require-dev": {
"symfony/console": "^5.4|^6.0",
"symfony/http-client-contracts": "^1.1|^2|^3",
"symfony/http-client-contracts": "^2.5|^3",
"symfony/messenger": "^6.2",
"symfony/twig-bridge": "^6.2"
},
"conflict": {
"symfony/http-client-contracts": "<2.5",
"symfony/http-kernel": "<5.4",
"symfony/messenger": "<6.2",
"symfony/mime": "<6.2",
Expand Down
7 changes: 5 additions & 2 deletions src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,17 @@
"async-aws/core": "^1.5",
"async-aws/sqs": "^1.0",
"symfony/messenger": "^5.4|^6.0",
"symfony/service-contracts": "^1.1|^2|^3",
"symfony/service-contracts": "^2.5|^3",
"psr/log": "^1|^2|^3"
},
"require-dev": {
"symfony/http-client-contracts": "^1|^2|^3",
"symfony/http-client-contracts": "^2.5|^3",
"symfony/property-access": "^5.4|^6.0",
"symfony/serializer": "^5.4|^6.0"
},
"conflict": {
"symfony/http-client-contracts": "<2.5"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Messenger\\Bridge\\AmazonSqs\\": "" },
"exclude-from-classmap": [
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"php": ">=8.1",
"doctrine/dbal": "^2.13|^3.0",
"symfony/messenger": "^5.4|^6.0",
"symfony/service-contracts": "^1.1|^2|^3"
"symfony/service-contracts": "^2.5|^3"
},
"require-dev": {
"doctrine/persistence": "^1.3|^2|^3",
Expand Down
Loading