Merge branch '6.0' into 6.1

xabbuh · xabbuh · commit c110fb8620cb · 2022-12-04T19:20:56.000+01:00
* 6.0:
  prevent the installation of unstable phpdocumentor/type-resolver releases
  chore: fix typo 'do' verb
  [Twig Bridge] Add PHPdoc information to some email methods
  Amend MoneyType twig to include a space.
  [WebProfilerBundle] Remove redundant code from logger template
diff --git a/composer.json b/composer.json
@@ -153,7 +153,7 @@
         "egulias/email-validator": "~3.0.0",
         "masterminds/html5": "<2.6",
         "phpdocumentor/reflection-docblock": "<5.2",
-        "phpdocumentor/type-resolver": "<1.5.1",
+        "phpdocumentor/type-resolver": "<1.5.1|>=1.7.0",
         "ocramius/proxy-manager": "<2.1",
         "phpunit/phpunit": "<5.4.3"
     },
diff --git a/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php b/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php
@@ -35,6 +35,12 @@ public function toName(): string
         return $this->message->getTo()[0]->getName();
     }
 
+    /**
+     * @param string $image            A Twig path to the image file. It's recommended to define
+     *                                 some Twig namespace for email images (e.g. '@email/images/logo.png').
+     * @param string|null $contentType The media type (i.e. MIME type) of the image file (e.g. 'image/png').
+     *                                 Some email clients require this to display embedded images.
+     */
     public function image(string $image, string $contentType = null): string
     {
         $file = $this->twig->getLoader()->getSourceContext($image);
@@ -47,6 +53,13 @@ public function image(string $image, string $contentType = null): string
         return 'cid:'.$image;
     }
 
+    /**
+     * @param string $file             A Twig path to the file. It's recommended to define
+     *                                 some Twig namespace for email files (e.g. '@email/files/contract.pdf').
+     * @param string|null $name        A custom file name that overrides the original name of the attached file.
+     * @param string|null $contentType The media type (i.e. MIME type) of the file (e.g. 'application/pdf').
+     *                                 Some email clients require this to display attached files.
+     */
     public function attach(string $file, string $name = null, string $contentType = null): void
     {
         $file = $this->twig->getLoader()->getSourceContext($file);
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
@@ -6,7 +6,7 @@
     {%- set prepend = not (money_pattern starts with '{{') -%}
     {%- set append = not (money_pattern ends with '}}') -%}
     {%- if prepend or append -%}
-        <div class="input-group{{ group_class|default('') }}">
+        <div class="input-group {{ group_class|default('') }}">
             {%- if prepend -%}
                 <div class="input-group-prepend">
                     <span class="input-group-text">{{ money_pattern|form_encode_currency }}</span>
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_layout.html.twig
@@ -6,7 +6,7 @@
     {%- set prepend = not (money_pattern starts with '{{') -%}
     {%- set append = not (money_pattern ends with '}}') -%}
     {%- if prepend or append -%}
-        <div class="input-group{{ group_class|default('') }}">
+        <div class="input-group {{ group_class|default('') }}">
             {%- if prepend -%}
                 <span class="input-group-text">{{ money_pattern|form_encode_currency }}</span>
             {%- endif -%}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig
@@ -11,7 +11,7 @@
     {% set prepend = not (money_pattern starts with '{{') %}
     {% set append = not (money_pattern ends with '}}') %}
     {% if prepend or append %}
-        <div class="input-group{{ group_class|default('') }}">
+        <div class="input-group {{ group_class|default('') }}">
             {% if prepend %}
                 <span class="input-group-addon">{{ money_pattern|form_encode_currency }}</span>
             {% endif %}
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php
@@ -1165,7 +1165,7 @@ public function testMoney()
 
         $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
             '/div
-    [@class="input-group"]
+    [@class="input-group "]
     [
         ./div
             [@class="input-group-prepend"]
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTest.php
@@ -1450,7 +1450,7 @@ public function testMoney()
 
         $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
             '/div
-    [@class="input-group"]
+    [@class="input-group "]
     [
         ./span
             [@class="input-group-text"]
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
@@ -102,7 +102,7 @@ public function testMoneyWidgetInIso()
         ;
 
         $this->assertSame(<<<'HTML'
-<div class="input-group"><div class="input-group-prepend">
+<div class="input-group "><div class="input-group-prepend">
                     <span class="input-group-text">&euro; </span>
                 </div><input type="text" id="name" name="name" required="required" class="form-control" /></div>
 HTML
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5LayoutTest.php
@@ -104,7 +104,7 @@ public function testMoneyWidgetInIso()
             ->createView();
 
         self::assertSame(<<<'HTML'
-<div class="input-group"><span class="input-group-text">&euro; </span><input type="text" id="name" name="name" required="required" class="form-control" /></div>
+<div class="input-group "><span class="input-group-text">&euro; </span><input type="text" id="name" name="name" required="required" class="form-control" /></div>
 HTML
             , trim($this->renderWidget($view)));
     }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -253,10 +253,6 @@
         {% if has_trace %}
             {% set trace_id = 'trace-' ~ category ~ '-' ~ log_index %}
             <span><button type="button" class="btn btn-link text-small sf-toggle" data-toggle-selector="#{{ trace_id }}" data-toggle-alt-content="Hide trace">Show trace</button></span>
-
-            <div id="{{ trace_id }}" class="context sf-toggle-content sf-toggle-hidden">
-                {{ profiler_dump(log.context.exception.trace, maxDepth=1) }}
-            </div>
         {% endif %}
 
         {% if has_context %}
diff --git a/src/Symfony/Component/HttpFoundation/Exception/SessionNotFoundException.php b/src/Symfony/Component/HttpFoundation/Exception/SessionNotFoundException.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\HttpFoundation\Exception;
 
 /**
- * Raised when a session does not exists. This happens in the following cases:
+ * Raised when a session does not exist. This happens in the following cases:
  * - the session is not enabled
  * - attempt to read a session outside a request context (ie. cli script).
  *
diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json
@@ -42,7 +42,7 @@
     "conflict": {
         "doctrine/annotations": "<1.12",
         "phpdocumentor/reflection-docblock": "<3.2.2",
-        "phpdocumentor/type-resolver": "<1.4.0",
+        "phpdocumentor/type-resolver": "<1.4.0|>=1.7.0",
         "symfony/dependency-injection": "<5.4",
         "symfony/property-access": "<5.4",
         "symfony/property-info": "<5.4",

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,12 @@ public function toName(): string`
`35`	`35`	`return $this->message->getTo()[0]->getName();`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ /**`
	`39`	`+ * @param string $image A Twig path to the image file. It's recommended to define`
	`40`	`+ * some Twig namespace for email images (e.g. '@email/images/logo.png').`
	`41`	`+ * @param string\|null $contentType The media type (i.e. MIME type) of the image file (e.g. 'image/png').`
	`42`	`+ * Some email clients require this to display embedded images.`
	`43`	`+ */`
`38`	`44`	`public function image(string $image, string $contentType = null): string`
`39`	`45`	`{`
`40`	`46`	`$file = $this->twig->getLoader()->getSourceContext($image);`
`@@ -47,6 +53,13 @@ public function image(string $image, string $contentType = null): string`
`47`	`53`	`return 'cid:'.$image;`
`48`	`54`	`}`
`49`	`55`
	`56`	`+ /**`
	`57`	`+ * @param string $file A Twig path to the file. It's recommended to define`
	`58`	`+ * some Twig namespace for email files (e.g. '@email/files/contract.pdf').`
	`59`	`+ * @param string\|null $name A custom file name that overrides the original name of the attached file.`
	`60`	`+ * @param string\|null $contentType The media type (i.e. MIME type) of the file (e.g. 'application/pdf').`
	`61`	`+ * Some email clients require this to display attached files.`
	`62`	`+ */`
`50`	`63`	`public function attach(string $file, string $name = null, string $contentType = null): void`
`51`	`64`	`{`
`52`	`65`	`$file = $this->twig->getLoader()->getSourceContext($file);`
Original file line number	Diff line number	Diff line change
`@@ -1165,7 +1165,7 @@ public function testMoney()`
`1165`	`1165`
`1166`	`1166`	`$this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],`
`1167`	`1167`	`'/div`
`1168`		`- [@class="input-group"]`
	`1168`	`+ [@class="input-group "]`
`1169`	`1169`	`[`
`1170`	`1170`	`./div`
`1171`	`1171`	`[@class="input-group-prepend"]`
Original file line number	Diff line number	Diff line change
`@@ -1450,7 +1450,7 @@ public function testMoney()`
`1450`	`1450`
`1451`	`1451`	`$this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],`
`1452`	`1452`	`'/div`
`1453`		`- [@class="input-group"]`
	`1453`	`+ [@class="input-group "]`
`1454`	`1454`	`[`
`1455`	`1455`	`./span`
`1456`	`1456`	`[@class="input-group-text"]`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function testMoneyWidgetInIso()`
`102`	`102`	`;`
`103`	`103`
`104`	`104`	`$this->assertSame(<<<'HTML'`
`105`		`-<div class="input-group"><div class="input-group-prepend">`
	`105`	`+<div class="input-group "><div class="input-group-prepend">`
`106`	`106`	`<span class="input-group-text">€ </span>`
`107`	`107`	`</div><input type="text" id="name" name="name" required="required" class="form-control" /></div>`
`108`	`108`	`HTML`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function testMoneyWidgetInIso()`
`104`	`104`	`->createView();`
`105`	`105`
`106`	`106`	`self::assertSame(<<<'HTML'`
`107`		`-<div class="input-group"><span class="input-group-text">€ </span><input type="text" id="name" name="name" required="required" class="form-control" /></div>`
	`107`	`+<div class="input-group "><span class="input-group-text">€ </span><input type="text" id="name" name="name" required="required" class="form-control" /></div>`
`108`	`108`	`HTML`
`109`	`109`	`, trim($this->renderWidget($view)));`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\HttpFoundation\Exception;`
`13`	`13`
`14`	`14`	`/**`
`15`		`- * Raised when a session does not exists. This happens in the following cases:`
	`15`	`+ * Raised when a session does not exist. This happens in the following cases:`
`16`	`16`	`* - the session is not enabled`
`17`	`17`	`* - attempt to read a session outside a request context (ie. cli script).`
`18`	`18`	`*`