Permalink
Browse files

[Yaml] removed deprecated support of PHP parsin when parsing YAML files

  • Loading branch information...
1 parent 09a5969 commit 4e7943fad09f07677710fa6fa26aa118706c84ab @fabpot fabpot committed Mar 1, 2013
Showing with 1 addition and 72 deletions.
  1. +0 −10 src/Symfony/Component/Yaml/Tests/YamlTest.php
  2. +1 −62 src/Symfony/Component/Yaml/Yaml.php
@@ -15,7 +15,6 @@
class YamlTest extends \PHPUnit_Framework_TestCase
{
-
public function testParseAndDump()
{
$data = array('lorem' => 'ipsum', 'dolor' => 'sit');
@@ -29,13 +28,4 @@ public function testParseAndDump()
$parsedByContents = Yaml::parse($contents);
$this->assertEquals($parsedByFilename, $parsedByContents);
}
-
- public function testEmbededPhp()
- {
- $filename = __DIR__.'/Fixtures/embededPhp.yml';
- Yaml::enablePhpParsing();
- $parsed = Yaml::parse($filename);
- $this->assertEquals(array('value' => 6), $parsed);
- }
-
}
@@ -22,53 +22,6 @@
*/
class Yaml
{
- /**
- * Be warned that PHP support will be removed in Symfony 2.3.
- *
- * @deprecated Deprecated since version 2.0, to be removed in 2.3.
- */
- public static $enablePhpParsing = false;
-
- /**
- * Enables PHP support when parsing YAML files.
- *
- * Be warned that PHP support will be removed in Symfony 2.3.
- *
- * @deprecated Deprecated since version 2.0, to be removed in 2.3.
- */
- public static function enablePhpParsing()
- {
- self::$enablePhpParsing = true;
- }
-
- /**
- * Sets the PHP support flag when parsing YAML files.
- *
- * Be warned that PHP support will be removed in Symfony 2.3.
- *
- * @param Boolean $boolean true if PHP parsing support is enabled, false otherwise
- *
- * @deprecated Deprecated since version 2.0, to be removed in 2.3.
- */
- public static function setPhpParsing($boolean)
- {
- self::$enablePhpParsing = (Boolean) $boolean;
- }
-
- /**
- * Checks if PHP support is enabled when parsing YAML files.
- *
- * Be warned that PHP support will be removed in Symfony 2.3.
- *
- * @return Boolean true if PHP parsing support is enabled, false otherwise
- *
- * @deprecated Deprecated since version 2.0, to be removed in 2.3.
- */
- public static function supportsPhpParsing()
- {
- return self::$enablePhpParsing;
- }
-
/**
* Parses YAML into a PHP array.
*
@@ -103,21 +56,7 @@ public static function parse($input, $exceptionOnInvalidType = false, $objectSup
}
$file = $input;
- if (self::$enablePhpParsing) {
- ob_start();
- $retval = include($file);
- $content = ob_get_clean();
-
- // if an array is returned by the config file assume it's in plain php form else in YAML
- $input = is_array($retval) ? $retval : $content;
-
- // if an array is returned by the config file assume it's in plain php form else in YAML
- if (is_array($input)) {
- return $input;
- }
- } else {
- $input = file_get_contents($file);
- }
+ $input = file_get_contents($file);
}
$yaml = new Parser();

0 comments on commit 4e7943f

Please sign in to comment.