Skip to content
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

[12.x] Update Symfony and PHPUnit dependencies #54019

Merged
merged 4 commits into from
Dec 26, 2024
Merged

[12.x] Update Symfony and PHPUnit dependencies #54019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
838d763
Uses Symfony 7.2
crynobone Dec 26, 2024
6b3d906
Remove support for PHPUnit 10
crynobone Dec 26, 2024
8f0fc52
wip
crynobone Dec 26, 2024
b3e2a95
wip
crynobone Dec 26, 2024
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 .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
fail-fast: true
matrix:
php: [8.2, 8.3, 8.4]
phpunit: ['10.5.12', '11.3.2']
phpunit: ['11.3.6']
stability: [prefer-lowest, prefer-stable]

name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }}
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
fail-fast: true
matrix:
php: [8.2, 8.3, 8.4]
phpunit: ['10.5', '11.0.1']
phpunit: ['11.3.6']
stability: [prefer-lowest, prefer-stable]
exclude:
- php: 8.4
Expand Down
43 changes: 21 additions & 22 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,18 @@
"psr/log": "^1.0|^2.0|^3.0",
"psr/simple-cache": "^1.0|^2.0|^3.0",
"ramsey/uuid": "^4.7",
"symfony/console": "^7.0.3",
"symfony/error-handler": "^7.0.3",
"symfony/finder": "^7.0.3",
"symfony/console": "^7.2.0",
"symfony/error-handler": "^7.2.0",
"symfony/finder": "^7.2.0",
"symfony/http-foundation": "^7.2.0",
"symfony/http-kernel": "^7.0.3",
"symfony/mailer": "^7.0.3",
"symfony/mime": "^7.0.3",
"symfony/http-kernel": "^7.2.0",
"symfony/mailer": "^7.2.0",
"symfony/mime": "^7.2.0",
"symfony/polyfill-php83": "^1.31",
"symfony/process": "^7.0.3",
"symfony/routing": "^7.0.3",
"symfony/uid": "^7.0.3",
"symfony/var-dumper": "^7.0.3",
"symfony/process": "^7.2.0",
"symfony/routing": "^7.2.0",
"symfony/uid": "^7.2.0",
"symfony/var-dumper": "^7.2.0",
"tijsverkoyen/css-to-inline-styles": "^2.2.5",
"vlucas/phpdotenv": "^5.6.1",
"voku/portable-ascii": "^2.0.2"
Expand Down Expand Up @@ -114,16 +114,15 @@
"pda/pheanstalk": "^5.0.6",
"php-http/discovery": "^1.15",
"phpstan/phpstan": "^1.11.5",
"phpunit/phpunit": "^10.5.35|^11.3.6",
"phpunit/phpunit": "^11.3.6",
"predis/predis": "^2.3",
"resend/resend-php": "^0.10.0",
"symfony/cache": "^7.0.3",
"symfony/http-client": "^7.0.3",
"symfony/psr-http-message-bridge": "^7.0.3",
"symfony/translation": "^7.0.3"
"symfony/cache": "^7.2.0",
"symfony/http-client": "^7.2.0",
"symfony/psr-http-message-bridge": "^7.2.0",
"symfony/translation": "^7.2.0"
},
"conflict": {
"mockery/mockery": "1.6.8",
"tightenco/collect": "<5.5.33"
},
"provide": {
Expand Down Expand Up @@ -193,12 +192,12 @@
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
"resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",
"symfony/cache": "Required to PSR-6 cache bridge (^7.0).",
"symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).",
"symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.0).",
"symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.0).",
"symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.0).",
"symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.0)."
"symfony/cache": "Required to PSR-6 cache bridge (^7.2).",
"symfony/filesystem": "Required to enable support for relative symbolic links (^7.2).",
"symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.2).",
"symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.2).",
"symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.2).",
"symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.2)."
},
"config": {
"sort-packages": true,
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Cache/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"illuminate/database": "Required to use the database cache driver (^12.0).",
"illuminate/filesystem": "Required to use the file cache driver (^12.0).",
"illuminate/redis": "Required to use the redis cache driver (^12.0).",
"symfony/cache": "Required to use PSR-6 cache bridge (^7.0)."
"symfony/cache": "Required to use PSR-6 cache bridge (^7.2)."
},
"config": {
"sort-packages": true
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Collections/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
}
},
"suggest": {
"symfony/var-dumper": "Required to use the dump method (^7.0)."
"symfony/var-dumper": "Required to use the dump method (^7.2)."
},
"config": {
"sort-packages": true
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Console/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"illuminate/view": "^12.0",
"laravel/prompts": "^0.3.0",
"nunomaduro/termwind": "^2.0",
"symfony/console": "^7.0.3",
"symfony/console": "^7.2.0",
"symfony/polyfill-php83": "^1.31",
"symfony/process": "^7.0.3"
"symfony/process": "^7.2.0"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Cookie/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"illuminate/contracts": "^12.0",
"illuminate/macroable": "^12.0",
"illuminate/support": "^12.0",
"symfony/http-foundation": "^7.0.3",
"symfony/http-kernel": "^7.0.3"
"symfony/http-foundation": "^7.2.0",
"symfony/http-kernel": "^7.2.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Database/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"illuminate/events": "Required to use the observers with Eloquent (^12.0).",
"illuminate/filesystem": "Required to use the migrations (^12.0).",
"illuminate/pagination": "Required to paginate the result set (^12.0).",
"symfony/finder": "Required to use Eloquent model factories (^7.0)."
"symfony/finder": "Required to use Eloquent model factories (^7.2)."
},
"config": {
"sort-packages": true
Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Filesystem/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"illuminate/contracts": "^12.0",
"illuminate/macroable": "^12.0",
"illuminate/support": "^12.0",
"symfony/finder": "^7.0.3"
"symfony/finder": "^7.2.0"
},
"autoload": {
"psr-4": {
Expand All @@ -38,14 +38,14 @@
"ext-fileinfo": "Required to use the Filesystem class.",
"ext-ftp": "Required to use the Flysystem FTP driver.",
"ext-hash": "Required to use the Filesystem class.",
"illuminate/http": "Required for handling uploaded files (^7.0).",
"illuminate/http": "Required for handling uploaded files (^7.2).",
"league/flysystem": "Required to use the Flysystem local driver (^3.25.1).",
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).",
"league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).",
"league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).",
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
"symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).",
"symfony/mime": "Required to enable support for guessing extensions (^7.0)."
"symfony/filesystem": "Required to enable support for relative symbolic links (^7.2).",
"symfony/mime": "Required to enable support for guessing extensions (^7.2)."
},
"config": {
"sort-packages": true
Expand Down
6 changes: 3 additions & 3 deletions src/Illuminate/Http/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"illuminate/macroable": "^12.0",
"illuminate/session": "^12.0",
"illuminate/support": "^12.0",
"symfony/http-foundation": "^7.0.3",
"symfony/http-kernel": "^7.0.3",
"symfony/http-foundation": "^7.2.0",
"symfony/http-kernel": "^7.2.0",
"symfony/polyfill-php83": "^1.31",
"symfony/mime": "^7.0.3"
"symfony/mime": "^7.2.0"
},
"autoload": {
"psr-4": {
Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Mail/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"illuminate/support": "^12.0",
"league/commonmark": "^2.6",
"psr/log": "^1.0|^2.0|^3.0",
"symfony/mailer": "^7.0.3",
"symfony/mailer": "^7.2.0",
"tijsverkoyen/css-to-inline-styles": "^2.2.5"
},
"autoload": {
Expand All @@ -38,9 +38,9 @@
"suggest": {
"aws/aws-sdk-php": "Required to use the SES mail driver (^3.322.9).",
"resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",
"symfony/http-client": "Required to use the Symfony API mail transports (^7.0).",
"symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.0).",
"symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.0)."
"symfony/http-client": "Required to use the Symfony API mail transports (^7.2).",
"symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.2).",
"symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.2)."
},
"config": {
"sort-packages": true
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Process/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"illuminate/contracts": "^11.0",
"illuminate/macroable": "^11.0",
"illuminate/support": "^11.0",
"symfony/process": "^7.0.3"
"symfony/process": "^7.2.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Queue/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"illuminate/support": "^12.0",
"laravel/serializable-closure": "^1.3|^2.0",
"ramsey/uuid": "^4.7",
"symfony/process": "^7.0.3"
"symfony/process": "^7.2.0"
},
"autoload": {
"psr-4": {
Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Routing/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"illuminate/pipeline": "^12.0",
"illuminate/session": "^12.0",
"illuminate/support": "^12.0",
"symfony/http-foundation": "^7.0.3",
"symfony/http-kernel": "^7.0.3",
"symfony/routing": "^7.0.3"
"symfony/http-foundation": "^7.2.0",
"symfony/http-kernel": "^7.2.0",
"symfony/routing": "^7.2.0"
},
"autoload": {
"psr-4": {
Expand All @@ -42,7 +42,7 @@
"suggest": {
"illuminate/console": "Required to use the make commands (^12.0).",
"php-http/discovery": "Required to use PSR-7 bridging features (^1.15).",
"symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.0)."
"symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.2)."
},
"config": {
"sort-packages": true,
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Session/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"illuminate/contracts": "^12.0",
"illuminate/filesystem": "^12.0",
"illuminate/support": "^12.0",
"symfony/finder": "^7.0.3",
"symfony/http-foundation": "^7.0.3"
"symfony/finder": "^7.2.0",
"symfony/http-foundation": "^7.2.0"
},
"autoload": {
"psr-4": {
Expand Down
22 changes: 0 additions & 22 deletions src/Illuminate/Support/Process/PhpExecutableFinder.php
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/Illuminate/Support/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
"league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.6).",
"league/uri": "Required to use the Uri class (^7.5.1).",
"ramsey/uuid": "Required to use Str::uuid() (^4.7).",
"symfony/process": "Required to use the Composer class (^7.0).",
"symfony/uid": "Required to use Str::ulid() (^7.0).",
"symfony/var-dumper": "Required to use the dd function (^7.0).",
"symfony/process": "Required to use the Composer class (^7.2).",
"symfony/uid": "Required to use Str::ulid() (^7.2).",
"symfony/var-dumper": "Required to use the dd function (^7.2).",
"vlucas/phpdotenv": "Required to use the Env class and env helper (^5.6.1)."
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Support/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Illuminate\Support\Defer\DeferredCallback;
use Illuminate\Support\Defer\DeferredCallbackCollection;
use Illuminate\Support\Process\PhpExecutableFinder;
use Symfony\Component\Process\PhpExecutableFinder;

if (! function_exists('Illuminate\Support\defer')) {
/**
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Validation/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"illuminate/macroable": "^12.0",
"illuminate/support": "^12.0",
"illuminate/translation": "^12.0",
"symfony/http-foundation": "^7.0",
"symfony/mime": "^7.0"
"symfony/http-foundation": "^7.2",
"symfony/mime": "^7.2"
},
"autoload": {
"psr-4": {
Expand Down
22 changes: 4 additions & 18 deletions tests/Mail/MailManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,7 @@ public function testMailUrlConfig($scheme, $port)
$this->assertSame('127.0.0.2', $transport->getStream()->getHost());
$this->assertSame($port, $transport->getStream()->getPort());
$this->assertSame($port === 465, $transport->getStream()->isTLS());

if (method_exists($transport, 'isAutoTls')) {
// Only available from Symfony Mailer 7.1
$this->assertTrue($transport->isAutoTls());
}
$this->assertTrue($transport->isAutoTls());
}

#[TestWith([null, 5876])]
Expand All @@ -79,11 +75,7 @@ public function testMailUrlConfigWithAutoTls($scheme, $port)
$this->assertSame('127.0.0.2', $transport->getStream()->getHost());
$this->assertSame($port, $transport->getStream()->getPort());
$this->assertSame($port === 465, $transport->getStream()->isTLS());

if (method_exists($transport, 'isAutoTls')) {
// Only available from Symfony Mailer 7.1
$this->assertTrue($transport->isAutoTls());
}
$this->assertTrue($transport->isAutoTls());
}

#[TestWith([null, 5876])]
Expand All @@ -107,14 +99,8 @@ public function testMailUrlConfigWithAutoTlsDisabled($scheme, $port)
$this->assertSame('pwd', $transport->getPassword());
$this->assertSame('127.0.0.2', $transport->getStream()->getHost());
$this->assertSame($port, $transport->getStream()->getPort());

if (method_exists($transport, 'isAutoTls')) {
// Only available from Symfony Mailer 7.1
$this->assertFalse($transport->isAutoTls());
$this->assertSame($port === 465 && $scheme !== 'smtp', $transport->getStream()->isTLS());
} else {
$this->assertSame($port === 465, $transport->getStream()->isTLS());
}
$this->assertFalse($transport->isAutoTls());
$this->assertSame($port === 465 && $scheme !== 'smtp', $transport->getStream()->isTLS());
}

public function testBuild()
Expand Down