diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-12-28 22:39:51 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-12-28 22:39:51 +0100 |
| commit | 97325c1041507924753cf285f4a4bb00ab429fc9 (patch) | |
| tree | 81516f52063e00c32ce7084114e15b0226f95d53 /Http/HttpUtils.php | |
| parent | 8671ca5b3f863275b19c7bba751278926bc3dace (diff) | |
| parent | 9bb5809ad7745183e0f3636ff3d6b26ffd3b182e (diff) | |
| download | symfony-security-97325c1041507924753cf285f4a4bb00ab429fc9.zip symfony-security-97325c1041507924753cf285f4a4bb00ab429fc9.tar.gz symfony-security-97325c1041507924753cf285f4a4bb00ab429fc9.tar.bz2 | |
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
Diffstat (limited to 'Http/HttpUtils.php')
| -rw-r--r-- | Http/HttpUtils.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Http/HttpUtils.php b/Http/HttpUtils.php index 60733ad..422c8ce 100644 --- a/Http/HttpUtils.php +++ b/Http/HttpUtils.php @@ -35,7 +35,7 @@ class HttpUtils * Constructor. * * @param UrlGeneratorInterface $urlGenerator A UrlGeneratorInterface instance - * @param UrlMatcherInterface|RequestMatcherInterface $urlMatcher The Url or Request matcher + * @param UrlMatcherInterface|RequestMatcherInterface $urlMatcher The URL or Request matcher * * @throws \InvalidArgumentException */ @@ -146,7 +146,7 @@ class HttpUtils $url = $this->urlGenerator->generate($path, $request->attributes->all(), UrlGeneratorInterface::ABSOLUTE_URL); - // unnecessary query string parameters must be removed from url + // unnecessary query string parameters must be removed from URL // (ie. query parameters that are presents in $attributes) // fortunately, they all are, so we have to remove entire query string $position = strpos($url, '?'); |