symfony
diff --git a/‎src/Symfony/Component/Serializer/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/Serializer/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
+3-2Lines changed: 3 additions & 2 deletions b/‎src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
+3-2Lines changed: 3 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Serializer/Tests/Encoder/YamlEncoderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Encoder/YamlEncoderTest.php
+2Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Serializer/Tests/Encoder/YamlEncoderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Encoder/YamlEncoderTest.php
+2Lines changed: 2 additions & 0 deletions
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
 * `AbstractNormalizer::handleCircularReference` is now final, and receives two optional extra arguments: the format and the context
+* `YamlEncoder` now handle the `.yml` extension too
 
 4.1.0
 -----
 
@@ -23,6 +23,7 @@
 class YamlEncoder implements EncoderInterface, DecoderInterface
 {
     const FORMAT = 'yaml';
+    const ALTERNATIVE_FORMAT = 'yml';
 
     private $dumper;
     private $parser;
@@ -54,7 +55,7 @@ public function encode($data, $format, array $context = array())
      */
     public function supportsEncoding($format)
     {
-        return self::FORMAT === $format;
+        return self::FORMAT === $format || self::ALTERNATIVE_FORMAT === $format;
     }
 
     /**
@@ -72,6 +73,6 @@ public function decode($data, $format, array $context = array())
      */
     public function supportsDecoding($format)
     {
-        return self::FORMAT === $format;
+        return self::FORMAT === $format || self::ALTERNATIVE_FORMAT === $format;
     }
 }
@@ -35,6 +35,7 @@ public function testSupportsEncoding()
         $encoder = new YamlEncoder();
 
         $this->assertTrue($encoder->supportsEncoding('yaml'));
+        $this->assertTrue($encoder->supportsEncoding('yml'));
         $this->assertFalse($encoder->supportsEncoding('json'));
     }
 
@@ -51,6 +52,7 @@ public function testSupportsDecoding()
         $encoder = new YamlEncoder();
 
         $this->assertTrue($encoder->supportsDecoding('yaml'));
+        $this->assertTrue($encoder->supportsDecoding('yml'));
         $this->assertFalse($encoder->supportsDecoding('json'));
     }
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`class YamlEncoder implements EncoderInterface, DecoderInterface`
`24`	`24`	`{`
`25`	`25`	`const FORMAT = 'yaml';`
	`26`	`+ const ALTERNATIVE_FORMAT = 'yml';`
`26`	`27`
`27`	`28`	`private $dumper;`
`28`	`29`	`private $parser;`
`@@ -54,7 +55,7 @@ public function encode($data, $format, array $context = array())`
`54`	`55`	`*/`
`55`	`56`	`public function supportsEncoding($format)`
`56`	`57`	`{`
`57`		`- return self::FORMAT === $format;`
	`58`	`+ return self::FORMAT === $format \|\| self::ALTERNATIVE_FORMAT === $format;`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`/**`
`@@ -72,6 +73,6 @@ public function decode($data, $format, array $context = array())`
`72`	`73`	`*/`
`73`	`74`	`public function supportsDecoding($format)`
`74`	`75`	`{`
`75`		`- return self::FORMAT === $format;`
	`76`	`+ return self::FORMAT === $format \|\| self::ALTERNATIVE_FORMAT === $format;`
`76`	`77`	`}`
`77`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ public function testSupportsEncoding()`
`35`	`35`	`$encoder = new YamlEncoder();`
`36`	`36`
`37`	`37`	`$this->assertTrue($encoder->supportsEncoding('yaml'));`
	`38`	`+ $this->assertTrue($encoder->supportsEncoding('yml'));`
`38`	`39`	`$this->assertFalse($encoder->supportsEncoding('json'));`
`39`	`40`	`}`
`40`	`41`
`@@ -51,6 +52,7 @@ public function testSupportsDecoding()`
`51`	`52`	`$encoder = new YamlEncoder();`
`52`	`53`
`53`	`54`	`$this->assertTrue($encoder->supportsDecoding('yaml'));`
	`55`	`+ $this->assertTrue($encoder->supportsDecoding('yml'));`
`54`	`56`	`$this->assertFalse($encoder->supportsDecoding('json'));`
`55`	`57`	`}`
`56`	`58`