Skip to content

Fixes #354 Add class_exists before aliasing class #356

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 4 commits into from
Jul 8, 2020
Merged

Fixes #354 Add class_exists before aliasing class #356

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
d674b1f
Use 3.5.x branch
annuh Jul 7, 2020
8f9ad2a
Update CHANGELOG.md
annuh Jul 8, 2020
a683859
Fix PHP-CS issues
annuh Jul 8, 2020
0d35678
Improve changelog message
Jean85 Jul 8, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## Unreleased
- Use `jean85/pretty-package-versions` `^1.5` to leverage the new `getRootPackageVersion` method (c8799ac)
- Fix support for PHP preloading (#354, thanks to @annuh)

## 3.5.1 (2020-05-07)
- Capture events using the `Hub` in the `MessengerListener` to avoid loosing `Scope` data (#339, thanks to @sh41)
Expand Down
16 changes: 12 additions & 4 deletions src/EventListener/RequestListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,19 @@
use Symfony\Component\Security\Core\User\UserInterface;

if (Kernel::MAJOR_VERSION >= 5) {
class_alias(RequestEvent::class, RequestListenerRequestEvent::class);
class_alias(ControllerEvent::class, RequestListenerControllerEvent::class);
if (! class_exists(RequestListenerRequestEvent::class, false)) {
class_alias(RequestEvent::class, RequestListenerRequestEvent::class);
}
if (! class_exists(RequestListenerControllerEvent::class, false)) {
class_alias(ControllerEvent::class, RequestListenerControllerEvent::class);
}
} else {
class_alias(GetResponseEvent::class, RequestListenerRequestEvent::class);
class_alias(FilterControllerEvent::class, RequestListenerControllerEvent::class);
if (! class_exists(RequestListenerRequestEvent::class, false)) {
class_alias(GetResponseEvent::class, RequestListenerRequestEvent::class);
}
if (! class_exists(RequestListenerControllerEvent::class, false)) {
class_alias(FilterControllerEvent::class, RequestListenerControllerEvent::class);
}
}

/**
Expand Down