merged branch lyrixx/fix-request-get (PR symfony#5894)

fabpot · fabpot · commit 313e4e5fd6a0 · 2012-11-02T19:00:55.000+01:00
This PR was merged into the 2.1 branch. Commits ------- b9f6cac [2.1][HttpFoundation] Fixed Php doc in Request::get Discussion ---------- [2.1][HttpFoundation] Fixed Php doc in Request::get Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes License of the code: MIT According to php code, `Request::get` method does not seek in cookies. --------------------------------------------------------------------------- by pborreli at 2012-11-02T11:02:26Z your PR is full of reSquest typo :) --------------------------------------------------------------------------- by lyrixx at 2012-11-02T11:25:31Z @pborreli Fixed
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -508,15 +508,15 @@ public static function normalizeQueryString($qs)
      *
      * This method is mainly useful for libraries that want to provide some flexibility.
      *
-     * Order of precedence: GET, PATH, POST, COOKIE
+     * Order of precedence: GET, PATH, POST
      *
      * Avoid using this method in controllers:
      *
      *  * slow
      *  * prefer to get from a "named" source
      *
      * It is better to explicitly get request parameters from the appropriate
-     * public property instead (query, request, attributes, ...).
+     * public property instead (query, attributes, request).
      *
      * @param string  $key     the key
      * @param mixed   $default the default value

Original file line number	Diff line number	Diff line change
`@@ -508,15 +508,15 @@ public static function normalizeQueryString($qs)`
`508`	`508`	`*`
`509`	`509`	`* This method is mainly useful for libraries that want to provide some flexibility.`
`510`	`510`	`*`
`511`		`- * Order of precedence: GET, PATH, POST, COOKIE`
	`511`	`+ * Order of precedence: GET, PATH, POST`
`512`	`512`	`*`
`513`	`513`	`* Avoid using this method in controllers:`
`514`	`514`	`*`
`515`	`515`	`* * slow`
`516`	`516`	`* * prefer to get from a "named" source`
`517`	`517`	`*`
`518`	`518`	`* It is better to explicitly get request parameters from the appropriate`
`519`		`- * public property instead (query, request, attributes, ...).`
	`519`	`+ * public property instead (query, attributes, request).`
`520`	`520`	`*`
`521`	`521`	`* @param string $key the key`
`522`	`522`	`* @param mixed $default the default value`