merged branch gimler/cleamup_yaml (PR symfony#7264)

fabpot · fabpot · commit ae46cfb723df · 2013-03-06T18:01:03.000+01:00
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes symfony#7264). Commits ------- edda254 remove dead code in yaml component Discussion ---------- remove dead code in yaml component | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT Cleanup unused code. --------------------------------------------------------------------------- by fabpot at 2013-03-06T16:27:57Z Can you explain why it is not needed anymore? --------------------------------------------------------------------------- by igorw at 2013-03-06T16:44:30Z `$subject` is no longer used anywhere. The `substr` is now done inline in the `preg_match` call. This code is effectively dead.
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -235,11 +235,6 @@ public static function parseScalar($scalar, $delimiters = null, $stringDelimiter
      */
     private static function parseQuotedScalar($scalar, &$i)
     {
-        // Only check the current item we're dealing with (for sequences)
-        $subject = substr($scalar, $i);
-        $items = preg_split('/[\'"]\s*(?:[,:]|[}\]]\s*,)/', $subject);
-        $subject = substr($subject, 0, strlen($items[0]) + 1);
-
         if (!preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) {
             throw new ParseException(sprintf('Malformed inline YAML string (%s).', substr($scalar, $i)));
         }

Original file line number	Diff line number	Diff line change
`@@ -235,11 +235,6 @@ public static function parseScalar($scalar, $delimiters = null, $stringDelimiter`
`235`	`235`	`*/`
`236`	`236`	`private static function parseQuotedScalar($scalar, &$i)`
`237`	`237`	`{`
`238`		`- // Only check the current item we're dealing with (for sequences)`
`239`		`- $subject = substr($scalar, $i);`
`240`		`- $items = preg_split('/[\'"]\s(?:[,:]\|[}\]]\s,)/', $subject);`
`241`		`- $subject = substr($subject, 0, strlen($items[0]) + 1);`
`242`		`-`
`243`	`238`	`if (!preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) {`
`244`	`239`	`throw new ParseException(sprintf('Malformed inline YAML string (%s).', substr($scalar, $i)));`
`245`	`240`	`}`