Skip to content

Commit

Permalink
Merge branch '6.4' into 7.0
Browse files Browse the repository at this point in the history
* 6.4:
  [Filesystem] Fix str_contains deprecation
  [Security] Correctly initialize the voter property
  [ErrorHandler] Skip failing tests when "xdebug.file_link_format" option is defined
  [FrameworkBundle] Fix typo
  Update `changed-translation-files` step with native git diff command
  [DependencyInjection] fix XmlDumper when a tag contains also a 'name' property
  [Lock] Check the correct SQLSTATE error code for MySQL
  [ErrorHandler] Fix `ErrorHandlerTest::tearDown()` visibility
  [Lock] compatiblity with redis cluster 7
  fix: typo
  [Messenger] trigger retry logic when message is a redelivery
  [PropertyAccess] Fix checking for missing properties
  add missing invalid extension error entry
  • Loading branch information
derrabus committed Mar 15, 2024
2 parents 804a899 + 54c6349 commit 288c64c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ CHANGELOG
* Add `HandlerDescriptor::getOptions`
* Add support for multiple Redis Sentinel hosts
* Add `--all` option to the `messenger:failed:remove` command
* `RejectRedeliveredMessageException` implements `UnrecoverableExceptionInterface` in order to not be retried
* Add `WrappedExceptionsInterface` interface for exceptions that hold multiple individual exceptions
* Deprecate `HandlerFailedException::getNestedExceptions()`, `HandlerFailedException::getNestedExceptionsOfClass()`
and `DelayedMessageHandlingException::getExceptions()` which are replaced by a new `getWrappedExceptions()` method
Expand Down
2 changes: 1 addition & 1 deletion Exception/RejectRedeliveredMessageException.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
/**
* @author Tobias Schultze <http://tobion.de>
*/
class RejectRedeliveredMessageException extends RuntimeException implements UnrecoverableExceptionInterface
class RejectRedeliveredMessageException extends RuntimeException
{
}

0 comments on commit 288c64c

Please sign in to comment.