Merge branch '2.7' into 2.8

Robin Chalas · Robin Chalas · commit 0d27e54d39dc · 2017-12-29T16:41:53.000+01:00
* 2.7:
  [Serializer] Correct typing mistake in DocBlock
  [Config] Fix closure CS
  PHP CS Fixer: use PHPUnit Migration ruleset
  [Console] Commands with an alias should not be recognized as ambiguous
diff --git a/Normalizer/CustomNormalizer.php b/Normalizer/CustomNormalizer.php
@@ -49,7 +49,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
`@@ -49,7 +49,7 @@ public function supportsNormalization($data, $format = null)`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`
`52`		`- * Checks if the given class implements the NormalizableInterface.`
	`52`	`+ * Checks if the given class implements the DenormalizableInterface.`
`53`	`53`	`*`
`54`	`54`	`* @param mixed $data Data to denormalize from`
`55`	`55`	`* @param string $type The class to which the data should be denormalized`