Skip to content

Commit

Permalink
Merge branch '3.1'
Browse files Browse the repository at this point in the history
* 3.1:
  [Debug] Remove GLOBALS from exception context to avoid endless recursion
  [Serializer] Improve test coverage of the MaxDepth annotation
  DX: replace @link with @see annotation
  bumped min version of Twig to 1.28
  • Loading branch information
fabpot committed Nov 16, 2016
2 parents 31e25ce + 5a4c809 commit fcc5d16
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion File/MimeType/FileinfoMimeTypeGuesser.php
Expand Up @@ -28,7 +28,7 @@ class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface
*
* @param string $magicFile A magic file to use with the finfo instance
*
* @link http://www.php.net/manual/en/function.finfo-open.php
* @see http://www.php.net/manual/en/function.finfo-open.php
*/
public function __construct($magicFile = null)
{
Expand Down
2 changes: 1 addition & 1 deletion Request.php
Expand Up @@ -1693,7 +1693,7 @@ public function getAcceptableContentTypes()
* It works if your JavaScript library sets an X-Requested-With HTTP header.
* It is known to work with common JavaScript frameworks:
*
* @link http://en.wikipedia.org/wiki/List_of_Ajax_frameworks#JavaScript
* @see http://en.wikipedia.org/wiki/List_of_Ajax_frameworks#JavaScript
*
* @return bool true if the request is an XMLHttpRequest, false otherwise
*/
Expand Down
2 changes: 1 addition & 1 deletion Response.php
Expand Up @@ -1213,7 +1213,7 @@ public static function closeOutputBuffers($targetLevel, $flush)
/**
* Checks if we need to remove Cache-Control for SSL encrypted downloads when using IE < 9.
*
* @link http://support.microsoft.com/kb/323308
* @see http://support.microsoft.com/kb/323308
*/
protected function ensureIEOverSSLCompatibility(Request $request)
{
Expand Down

0 comments on commit fcc5d16

Please sign in to comment.