Merge branch '3.4' into 4.0

javiereguiluz · javiereguiluz · commit 242bedde437b · 2018-06-27T09:54:30.000+02:00
* 3.4:
  Add section about anonymous services
  Add iterable to the Type constraint
  Added a note about hidden questions, windows and tests
diff --git a/components/console/helpers/questionhelper.rst b/components/console/helpers/questionhelper.rst
@@ -376,3 +376,9 @@ This way you can test any user interaction (even complex ones) by passing the ap
     The :class:`Symfony\\Component\\Console\\Tester\\CommandTester` automatically
     simulates a user hitting ``ENTER`` after each input, no need for passing
     an additional input.
+
+.. caution::
+
+    On Windows systems Symfony uses a special binary to implement hidden
+    questions. This means that those questions don't use the default ``Input``
+    console object and therefore you can't test them on Windows.
diff --git a/components/routing.rst b/components/routing.rst
@@ -442,7 +442,7 @@ routes with UTF-8 characters:
             array(
                 'utf8' => true,
             )
-        );
+        ));
 
         // ...
 
@@ -521,7 +521,7 @@ You can also include UTF-8 strings as routing requirements:
             array(
                 'utf8' => true,
             )
-        );
+        ));
 
         // ...
 
diff --git a/reference/constraints/Type.rst b/reference/constraints/Type.rst
@@ -125,6 +125,7 @@ datatypes as determined by PHP's ``is_()`` functions.
 * :phpfunction:`double <is_double>`
 * :phpfunction:`int <is_int>`
 * :phpfunction:`integer <is_integer>`
+* :phpfunction:`iterable <is_iterable>`
 * :phpfunction:`long <is_long>`
 * :phpfunction:`null <is_null>`
 * :phpfunction:`numeric <is_numeric>`
diff --git a/service_container/alias_private.rst b/service_container/alias_private.rst
@@ -146,6 +146,38 @@ This means that when using the container directly, you can access the
             # ...
             app.mailer: '@App\Mail\PhpMailer'
 
+Anonymous Services
+------------------
+
+.. note::
+
+    Anonymous services are only supported by the XML configuration format.
+
+In some cases, you may want to prevent a service being used as a dependency of
+other services. This can be achieved by creating an anonymous service. These
+services are like regular services but they don't define an ID and they are
+created where they are used.
+
+The following example shows how to inject an anonymous service into another service:
+
+.. code-block:: xml
+
+    <!-- app/config/services.xml -->
+    <?xml version="1.0" encoding="UTF-8" ?>
+    <container xmlns="http://symfony.com/schema/dic/services"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/dic/services
+            http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+        <services>
+            <service id="foo" class="AppBundle\Foo">
+                <argument type="service">
+                    <service class="AppBundle\AnonymousBar" />
+                </argument>
+            </service>
+        </services>
+    </container>
+
 Deprecating Services
 --------------------
 

Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ routes with UTF-8 characters:`
`442`	`442`	`array(`
`443`	`443`	`'utf8' => true,`
`444`	`444`	`)`
`445`		`- );`
	`445`	`+ ));`
`446`	`446`
`447`	`447`	`// ...`
`448`	`448`
`@@ -521,7 +521,7 @@ You can also include UTF-8 strings as routing requirements:`
`521`	`521`	`array(`
`522`	`522`	`'utf8' => true,`
`523`	`523`	`)`
`524`		`- );`
	`524`	`+ ));`
`525`	`525`
`526`	`526`	`// ...`
`527`	`527`