[HttpFoundation] tweaked previous merge (refs #8185)

fabpot · fabpot · commit f731d9938405 · 2013-06-13T09:27:06.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+2.4.0
+-----
+
+ * added Request::getEncodings()
+
 2.3.0
 -----
 
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -117,6 +117,11 @@ class Request
      */
     protected $charsets;
 
+    /**
+     * @var array
+     */
+    protected $encodings;
+
     /**
      * @var array
      */
@@ -1450,14 +1455,13 @@ public function getCharsets()
      * Gets a list of encodings acceptable by the client browser.
      *
      * @return array List of encodings in preferable order
-     *
-     * @api
      */
     public function getEncodings()
     {
         if (null !== $this->encodings) {
             return $this->encodings;
         }
+
         return $this->encodings = array_keys(AcceptHeader::fromString($this->headers->get('Accept-Encoding'))->all());
     }
 
