Skip to content

Commit 535bfa3

Browse files
committed
Merge branch '2.3' into 2.4
* 2.3: fixed typos Fixed deprecated method calls Add testing against HHVM at Travis-CI Fixed typo Fixed typo fixed acronyms [Validator] Fixed IBAN validator with 0750447346 value Conflicts: src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
2 parents 36f6e92 + 65545eb commit 535bfa3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Firewall/ExceptionListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ private function startAuthentication(Request $request, AuthenticationException $
199199
*/
200200
protected function setTargetPath(Request $request)
201201
{
202-
// session isn't required when using http basic authentication mechanism for example
202+
// session isn't required when using HTTP basic authentication mechanism for example
203203
if ($request->hasSession() && $request->isMethodSafe()) {
204204
$request->getSession()->set('_security.'.$this->providerKey.'.target_path', $request->getUri());
205205
}

HttpUtils.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class HttpUtils
3535
* Constructor.
3636
*
3737
* @param UrlGeneratorInterface $urlGenerator A UrlGeneratorInterface instance
38-
* @param UrlMatcherInterface|RequestMatcherInterface $urlMatcher The Url or Request matcher
38+
* @param UrlMatcherInterface|RequestMatcherInterface $urlMatcher The URL or Request matcher
3939
*
4040
* @throws \InvalidArgumentException
4141
*/
@@ -146,7 +146,7 @@ public function generateUri($request, $path)
146146

147147
$url = $this->urlGenerator->generate($path, $request->attributes->all(), UrlGeneratorInterface::ABSOLUTE_URL);
148148

149-
// unnecessary query string parameters must be removed from url
149+
// unnecessary query string parameters must be removed from URL
150150
// (ie. query parameters that are presents in $attributes)
151151
// fortunately, they all are, so we have to remove entire query string
152152
$position = strpos($url, '?');

0 commit comments

Comments
 (0)