Skip to content

Commit c0396b1

Browse files
committed
Merge branch '2.3' into 2.4
* 2.3: removed unneeded use statements Prepend Child Bundle paths before the parent [Routing] add unit tests for Symfony\Component\Routing\RequestContext class Conflicts: src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php src/Symfony/Component/Validator/ConstraintValidatorFactory.php
2 parents 7a123d1 + de33afb commit c0396b1

File tree

2 files changed

+0
-3
lines changed

2 files changed

+0
-3
lines changed

Encoder/BCryptPasswordEncoder.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Security\Core\Encoder;
1313

14-
use Symfony\Component\Security\Core\Encoder\BasePasswordEncoder;
1514
use Symfony\Component\Security\Core\Exception\BadCredentialsException;
1615

1716
/**

Exception/NonceExpiredException.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
namespace Symfony\Component\Security\Core\Exception;
1313

14-
use Symfony\Component\Security\Core\Exception\AuthenticationException;
15-
1614
/**
1715
* NonceExpiredException is thrown when an authentication is rejected because
1816
* the digest nonce has expired.

0 commit comments

Comments
 (0)