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

Jump to bottom

Symfony 7 support #761

Merged
merged 22 commits into from
Dec 5, 2023
Merged

Symfony 7 support #761

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d43def5
Allow Symfony 7
Jean85 Sep 13, 2023
0b4e1be
Force Symfony 6.4-dev
Jean85 Sep 13, 2023
968b232
Apply type changes
Jean85 Sep 13, 2023
01387f0
Merge branch 'master' into symfony-7
ste93cry Nov 4, 2023
50c4fc1
Revert "Force Symfony 6.4-dev"
ste93cry Nov 4, 2023
dc3aba1
Revert "Apply type changes"
ste93cry Nov 4, 2023
b225b1c
Add Symfony `7.*` to CI tests matrix
ste93cry Nov 4, 2023
9ff5894
Support `symfony/psr-http-message-bridge:^7.0`
ste93cry Nov 4, 2023
02812ea
Merge branch 'master' into symfony-7
cleptric Dec 4, 2023
8a80d78
Bump PHP SDKs
cleptric Dec 4, 2023
44ba0f6
Bump php-cs-fixer
cleptric Dec 4, 2023
cf8823b
Update rule set
cleptric Dec 4, 2023
71fe1eb
Bump psalm
cleptric Dec 4, 2023
3972749
Handle capturing of exceptions implementing `WrappedExceptionsInterface`
ste93cry Dec 4, 2023
594964e
Make PHPStan aware of booted kernel in E2E tests
ste93cry Dec 4, 2023
34e545a
Update tests to account for removed `HttpKernelInterface::MASTER_REQU…
ste93cry Dec 4, 2023
d35ef7e
Fix coding standard
ste93cry Dec 4, 2023
35270b0
Update PHPStan baseline
ste93cry Dec 4, 2023
3ef70dd
Stop implementing the no longer existing `MessageHandlerInterface` in…
ste93cry Dec 4, 2023
882839c
Remove unnecessary `symfony/dom-crawler` dev requirement
ste93cry Dec 4, 2023
16f7418
Require a version of `masterminds/html5` compatible with PHP `>=8.1`
ste93cry Dec 4, 2023
fcd1a16
Revert "Remove unnecessary `symfony/dom-crawler` dev requirement"
ste93cry Dec 5, 2023
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
40 changes: 23 additions & 17 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,17 @@
"sentry/sdk": "^3.4",
ste93cry marked this conversation as resolved.
Show resolved Hide resolved
"sentry/sentry": "^3.20.1",
"symfony/cache-contracts": "^1.1||^2.4||^3.0",
"symfony/config": "^4.4.20||^5.0.11||^6.0",
"symfony/console": "^4.4.20||^5.0.11||^6.0",
"symfony/dependency-injection": "^4.4.20||^5.0.11||^6.0",
"symfony/event-dispatcher": "^4.4.20||^5.0.11||^6.0",
"symfony/http-kernel": "^4.4.20||^5.0.11||^6.0",
"symfony/config": "6.4.x-dev as 6.4.99",
"symfony/console": "6.4.x-dev as 6.4.99",
"symfony/dependency-injection": "6.4.x-dev as 6.4.99",
"symfony/event-dispatcher": "6.4.x-dev as 6.4.99",
"symfony/http-foundation": "6.4.x-dev as 6.4.99",
"symfony/http-kernel": "6.4.x-dev as 6.4.99",
"symfony/polyfill-php80": "^1.22",
"symfony/psr-http-message-bridge": "^1.2||^2.0",
ste93cry marked this conversation as resolved.
Show resolved Hide resolved
"symfony/security-core": "^4.4.20||^5.0.11||^6.0",
"symfony/security-http": "^4.4.20||^5.0.11||^6.0"
"symfony/routing": "6.4.x-dev as 6.4.99",
"symfony/security-core": "6.4.x-dev as 6.4.99",
"symfony/security-http": "6.4.x-dev as 6.4.99"
},
"require-dev": {
"doctrine/dbal": "^2.13||^3.0",
Expand All @@ -53,19 +55,23 @@
"phpstan/phpstan-phpunit": "^1.0",
"phpstan/phpstan-symfony": "^1.0",
"phpunit/phpunit": "^8.5.14||^9.3.9",
"symfony/browser-kit": "^4.4.20||^5.0.11||^6.0",
"symfony/cache": "^4.4.20||^5.0.11||^6.0",
"symfony/dom-crawler": "^4.4.20||^5.0.11||^6.0",
"symfony/framework-bundle": "^4.4.20||^5.0.11||^6.0",
"symfony/http-client": "^4.4.20||^5.0.11||^6.0",
"symfony/messenger": "^4.4.20||^5.0.11||^6.0",
"symfony/browser-kit": "6.4.x-dev as 6.4.99",
"symfony/cache": "6.4.x-dev as 6.4.99",
"symfony/dom-crawler": "6.4.x-dev as 6.4.99",
"symfony/error-handler": "6.4.x-dev as 6.4.99",
"symfony/framework-bundle": "6.4.x-dev as 6.4.99",
"symfony/http-client": "6.4.x-dev as 6.4.99",
"symfony/messenger": "6.4.x-dev as 6.4.99",
"symfony/monolog-bundle": "^3.4",
"symfony/phpunit-bridge": "^5.2.6||^6.0",
"symfony/process": "^4.4.20||^5.0.11||^6.0",
"symfony/twig-bundle": "^4.4.20||^5.0.11||^6.0",
"symfony/yaml": "^4.4.20||^5.0.11||^6.0",
"symfony/phpunit-bridge": "6.4.x-dev as 6.4.99",
"symfony/process": "6.4.x-dev as 6.4.99",
"symfony/twig-bundle": "6.4.x-dev as 6.4.99",
"symfony/yaml": "6.4.x-dev as 6.4.99",
"vimeo/psalm": "^4.3"
},
"replace": {
"sentry/sdk": "*"
},
"suggest": {
"monolog/monolog": "Allow sending log messages to Sentry by using the included Monolog handler.",
"doctrine/doctrine-bundle": "Allow distributed tracing of database queries using Sentry.",
Expand Down
2 changes: 1 addition & 1 deletion src/Tracing/Cache/TraceableCacheAdapterForV2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function __construct(HubInterface $hub, AdapterInterface $decoratedAdapte
*
* @return mixed
*/
public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
ste93cry marked this conversation as resolved.
Show resolved Hide resolved
{
return $this->traceFunction('cache.get_item', function () use ($key, $callback, $beta, &$metadata) {
if (!$this->decoratedAdapter instanceof CacheInterface) {
Expand Down
2 changes: 1 addition & 1 deletion src/Tracing/Cache/TraceableTagAwareCacheAdapterForV2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function __construct(HubInterface $hub, TagAwareAdapterInterface $decorat
*
* @return mixed
*/
public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
ste93cry marked this conversation as resolved.
Show resolved Hide resolved
{
return $this->traceFunction('cache.get_item', function () use ($key, $callback, $beta, &$metadata) {
if (!$this->decoratedAdapter instanceof CacheInterface) {
Expand Down
5 changes: 5 additions & 0 deletions tests/EventListener/Fixtures/UserWithoutIdentifierStub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,9 @@ public function getSalt(): ?string
public function eraseCredentials(): void
{
}

public function getUserIdentifier(): string
{
return $this->getUsername();
}
ste93cry marked this conversation as resolved.
Show resolved Hide resolved
}
Loading