Merge branch '2.x' into 3.x

Kocal · Kocal · commit 86efa5afe233 · 2025-10-17T09:23:47.000+02:00
# By Alexis Lefebvre (2) and others
* 2.x:
  [TwigComponent] Document how to define mandatory/default props
  Add --json flag to composer config command
  TwigComponent: remove floating text
  [Toolkit][Shadcn] Add missing UX Icons dependencies
  added missing import to code snippet

# Conflicts:
#	src/LazyImage/assets/README.md
#	src/Swup/assets/README.md
#	src/TogglePassword/assets/README.md
#	src/Typed/assets/README.md
diff --git a/src/Autocomplete/assets/README.md b/src/Autocomplete/assets/README.md
@@ -14,7 +14,7 @@ composer require symfony/ux-autocomplete:2.23.0
 npm add @symfony/ux-autocomplete@2.23.0
 ```
 
-**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config "extra.symfony/flex.synchronize_package_json" false`.
+**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config --json "extra.symfony/flex.synchronize_package_json" false`.
 
 ## Resources
 
diff --git a/src/Chartjs/assets/README.md b/src/Chartjs/assets/README.md
@@ -14,7 +14,7 @@ composer require symfony/ux-chartjs:2.23.0
 npm add @symfony/ux-chartjs@2.23.0
 ```
 
-**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config "extra.symfony/flex.synchronize_package_json" false`.
+**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config --json "extra.symfony/flex.synchronize_package_json" false`.
 
 ## Resources
 
diff --git a/src/Cropperjs/assets/README.md b/src/Cropperjs/assets/README.md
@@ -14,7 +14,7 @@ composer require symfony/ux-cropperjs:2.23.0
 npm add @symfony/ux-cropperjs@2.23.0
 ```
 
-**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config "extra.symfony/flex.synchronize_package_json" false`.
+**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config --json "extra.symfony/flex.synchronize_package_json" false`.
 
 ## Resources
 
diff --git a/src/Dropzone/assets/README.md b/src/Dropzone/assets/README.md
@@ -14,7 +14,7 @@ composer require symfony/ux-dropzone:2.23.0
 npm add @symfony/ux-dropzone@2.23.0
 ```
 
-**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config "extra.symfony/flex.synchronize_package_json" false`.
+**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config --json "extra.symfony/flex.synchronize_package_json" false`.
 
 ## Resources
 
diff --git a/src/LiveComponent/assets/README.md b/src/LiveComponent/assets/README.md
@@ -14,7 +14,7 @@ composer require symfony/ux-live-component:2.23.0
 npm add @symfony/ux-live-component@2.23.0
 ```
 
-**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config "extra.symfony/flex.synchronize_package_json" false`.
+**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config --json "extra.symfony/flex.synchronize_package_json" false`.
 
 ## Resources
 
diff --git a/src/LiveComponent/doc/index.rst b/src/LiveComponent/doc/index.rst
@@ -948,6 +948,7 @@ component system from Stimulus:
 
     // assets/controllers/some-custom-controller.js
     // ...
+    import { Controller } from '@hotwired/stimulus';
     import { getComponent } from '@symfony/ux-live-component';
 
     export default class extends Controller {
diff --git a/src/Map/src/Bridge/Google/assets/README.md b/src/Map/src/Bridge/Google/assets/README.md
@@ -14,7 +14,7 @@ composer require symfony/ux-google-map:2.23.0
 npm add @symfony/ux-google-map@2.23.0
 ```
 
-**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config extra.symfony.flex.synchronize_package_json false`.
+**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config --json "extra.symfony/flex.synchronize_package_json" false`.
 
 ## Resources
 
diff --git a/src/Map/src/Bridge/Leaflet/assets/README.md b/src/Map/src/Bridge/Leaflet/assets/README.md
@@ -14,7 +14,7 @@ composer require symfony/ux-leaflet-map:2.23.0
 npm add @symfony/ux-leaflet-map@2.23.0
 ```
 
-**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config extra.symfony.flex.synchronize_package_json false`.
+**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config --json "extra.symfony/flex.synchronize_package_json" false`.
 
 ## Resources
 
diff --git a/src/Notify/assets/README.md b/src/Notify/assets/README.md
@@ -14,7 +14,7 @@ composer require symfony/ux-notify:2.23.0
 npm add @symfony/ux-notify@2.23.0
 ```
 
-**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config "extra.symfony/flex.synchronize_package_json" false`.
+**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config --json "extra.symfony/flex.synchronize_package_json" false`.
 
 ## Resources
 
diff --git a/src/React/assets/README.md b/src/React/assets/README.md
@@ -14,7 +14,7 @@ composer require symfony/ux-react:2.23.0
 npm add @symfony/ux-react@2.23.0
 ```
 
-**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config "extra.symfony/flex.synchronize_package_json" false`.
+**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config --json "extra.symfony/flex.synchronize_package_json" false`.
 
 ## Resources
 
diff --git a/src/Svelte/assets/README.md b/src/Svelte/assets/README.md
@@ -14,7 +14,7 @@ composer require symfony/ux-svelte:2.23.0
 npm add @symfony/ux-svelte@2.23.0
 ```
 
-**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config "extra.symfony/flex.synchronize_package_json" false`.
+**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config --json "extra.symfony/flex.synchronize_package_json" false`.
 
 ## Resources
 
diff --git a/src/Toolkit/kits/shadcn/breadcrumb/manifest.json b/src/Toolkit/kits/shadcn/breadcrumb/manifest.json
@@ -7,6 +7,6 @@
         "templates/": "templates/"
     },
     "dependencies": {
-        "composer": ["tales-from-a-dev/twig-tailwind-extra"]
+        "composer": ["symfony/ux-icons", "tales-from-a-dev/twig-tailwind-extra"]
     }
 }
diff --git a/src/Toolkit/kits/shadcn/pagination/manifest.json b/src/Toolkit/kits/shadcn/pagination/manifest.json
@@ -7,6 +7,6 @@
         "templates/": "templates/"
     },
     "dependencies": {
-        "composer": ["tales-from-a-dev/twig-tailwind-extra"]
+        "composer": ["symfony/ux-icons", "tales-from-a-dev/twig-tailwind-extra"]
     }
 }
diff --git a/src/Translator/assets/README.md b/src/Translator/assets/README.md
@@ -14,7 +14,7 @@ composer require symfony/ux-translator:2.23.0
 npm add @symfony/ux-translator@2.23.0
 ```
 
-**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config "extra.symfony/flex.synchronize_package_json" false`.
+**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config --json "extra.symfony/flex.synchronize_package_json" false`.
 
 ## Resources
 
diff --git a/src/Turbo/assets/README.md b/src/Turbo/assets/README.md
@@ -14,7 +14,7 @@ composer require symfony/ux-turbo:2.23.0
 npm add @symfony/ux-turbo@2.23.0
 ```
 
-**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config "extra.symfony/flex.synchronize_package_json" false`.
+**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config --json "extra.symfony/flex.synchronize_package_json" false`.
 
 ## Resources
 
diff --git a/src/TwigComponent/doc/index.rst b/src/TwigComponent/doc/index.rst
@@ -41,8 +41,6 @@ Enjoy your new component!
 .. image:: images/alert-example.png
     :alt: Example of the Alert Component
 
-    Example of the Alert Component
-
 This brings the familiar "component" system from client-side frameworks
 into Symfony. Combine this with `Live Components`_, to create
 an interactive frontend with automatic, Ajax-powered rendering.
@@ -702,12 +700,14 @@ You can also pass a variable (prop) into your template:
     </div>
 
 To tell the system that ``icon`` and ``type`` are props and not attributes, use the
-``{% props %}`` tag at the top of your template.
+``{% props %}`` tag at the top of your template. Props are required by default, but
+it is possible to set a default value with ``=``:
 
 .. code-block:: html+twig
 
     {# templates/components/Button.html.twig #}
-    {% props icon = null, type = 'primary' %}
+    {# prop "icon" is required, but prop "type" has a default value to "primary" #}
+    {% props icon, type = 'primary' %}
 
     <button {{ attributes.defaults({class: 'btn btn-'~type}) }}>
         {% block content %}{% endblock %}
@@ -716,6 +716,19 @@ To tell the system that ``icon`` and ``type`` are props and not attributes, use
         {% endif %}
     </button>
 
+Examples of usage:
+
+.. code-block:: html+twig
+
+    {# property "icon" is missing, an exception is thrown #}
+    <twig:Button>Share</twig:Button>
+
+    {# property "icon" is passed, property "type" use its default value "primary" #}
+    <twig:Button icon="share">Share</twig:Button>
+
+    {# both properties "icon" and "type" are passed #}
+    <twig:Button icon="share" type="secondary>Share</twig:Button>
+
 .. _embedded-components:
 
 Passing HTML to Components Via Blocks
diff --git a/src/Vue/assets/README.md b/src/Vue/assets/README.md
@@ -14,7 +14,7 @@ composer require symfony/ux-vue:2.23.0
 npm add @symfony/ux-vue@2.23.0
 ```
 
-**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config "extra.symfony/flex.synchronize_package_json" false`.
+**Tip:** Your `package.json` file will be automatically modified by [Flex](https://github.com/symfony/flex) when installing or upgrading a PHP package. To prevent this behavior, ensure to **use at least Flex 1.22.0 or 2.5.0**, and run `composer config --json "extra.symfony/flex.synchronize_package_json" false`.
 
 ## Resources
 
