Merge branch '2.8' into 3.0

* 2.8:
  Typo fix
  [WebProfiler] Fixed sf-minitoolbar height
  [2.3] Static Code Analysis for Components
  [Serializer] Use $context['cache_key'] to enhance caching
  Fixed erroneous deprecation notice for extended Interfaces
  [Routing] cs fix
  Added support \IteratorAggregate for UniqueEntityValidator
  Update AbstractChoiceListTest.php
  Fix #17306 Paths with % in it are note allowed (like urlencoded)
  Use proper class to fetch $versionStrategy property
  Added sort order SORT_STRING for params in UriSigner
  Remove normalizer cache in Serializer class
  [Serializer] ObjectNormalizer: context can contain not serializable data

1 files changed, 2 insertions, 4 deletions

diff --git a/Http/Firewall/DigestAuthenticationListener.php b/Http/Firewall/DigestAuthenticationListener.php
index ef723ea..71bdf6c 100644
--- a/Http/Firewall/DigestAuthenticationListener.php
+++ b/Http/Firewall/DigestAuthenticationListener.php
@@ -170,10 +170,8 @@ class DigestData
             throw new BadCredentialsException(sprintf('Missing mandatory digest value; received header "%s" (%s)', $this->header, implode(', ', $keys)));
         }
 
-        if ('auth' === $this->elements['qop']) {
-            if (!isset($this->elements['nc']) || !isset($this->elements['cnonce'])) {
-                throw new BadCredentialsException(sprintf('Missing mandatory digest value; received header "%s"', $this->header));
-            }
+        if ('auth' === $this->elements['qop'] && !isset($this->elements['nc'], $this->elements['cnonce'])) {
+            throw new BadCredentialsException(sprintf('Missing mandatory digest value; received header "%s"', $this->header));
         }
 
         if ($expectedRealm !== $this->elements['realm']) {