[Yaml] removed support for YAML 1.1 spec

symfony · Jun 14, 2011 · a9dab71 · a9dab71
1 parent 3859589
commit a9dab71
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 84 deletions.
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -68,9 +68,6 @@ static public function parse($value)
      */
     static public function dump($value)
     {
-        $trueValues = '1.1' == Yaml::getSpecVersion() ? array('true', 'on', '+', 'yes', 'y') : array('true');
-        $falseValues = '1.1' == Yaml::getSpecVersion() ? array('false', 'off', '-', 'no', 'n') : array('false');
-
         switch (true) {
             case is_resource($value):
                 throw new Exception('Unable to dump PHP resources in a YAML file.');
@@ -95,12 +92,7 @@ static public function dump($value)
             case '' == $value:
                 return "''";
             case preg_match(self::getTimestampRegex(), $value):
-                return "'$value'";
-            case in_array(strtolower($value), $trueValues):
-                return "'$value'";
-            case in_array(strtolower($value), $falseValues):
-                return "'$value'";
-            case in_array(strtolower($value), array('null', '~')):
+            case in_array(strtolower($value), array('null', '~', 'true', 'false')):
                 return "'$value'";
             default:
                 return $value;
@@ -340,9 +332,6 @@ static private function evaluateScalar($scalar)
     {
         $scalar = trim($scalar);
 
-        $trueValues = '1.1' == Yaml::getSpecVersion() ? array('true', 'on', '+', 'yes', 'y') : array('true');
-        $falseValues = '1.1' == Yaml::getSpecVersion() ? array('false', 'off', '-', 'no', 'n') : array('false');
-
         switch (true) {
             case 'null' == strtolower($scalar):
             case '' == $scalar:
@@ -359,9 +348,9 @@ static private function evaluateScalar($scalar)
                 $cast = intval($scalar);
 
                 return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
-            case in_array(strtolower($scalar), $trueValues):
+            case 'true' === strtolower($scalar):
                 return true;
-            case in_array(strtolower($scalar), $falseValues):
+            case 'false' === strtolower($scalar):
                 return false;
             case is_numeric($scalar):
                 return '0x' == $scalar[0].$scalar[1] ? hexdec($scalar) : floatval($scalar);

diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php
@@ -20,34 +20,6 @@
  */
 class Yaml
 {
-    static private $spec = '1.2';
-
-    /**
-     * Sets the YAML specification version to use.
-     *
-     * @param string $version The YAML specification version
-     *
-     * @throws \InvalidArgumentException When version of YAML specs is not supported
-     */
-    static public function setSpecVersion($version)
-    {
-        if (!in_array($version, array('1.1', '1.2'))) {
-            throw new \InvalidArgumentException(sprintf('Version %s of the YAML specifications is not supported', $version));
-        }
-
-        self::$spec = $version;
-    }
-
-    /**
-     * Gets the YAML specification version to use.
-     *
-     * @return string The YAML specification version
-     */
-    static public function getSpecVersion()
-    {
-        return self::$spec;
-    }
-
     /**
      * Parses YAML into a PHP array.
      *

diff --git a/tests/Symfony/Tests/Component/Yaml/DumperTest.php b/tests/Symfony/Tests/Component/Yaml/DumperTest.php
@@ -21,11 +21,6 @@ class DumperTest extends \PHPUnit_Framework_TestCase
     protected $dumper;
     protected $path;
 
-    static public function setUpBeforeClass()
-    {
-        Yaml::setSpecVersion('1.1');
-    }
-
     protected function setUp()
     {
         $this->parser = new Parser();

diff --git a/tests/Symfony/Tests/Component/Yaml/Fixtures/YtsSpecificationExamples.yml b/tests/Symfony/Tests/Component/Yaml/Fixtures/YtsSpecificationExamples.yml
@@ -542,8 +542,8 @@ test: Miscellaneous
 spec: 2.21
 yaml: |
   null: ~
-  true: y
-  false: n
+  true: true
+  false: false
   string: '12345'
 php: |
   array(
@@ -1519,7 +1519,7 @@ test: Boolean
 yaml: |
    false: used as key
    logical:  true
-   answer: no
+   answer: false
 php: |
    array(
      false => 'used as key',

diff --git a/tests/Symfony/Tests/Component/Yaml/Fixtures/sfTests.yml b/tests/Symfony/Tests/Component/Yaml/Fixtures/sfTests.yml
@@ -32,45 +32,21 @@ brief: >
     Boolean
 yaml: |
     - false
-    - -
-    - off
-    - no
     - true
-    - +
-    - on
-    - yes
     - null
     - ~
     - 'false'
-    - '-'
-    - 'off'
-    - 'no'
     - 'true'
-    - '+'
-    - 'on'
-    - 'yes'
     - 'null'
     - '~'
 php: |
     array(
       false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
       true,
       null,
       null,
       'false',
-      '-',
-      'off',
-      'no',
       'true',
-      '+',
-      'on',
-      'yes',
       'null',
       '~',
     )

diff --git a/tests/Symfony/Tests/Component/Yaml/InlineTest.php b/tests/Symfony/Tests/Component/Yaml/InlineTest.php
@@ -16,11 +16,6 @@
 
 class InlineTest extends \PHPUnit_Framework_TestCase
 {
-    static public function setUpBeforeClass()
-    {
-        Yaml::setSpecVersion('1.1');
-    }
-
     public function testParse()
     {
         foreach ($this->getTestsForParse() as $yaml => $value) {

diff --git a/tests/Symfony/Tests/Component/Yaml/ParserTest.php b/tests/Symfony/Tests/Component/Yaml/ParserTest.php
@@ -20,11 +20,6 @@ class ParserTest extends \PHPUnit_Framework_TestCase
     protected $parser;
     protected $path;
 
-    static public function setUpBeforeClass()
-    {
-        Yaml::setSpecVersion('1.1');
-    }
-
     protected function setUp()
     {
         $this->parser = new Parser();