symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
Lines changed: 6 additions & 2 deletions b/‎src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
Lines changed: 6 additions & 2 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/Tag/IteratorTag.php
Lines changed: 53 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Loader/Tag/IteratorTag.php
Lines changed: 53 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
Lines changed: 8 additions & 11 deletions b/‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
Lines changed: 8 additions & 11 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
Lines changed: 5 additions & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
Lines changed: 5 additions & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Yaml/Dumper.php
Lines changed: 28 additions & 2 deletions b/‎src/Symfony/Component/Yaml/Dumper.php
Lines changed: 28 additions & 2 deletions
@@ -20,6 +20,7 @@
 use Symfony\Component\DependencyInjection\Parameter;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Loader\Tag\IteratorTag;
 use Symfony\Component\ExpressionLanguage\Expression;
 
 /**
@@ -45,7 +46,7 @@ public function dump(array $options = array())
         }
 
         if (null === $this->dumper) {
-            $this->dumper = new YmlDumper();
+            $this->dumper = new YmlDumper(4, array('iterator' => new IteratorTag()));
         }
 
         return $this->container->resolveEnvPlaceholders($this->addParameters()."\n".$this->addServices());
@@ -248,7 +249,10 @@ private function dumpCallable($callable)
     private function dumpValue($value)
     {
         if ($value instanceof IteratorArgument) {
-            $value = array('=iterator' => $value->getValues());
+            $iterator = clone $value;
+            $iterator->setValues($this->dumpValue($iterator->getValues()));
+
+            return $iterator;
         } elseif ($value instanceof ClosureProxyArgument) {
             $value = array('=closure_proxy' => $value->getValues());
         }
 
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Tag;
+
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\Yaml\Tag\TagInterface;
+use Symfony\Component\Yaml\Tag\DumpableTagInterface;
+
+/**
+ * @author Guilhem N. <egetick@gmail.com>
+ *
+ * @internal
+ */
+final class IteratorTag implements TagInterface, DumpableTagInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function createValue($value, $tag)
+    {
+        if (!is_array($value)) {
+            throw new InvalidArgumentException('"!iterator" tag accepts only sequences.');
+        }
+
+        return new IteratorArgument($value);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function dump($object, $tag)
+    {
+        return $object->getValues();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supportsDump($object, $tag)
+    {
+        return $object instanceof IteratorArgument;
+    }
+}
@@ -20,6 +20,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Loader\Tag\IteratorTag;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Parser as YamlParser;
@@ -476,7 +477,7 @@ protected function loadFile($file)
         }
 
         if (null === $this->yamlParser) {
-            $this->yamlParser = new YamlParser();
+            $this->yamlParser = new YamlParser(array('iterator' => new IteratorTag()));
         }
 
         try {
@@ -531,22 +532,18 @@ private function validate($content, $file)
     /**
      * Resolves services.
      *
-     * @param string|array $value
+     * @param string|array|IteratorArgument $value
      *
      * @return array|string|Reference
      */
     private function resolveServices($value)
     {
+        if ($value instanceof IteratorArgument) {
+            $value->setValues(array_map(array($this, 'resolveServices'), $value->getValues()));
+        }
+
         if (is_array($value)) {
-            if (array_key_exists('=iterator', $value)) {
-                if (1 !== count($value)) {
-                    throw new InvalidArgumentException('Arguments typed "=iterator" must have no sibling keys.');
-                }
-                if (!is_array($value = $value['=iterator'])) {
-                    throw new InvalidArgumentException('Arguments typed "=iterator" must be arrays.');
-                }
-                $value = new IteratorArgument(array_map(array($this, 'resolveServices'), $value));
-            } elseif (array_key_exists('=closure_proxy', $value)) {
+            if (array_key_exists('=closure_proxy', $value)) {
                 if (1 !== count($value)) {
                     throw new InvalidArgumentException('Arguments typed "=closure_proxy" must have no sibling keys.');
                 }
 
@@ -13,7 +13,9 @@
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\YamlDumper;
+use Symfony\Component\DependencyInjection\Loader\Tag\IteratorTag;
 use Symfony\Component\Yaml\Yaml;
+use Symfony\Component\Yaml\Parser;
 
 class YamlDumperTest extends \PHPUnit_Framework_TestCase
 {
@@ -64,6 +66,8 @@ public function testDumpAutowireData()
 
     private function assertEqualYamlStructure($yaml, $expected, $message = '')
     {
-        $this->assertEquals(Yaml::parse($expected), Yaml::parse($yaml), $message);
+        $parser = new Parser(array('iterator' => new IteratorTag()));
+
+        $this->assertEquals($parser->parse($expected), $parser->parse($yaml), $message);
     }
 }
@@ -109,10 +109,10 @@ services:
         factory: ['@factory_simple', getInstance]
     lazy_context:
         class: LazyContext
-        arguments: [{ '=iterator': [foo, '@foo.baz', { '%foo%': 'foo is %foo%', foobar: '%foo%' }, true, '@service_container'] }]
+        arguments: [!iterator [foo, '@foo.baz', { '%foo%': 'foo is %foo%', foobar: '%foo%' }, true, '@service_container']]
     lazy_context_ignore_invalid_ref:
         class: LazyContext
-        arguments: [{ '=iterator': ['@foo.baz', '@?invalid'] }]
+        arguments: [!iterator ['@foo.baz', '@?invalid']]
     closure_proxy:
         class: BarClass
         arguments: [{ '=closure_proxy': ['@closure_proxy', getBaz] }]
 
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Yaml;
 
+use Symfony\Component\Yaml\Tag\DumpableTagInterface;
+
 /**
  * Dumper dumps PHP variables to YAML strings.
  *
@@ -24,17 +26,31 @@ class Dumper
      * @var int
      */
     protected $indentation;
+    private $tags = array();
 
     /**
-     * @param int $indentation
+     * @param int   $indentation
+     * @param array $tags
      */
-    public function __construct($indentation = 4)
+    public function __construct($indentation = 4, array $tags = array())
     {
         if ($indentation < 1) {
             throw new \InvalidArgumentException('The indentation must be greater than zero.');
         }
 
         $this->indentation = $indentation;
+        foreach ($tags as $tagName => $tag) {
+            if (!$tag instanceof DumpableTagInterface) {
+                throw new \InvalidArgumentException(sprintf('Expected tag of type "%s", given "%s".', TagInterface::class, is_object($tag) ? get_class($tag) : gettype($tag)));
+            }
+
+            $normalizedTagName = $tagName;
+            if (0 === strpos($tagName, 'tag:yaml.org,2002:')) {
+                $normalizedTagName = '!'.substr($tagName, 18);
+            }
+
+            $this->tags[$normalizedTagName] = array($tag, $tagName);
+        }
     }
 
     /**
@@ -79,6 +95,16 @@ public function dump($input, $inline = 0, $indent = 0, $flags = 0)
             }
         }
 
+        $previousTags = Inline::$dumpableTags;
+        Inline::$dumpableTags = $this->tags;
+        try {
+            return $this->doDump($input, $inline, $indent, $flags);
+        } finally {
+            Inline::$dumpableTags = $previousTags;
+        }
+    }
+
+    private function doDump($input, $inline = 0, $indent = 0, $flags = 0) {
         $output = '';
         $prefix = $indent ? str_repeat(' ', $indent) : '';