Merge branch '2.7' into 2.8

* 2.7: bumped Symfony version to 2.7.12 updated VERSION for 2.7.11 updated CHANGELOG for 2.7.11 [Request] Fix support of custom mime types with parameters fix mocks fix mocks [Validator] do not treat payload as callback

Author: fabpot

CHANGELOG-2.7.md

@@ -7,6 +7,53 @@ in 2.7 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.7.0...v2.7.1
 
+* 2.7.11 (2016-03-25)
+
+ * bug #18255 [HttpFoundation] Fix support of custom mime types with parameters (Ener-Getick)
+ * bug #18272 [Bridge\PhpUnit] Workaround old phpunit bug, no colors in weak mode, add tests (nicolas-grekas)
+ * bug #18259 [PropertyAccess] Backport fixes from 2.7 (nicolas-grekas)
+ * bug #18261 [PropertyAccess] Fix isPropertyWritable not using the reflection cache (nicolas-grekas)
+ * bug #18224 [PropertyAccess] Remove most ref mismatches to improve perf (nicolas-grekas)
+ * bug #18210 [PropertyAccess] Throw an UnexpectedTypeException when the type do not match (dunglas, nicolas-grekas)
+ * bug #18216 [Intl] Fix invalid numeric literal on PHP 7 (nicolas-grekas)
+ * bug #18147 [Validator] EmailValidator cannot extract hostname if email contains multiple @ symbols (natechicago)
+ * bug #18023 [Process] getIncrementalOutput should work without calling getOutput (romainneutron)
+ * bug #18175 [Translation] Add support for fuzzy tags in PoFileLoader (nud)
+ * bug #18179 [Form] Fix NumberToLocalizedStringTransformer::reverseTransform with big integers (ovrflo, nicolas-grekas)
+ * bug #18164 [HttpKernel] set s-maxage only if all responses are cacheable (xabbuh)
+ * bug #18150 [Process] Wait a bit less on Windows (nicolas-grekas)
+ * bug #18130 [Debug] Replaced logic for detecting filesystem case sensitivity (Dan Blows)
+ * bug #18080 [HttpFoundation] Set the Content-Range header if the requested Range is unsatisfied (jakzal)
+ * bug #18084 [HttpFoundation] Avoid warnings when checking malicious IPs (jakzal)
+ * bug #18066 [Process] Fix pipes handling (nicolas-grekas)
+ * bug #18078 [Console] Fix an autocompletion question helper issue with non-sequentially indexed choices (jakzal)
+ * bug #18048 [HttpKernel] Fix mem usage when stripping the prod container (nicolas-grekas)
+ * bug #18065 [Finder] Partially revert #17134 to fix a regression (jakzal)
+ * bug #18018 [HttpFoundation] exception when registering bags for started sessions (xabbuh)
+ * bug #18054 [Filesystem] Fix false positive in ->remove() (nicolas-grekas)
+ * bug #18049 [Validator] Fix the locale validator so it treats a locale alias as a valid locale (jakzal)
+ * bug #18019 [Intl] Update ICU to version 55 (jakzal)
+ * bug #18015 [Process] Fix memory issue when using large input streams (romainneutron)
+ * bug #16656 [HttpFoundation] automatically generate safe fallback filename (xabbuh)
+ * bug #15794 [Console] default to stderr in the console helpers (alcohol)
+ * bug #17984 Allow to normalize \Traversable when serializing xml (Ener-Getick)
+ * bug #17434 Improved the error message when a template is not found (rvanginneken, javiereguiluz)
+ * bug #17687 Improved the error message when using "@" in a decorated service (javiereguiluz)
+ * bug #17744 Improve error reporting in router panel of web profiler (javiereguiluz)
+ * bug #17894 [FrameworkBundle] Fix a regression in handling absolute template paths (jakzal)
+ * bug #17990 [DoctrineBridge][Form] Fix performance regression in EntityType (kimlai)
+ * bug #17595 [HttpKernel] Remove _path from query parameters when fragment is a subrequest (cmenning)
+ * bug #17986 [DomCrawler] Dont use LIBXML_PARSEHUGE by default (nicolas-grekas)
+ * bug #17668 add 'guid' to list of exception to filter out (garak)
+ * bug #17615 Ensure backend slashes for symlinks on Windows systems (cpsitgmbh)
+ * bug #17626 Try to delete broken symlinks (IchHabRecht)
+ * bug #17978 [Yaml] ensure dump indentation to be greather than zero (xabbuh)
+ * bug #16886 [Form] [ChoiceType] Prefer placeholder to empty_value (boite)
+ * bug #17976 [WebProfilerBundle] fix debug toolbar rendering by removing inadvertently added links (craue)
+ * bug #17971 Variadic controller params (NiR-, fabpot)
+ * bug #17568 Improved Bootstrap form theme for hidden fields (javiereguiluz)
+ * bug #17925 [Bridge] The WebProcessor now forwards the client IP (magnetik)
+
 * 2.7.10 (2016-02-28)
 
  * bug #17947 Fix - #17676 (backport #17919 to 2.3) (Ocramius)

src/Symfony/Component/HttpFoundation/Request.php

@@ -1343,8 +1343,9 @@ public function getMimeType($format)
  */
  public function getFormat($mimeType)
  {
+ $canonicalMimeType = null;
  if (false !== $pos = strpos($mimeType, ';')) {
- $mimeType = substr($mimeType, 0, $pos);
+ $canonicalMimeType = substr($mimeType, 0, $pos);
  }
 
  if (null === static::$formats) {
@@ -1355,6 +1356,9 @@ public function getFormat($mimeType)
  if (in_array($mimeType, (array) $mimeTypes)) {
  return $format;
  }
+ if (null !== $canonicalMimeType && in_array($canonicalMimeType, (array) $mimeTypes)) {
+ return $format;
+ }
  }
  }
 

src/Symfony/Component/HttpFoundation/Tests/RequestTest.php

@@ -325,6 +325,13 @@ public function testGetMimeTypeFromFormat($format, $mimeTypes)
  }
  }
 
+ public function testGetFormatWithCustomMimeType()
+ {
+ $request = new Request();
+ $request->setFormat('custom', 'application/vnd.foo.api;myversion=2.3');
+ $this->assertEquals('custom', $request->getFormat('application/vnd.foo.api;myversion=2.3'));
+ }
+
  public function getFormatToMimeTypeMapProvider()
  {
  return array(

src/Symfony/Component/Validator/Constraints/Callback.php

@@ -49,7 +49,7 @@ public function __construct($options = null)
  @trigger_error('The "methods" option of the '.__CLASS__.' class is deprecated since version 2.4 and will be removed in 3.0. Use the "callback" option instead.', E_USER_DEPRECATED);
  }
 
- if (is_array($options) && !isset($options['callback']) && !isset($options['methods']) && !isset($options['groups'])) {
+ if (is_array($options) && !isset($options['callback']) && !isset($options['methods']) && !isset($options['groups']) && !isset($options['payload'])) {
  if (is_callable($options) || !$options) {
  $options = array('callback' => $options);
  } else {

src/Symfony/Component/Validator/Tests/Fixtures/Entity.php

@@ -85,7 +85,7 @@ public function getData()
  }
 
  /**
- * @Assert\Callback
+ * @Assert\Callback(payload="foo")
  */
  public function validateMe(ExecutionContextInterface $context)
  {

src/Symfony/Component/Validator/Tests/Mapping/Loader/AnnotationLoaderTest.php

@@ -53,7 +53,7 @@ public function testLoadClassMetadata()
  $expected->setGroupSequence(array('Foo', 'Entity'));
  $expected->addConstraint(new ConstraintA());
  $expected->addConstraint(new Callback(array('Symfony\Component\Validator\Tests\Fixtures\CallbackClass', 'callback')));
- $expected->addConstraint(new Callback('validateMe'));
+ $expected->addConstraint(new Callback(array('callback' => 'validateMe', 'payload' => 'foo')));
  $expected->addConstraint(new Callback('validateMeStatic'));
  $expected->addPropertyConstraint('firstName', new NotNull());
  $expected->addPropertyConstraint('firstName', new Range(array('min' => 3)));
@@ -123,7 +123,7 @@ public function testLoadClassMetadataAndMerge()
  $expected->setGroupSequence(array('Foo', 'Entity'));
  $expected->addConstraint(new ConstraintA());
  $expected->addConstraint(new Callback(array('Symfony\Component\Validator\Tests\Fixtures\CallbackClass', 'callback')));
- $expected->addConstraint(new Callback('validateMe'));
+ $expected->addConstraint(new Callback(array('callback' => 'validateMe', 'payload' => 'foo')));
  $expected->addConstraint(new Callback('validateMeStatic'));
  $expected->addPropertyConstraint('firstName', new NotNull());
  $expected->addPropertyConstraint('firstName', new Range(array('min' => 3)));