Merge branch '2.8' into 3.0

fabpot · fabpot · commit c87c35ed97b3 · 2016-03-27T16:50:32.000+02:00
* 2.8:
  bumped Symfony version to 2.8.5
  updated VERSION for 2.8.4
  updated CHANGELOG for 2.8.4
  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
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1330,8 +1330,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) {
@@ -1342,6 +1343,9 @@ public function getFormat($mimeType)
             if (in_array($mimeType, (array) $mimeTypes)) {
                 return $format;
             }
+            if (null !== $canonicalMimeType && in_array($canonicalMimeType, (array) $mimeTypes)) {
+                return $format;
+            }
         }
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/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(
diff --git a/src/Symfony/Component/Validator/Constraints/Callback.php b/src/Symfony/Component/Validator/Constraints/Callback.php
@@ -38,7 +38,7 @@ public function __construct($options = null)
             $options = $options['value'];
         }
 
-        if (is_array($options) && !isset($options['callback']) && !isset($options['groups'])) {
+        if (is_array($options) && !isset($options['callback']) && !isset($options['groups']) && !isset($options['payload'])) {
             $options = array('callback' => $options);
         }
 
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/Entity.php b/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)
     {
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/AnnotationLoaderTest.php b/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)));

Original file line number	Diff line number	Diff line change
`@@ -1330,8 +1330,9 @@ public function getMimeType($format)`
`1330`	`1330`	`*/`
`1331`	`1331`	`public function getFormat($mimeType)`
`1332`	`1332`	`{`
	`1333`	`+ $canonicalMimeType = null;`
`1333`	`1334`	`if (false !== $pos = strpos($mimeType, ';')) {`
`1334`		`- $mimeType = substr($mimeType, 0, $pos);`
	`1335`	`+ $canonicalMimeType = substr($mimeType, 0, $pos);`
`1335`	`1336`	`}`
`1336`	`1337`
`1337`	`1338`	`if (null === static::$formats) {`
`@@ -1342,6 +1343,9 @@ public function getFormat($mimeType)`
`1342`	`1343`	`if (in_array($mimeType, (array) $mimeTypes)) {`
`1343`	`1344`	`return $format;`
`1344`	`1345`	`}`
	`1346`	`+ if (null !== $canonicalMimeType && in_array($canonicalMimeType, (array) $mimeTypes)) {`
	`1347`	`+ return $format;`
	`1348`	`+ }`
`1345`	`1349`	`}`
`1346`	`1350`	`}`
`1347`	`1351`
Original file line number	Diff line number	Diff line change
`@@ -325,6 +325,13 @@ public function testGetMimeTypeFromFormat($format, $mimeTypes)`
`325`	`325`	`}`
`326`	`326`	`}`
`327`	`327`
	`328`	`+ public function testGetFormatWithCustomMimeType()`
	`329`	`+ {`
	`330`	`+ $request = new Request();`
	`331`	`+ $request->setFormat('custom', 'application/vnd.foo.api;myversion=2.3');`
	`332`	`+ $this->assertEquals('custom', $request->getFormat('application/vnd.foo.api;myversion=2.3'));`
	`333`	`+ }`
	`334`	`+`
`328`	`335`	`public function getFormatToMimeTypeMapProvider()`
`329`	`336`	`{`
`330`	`337`	`return array(`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function __construct($options = null)`
`38`	`38`	`$options = $options['value'];`
`39`	`39`	`}`
`40`	`40`
`41`		`- if (is_array($options) && !isset($options['callback']) && !isset($options['groups'])) {`
	`41`	`+ if (is_array($options) && !isset($options['callback']) && !isset($options['groups']) && !isset($options['payload'])) {`
`42`	`42`	`$options = array('callback' => $options);`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function getData()`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/**`
`88`		`- * @Assert\Callback`
	`88`	`+ * @Assert\Callback(payload="foo")`
`89`	`89`	`*/`
`90`	`90`	`public function validateMe(ExecutionContextInterface $context)`
`91`	`91`	`{`