Upgrade 1-11.38

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.json

@@ -7,14 +7,12 @@
             "lazy": true,
             "shared": true,
             "abstract": true,
+            "autowire": false,
+            "autowiring_types": [],
             "file": null,
             "factory_class": "Full\\Qualified\\FactoryClass",
             "factory_method": "get",
-            "tags": [
-
-            ],
-            "autowire": false,
-            "autowiring_types": []
+            "tags": []
         }
     },
     "aliases": {

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_public.md

@@ -4,8 +4,7 @@ Public services
 Definitions
 -----------
 
-definition_1
-~~~~~~~~~~~~
+### definition_1
 
 - Class: `Full\Qualified\Class1`
 - Public: yes
@@ -21,14 +20,12 @@ definition_1
 Aliases
 -------
 
-alias_1
-~~~~~~~
+### alias_1
 
 - Service: `service_1`
 - Public: yes
 
-alias_2
-~~~~~~~
+### alias_2
 
 - Service: `service_2`
 - Public: no

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.json

@@ -7,14 +7,12 @@
             "lazy": true,
             "shared": true,
             "abstract": true,
+            "autowire": false,
+            "autowiring_types": [],
             "file": null,
             "factory_class": "Full\\Qualified\\FactoryClass",
             "factory_method": "get",
-            "tags": [
-
-            ],
-            "autowire": false,
-            "autowiring_types": []
+            "tags": []
         },
         "definition_2": {
             "class": "Full\\Qualified\\Class2",
@@ -23,9 +21,14 @@
             "lazy": false,
             "shared": true,
             "abstract": false,
+            "autowire": false,
+            "autowiring_types": [],
             "file": "\/path\/to\/file",
             "factory_service": "factory.service",
             "factory_method": "get",
+            "calls": [
+                "setMailer"
+            ],
             "tags": [
                 {
                     "name": "tag1",
@@ -42,13 +45,9 @@
                 },
                 {
                     "name": "tag2",
-                    "parameters": [
-
-                    ]
+                    "parameters": []
                 }
-            ],
-            "autowire": false,
-            "autowiring_types": []
+            ]
         }
     },
     "aliases": {

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.md

@@ -4,8 +4,7 @@ Public and private services
 Definitions
 -----------
 
-definition_1
-~~~~~~~~~~~~
+### definition_1
 
 - Class: `Full\Qualified\Class1`
 - Public: yes
@@ -17,8 +16,7 @@ definition_1
 - Factory Class: `Full\Qualified\FactoryClass`
 - Factory Method: `get`
 
-definition_2
-~~~~~~~~~~~~
+### definition_2
 
 - Class: `Full\Qualified\Class2`
 - Public: no
@@ -30,6 +28,7 @@ definition_2
 - File: `/path/to/file`
 - Factory Service: `factory.service`
 - Factory Method: `get`
+- Call: `setMailer`
 - Tag: `tag1`
     - Attr1: val1
     - Attr2: val2
@@ -41,14 +40,12 @@ definition_2
 Aliases
 -------
 
-alias_1
-~~~~~~~
+### alias_1
 
 - Service: `service_1`
 - Public: yes
 
-alias_2
-~~~~~~~
+### alias_2
 
 - Service: `service_2`
 - Public: no

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_services.xml

@@ -7,6 +7,9 @@
   </definition>
   <definition id="definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" file="/path/to/file">
     <factory service="factory.service" method="get"/>
+    <calls>
+      <call method="setMailer"/>
+    </calls>
     <tags>
       <tag name="tag1">
         <parameter name="attr1">val1</parameter>

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.json

@@ -7,9 +7,14 @@
             "lazy": false,
             "shared": true,
             "abstract": false,
+            "autowire": false,
+            "autowiring_types": [],
             "file": "\/path\/to\/file",
             "factory_service": "factory.service",
             "factory_method": "get",
+            "calls": [
+                "setMailer"
+            ],
             "tags": [
                 {
                     "name": "tag1",
@@ -26,19 +31,11 @@
                 },
                 {
                     "name": "tag2",
-                    "parameters": [
-
-                    ]
+                    "parameters": []
                 }
-            ],
-            "autowire": false,
-            "autowiring_types": []
+            ]
         }
     },
-    "aliases": [
-
-    ],
-    "services": [
-
-    ]
+    "aliases": [],
+    "services": []
 }

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.md

@@ -4,8 +4,7 @@ Public and private services with tag `tag1`
 Definitions
 -----------
 
-definition_2
-~~~~~~~~~~~~
+### definition_2
 
 - Class: `Full\Qualified\Class2`
 - Public: no
@@ -17,6 +16,7 @@ definition_2
 - File: `/path/to/file`
 - Factory Service: `factory.service`
 - Factory Method: `get`
+- Call: `setMailer`
 - Tag: `tag1`
     - Attr1: val1
     - Attr2: val2

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml

@@ -2,6 +2,9 @@
 <container>
   <definition id="definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" file="/path/to/file">
     <factory service="factory.service" method="get"/>
+    <calls>
+      <call method="setMailer"/>
+    </calls>
     <tags>
       <tag name="tag1">
         <parameter name="attr1">val1</parameter>

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.json

@@ -7,11 +7,14 @@
             "lazy": false,
             "shared": true,
             "abstract": false,
+            "autowire": false,
+            "autowiring_types": [],
             "file": "\/path\/to\/file",
             "factory_service": "factory.service",
             "factory_method": "get",
-            "autowire": false,
-            "autowiring_types": []
+            "calls": [
+                "setMailer"
+            ]
         }
     ],
     "tag2": [
@@ -22,11 +25,14 @@
             "lazy": false,
             "shared": true,
             "abstract": false,
+            "autowire": false,
+            "autowiring_types": [],
             "file": "\/path\/to\/file",
             "factory_service": "factory.service",
             "factory_method": "get",
-            "autowire": false,
-            "autowiring_types": []
+            "calls": [
+                "setMailer"
+            ]
         }
     ]
 }

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.md

@@ -4,8 +4,7 @@ Container tags
 tag1
 ----
 
-definition_2
-~~~~~~~~~~~~
+### definition_2
 
 - Class: `Full\Qualified\Class2`
 - Public: no
@@ -17,13 +16,13 @@ definition_2
 - File: `/path/to/file`
 - Factory Service: `factory.service`
 - Factory Method: `get`
+- Call: `setMailer`
 
 
 tag2
 ----
 
-definition_2
-~~~~~~~~~~~~
+### definition_2
 
 - Class: `Full\Qualified\Class2`
 - Public: no
@@ -35,3 +34,4 @@ definition_2
 - File: `/path/to/file`
 - Factory Service: `factory.service`
 - Factory Method: `get`
+- Call: `setMailer`

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/builder_1_tags.xml

@@ -3,11 +3,17 @@
   <tag name="tag1">
     <definition id="definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" file="/path/to/file">
       <factory service="factory.service" method="get"/>
+      <calls>
+        <call method="setMailer"/>
+      </calls>
     </definition>
   </tag>
   <tag name="tag2">
     <definition id="definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" file="/path/to/file">
       <factory service="factory.service" method="get"/>
+      <calls>
+        <call method="setMailer"/>
+      </calls>
     </definition>
   </tag>
 </container>

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_1.json

@@ -5,12 +5,10 @@
     "lazy": true,
     "shared": true,
     "abstract": true,
+    "autowire": false,
+    "autowiring_types": [],
     "file": null,
     "factory_class": "Full\\Qualified\\FactoryClass",
     "factory_method": "get",
-    "tags": [
-
-    ],
-    "autowire": false,
-    "autowiring_types": []
+    "tags": []
 }

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.json

@@ -5,9 +5,14 @@
     "lazy": false,
     "shared": true,
     "abstract": false,
+    "autowire": false,
+    "autowiring_types": [],
     "file": "\/path\/to\/file",
     "factory_service": "factory.service",
     "factory_method": "get",
+    "calls": [
+        "setMailer"
+    ],
     "tags": [
         {
             "name": "tag1",
@@ -24,11 +29,7 @@
         },
         {
             "name": "tag2",
-            "parameters": [
-
-            ]
+            "parameters": []
         }
-    ],
-    "autowire": false,
-    "autowiring_types": []
+    ]
 }

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.md

@@ -8,9 +8,10 @@
 - File: `/path/to/file`
 - Factory Service: `factory.service`
 - Factory Method: `get`
+- Call: `setMailer`
 - Tag: `tag1`
     - Attr1: val1
     - Attr2: val2
 - Tag: `tag1`
     - Attr3: val3
-- Tag: `tag2`
+- Tag: `tag2`

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.txt

@@ -4,6 +4,7 @@
   Service ID         -                                                      
   Class              Full\Qualified\Class2                                  
   Tags               tag1 (attr1: val1, attr2: val2)tag1 (attr3: val3)tag2  
+  Calls              setMailer                                              
   Public             no                                                     
   Synthetic          yes                                                    
   Lazy               no                                                     

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/definition_2.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definition class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" file="/path/to/file">
   <factory service="factory.service" method="get"/>
+  <calls>
+    <call method="setMailer"/>
+  </calls>
   <tags>
     <tag name="tag1">
       <parameter name="attr1">val1</parameter>

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_1.txt

@@ -11,7 +11,7 @@
 | Requirements | name: [a-z]+                                            |
 | Class        | Symfony\Component\Routing\Route                         |
 | Defaults     | name: Joseph                                            |
-| Options      | compiler_class: Symfony\Component\Routing\RouteCompiler |
-|              | opt1: val1                                              |
-|              | opt2: val2                                              |
+| Options      | compiler_class: Symfony\Component\Routing\RouteCompiler |
+|              | opt1: val1                                              |
+|              | opt2: val2                                              |
 +--------------+---------------------------------------------------------+

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.json

@@ -6,9 +6,7 @@
     "scheme": "http|https",
     "method": "PUT|POST",
     "class": "Symfony\\Component\\Routing\\Route",
-    "defaults": [
-
-    ],
+    "defaults": [],
     "requirements": "NO CUSTOM",
     "options": {
         "compiler_class": "Symfony\\Component\\Routing\\RouteCompiler",

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_2.txt

@@ -11,7 +11,7 @@
 | Requirements | NO CUSTOM                                               |
 | Class        | Symfony\Component\Routing\Route                         |
 | Defaults     | NONE                                                    |
-| Options      | compiler_class: Symfony\Component\Routing\RouteCompiler |
-|              | opt1: val1                                              |
-|              | opt2: val2                                              |
+| Options      | compiler_class: Symfony\Component\Routing\RouteCompiler |
+|              | opt1: val1                                              |
+|              | opt2: val2                                              |
 +--------------+---------------------------------------------------------+

vendor/symfony/framework-bundle/Tests/Fixtures/Descriptor/route_collection_1.json

@@ -27,9 +27,7 @@
         "scheme": "http|https",
         "method": "PUT|POST",
         "class": "Symfony\\Component\\Routing\\Route",
-        "defaults": [
-
-        ],
+        "defaults": [],
         "requirements": "NO CUSTOM",
         "options": {
             "compiler_class": "Symfony\\Component\\Routing\\RouteCompiler",

vendor/symfony/framework-bundle/Tests/Fixtures/Resources/views/translation.html.php

@@ -1,7 +1,7 @@
 This template is used for translation message extraction tests
 <?php echo $view['translator']->trans('single-quoted key') ?>
 <?php echo $view['translator']->trans('double-quoted key') ?>
-<?php echo $view['translator']->trans(<<<EOF
+<?php echo $view['translator']->trans(<<<'EOF'
 heredoc key
 EOF
 ) ?>
@@ -31,3 +31,19 @@ EOF
     10,
     array('%count%' => 10)
 ) ?>
+
+<?php echo $view['translator']->trans('other-domain-test-no-params-short-array', array(), 'not_messages'); ?>
+
+<?php echo $view['translator']->trans('other-domain-test-no-params-long-array', array(), 'not_messages'); ?>
+
+<?php echo $view['translator']->trans('other-domain-test-params-short-array', array('foo' => 'bar'), 'not_messages'); ?>
+
+<?php echo $view['translator']->trans('other-domain-test-params-long-array', array('foo' => 'bar'), 'not_messages'); ?>
+
+<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-short-array-%count%', 10, array('%count%' => 10), 'not_messages'); ?>
+
+<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-long-array-%count%', 10, array('%count%' => 10), 'not_messages'); ?>
+
+<?php echo $view['translator']->trans('typecast', array('a' => (int) '123'), 'not_messages'); ?>
+<?php echo $view['translator']->transChoice('msg1', 10 + 1, array(), 'not_messages'); ?>
+<?php echo $view['translator']->transChoice('msg2', ceil(4.5), array(), 'not_messages'); ?>