Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit e40630187090 · 2017-12-29T21:55:26.000+01:00
* 3.3:
  Add application/ld+json format associated to json
  [HttpFoundation] Fix false-positive ConflictingHeadersException
  [WebServerBundle] Fix escaping of php binary with arguments
  Error handlers' $context should be optional as it's deprecated
  [Serializer] Correct typing mistake in DocBlock
  [Config] Fix closure CS
  PHP CS Fixer: use PHPUnit Migration ruleset
  Update MemcachedTrait.php
  [Bridge/PhpUnit] thank phpunit/phpunit
  [Process] Fix setting empty env vars
  [Process] Dont use getenv(), it returns arrays and can introduce subtle breaks accros PHP versions
  [WebServerBundle] fix a bug where require would not require the good file because of env
  [Console] Commands with an alias should not be recognized as ambiguous
diff --git a/Normalizer/CustomNormalizer.php b/Normalizer/CustomNormalizer.php
@@ -57,7 +57,7 @@ public function supportsNormalization($data, $format = null)
     }
 
     /**
-     * Checks if the given class implements the NormalizableInterface.
+     * Checks if the given class implements the DenormalizableInterface.
      *
      * @param mixed  $data   Data to denormalize from
      * @param string $type   The class to which the data should be denormalized

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function supportsNormalization($data, $format = null)`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/**`
`60`		`- * Checks if the given class implements the NormalizableInterface.`
	`60`	`+ * Checks if the given class implements the DenormalizableInterface.`
`61`	`61`	`*`
`62`	`62`	`* @param mixed $data Data to denormalize from`
`63`	`63`	`* @param string $type The class to which the data should be denormalized`