feature #23286 [Yaml] remove deprecated unspecific tag behavior (xabbuh)

fabpot · fabpot · commit 587b2f77cd54 · 2017-06-24T09:50:17.000-07:00
This PR was merged into the 4.0-dev branch. Discussion ---------- [Yaml] remove deprecated unspecific tag behavior | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- a12b8c3 [Yaml] remove deprecated unspecific tag behavior
diff --git a/src/Symfony/Component/Yaml/CHANGELOG.md b/src/Symfony/Component/Yaml/CHANGELOG.md
@@ -4,6 +4,8 @@ CHANGELOG
 4.0.0
 -----
 
+ * The behavior of the non-specific tag `!` is changed and now forces
+   non-evaluating your values.
  * complex mappings will throw a `ParseException`
  * support for the comma as a group separator for floats has been dropped, use
    the underscore instead
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -553,9 +553,7 @@ private static function evaluateScalar($scalar, $flags, $references = array())
                     case 0 === strpos($scalar, '!str'):
                         return (string) substr($scalar, 5);
                     case 0 === strpos($scalar, '! '):
-                        @trigger_error('Using the non-specific tag "!" is deprecated since version 3.4 as its behavior will change in 4.0. It will force non-evaluating your values in 4.0. Use plain integers or !!float instead.', E_USER_DEPRECATED);
-
-                        return (int) self::parseScalar(substr($scalar, 2), $flags);
+                        return substr($scalar, 2);
                     case 0 === strpos($scalar, '!php/object:'):
                         if (self::$objectSupport) {
                             return unserialize(substr($scalar, 12));
diff --git a/src/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml b/src/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml
@@ -908,13 +908,12 @@ documents: 2
 
 ---
 test: Explicit typing
-deprecated: Using the non-specific tag "!" is deprecated since version 3.4 as its behavior will change in 4.0.
 yaml: |
    integer: 12
-   also int: ! "12"
+   no int: ! 12
    string: !str 12
 php: |
-   array( 'integer' => 12, 'also int' => 12, 'string' => '12' )
+   array( 'integer' => 12, 'no int' => '12', 'string' => '12' )
 ---
 test: Private types
 todo: true
