Merge branch '3.4' into 4.3

* 3.4:
  [Routing] Add a param annotation for $annot.
  [DI] fix docblock
  Add missing translations for Armenian locale
  [Process] Doc block backport.
  Fix some docblocks.

Author: nicolas-grekas

Cookie.php

@@ -199,6 +199,11 @@ public static function fromString($cookie, $url = null)
         );
     }
 
+    /**
+     * @param string $dateValue
+     *
+     * @return string|null
+     */
     private static function parseDate($dateValue)
     {
         // trim single quotes around date if present
@@ -216,6 +221,8 @@ private static function parseDate($dateValue)
         if (false !== $date = date_create($dateValue, new \DateTimeZone('GMT'))) {
             return $date->format('U');
         }
+
+        return null;
     }
 
     /**

CookieJar.php

@@ -111,8 +111,8 @@ public function clear()
     /**
      * Updates the cookie jar from a response Set-Cookie headers.
      *
-     * @param array  $setCookies Set-Cookie headers from an HTTP response
-     * @param string $uri        The base URL
+     * @param string[] $setCookies Set-Cookie headers from an HTTP response
+     * @param string   $uri        The base URL
      */
     public function updateFromSetCookie(array $setCookies, $uri = null)
     {