Merge branch '2.x' into modifier-prop-name

Author: jannes-io

.editorconfig

@@ -0,0 +1,13 @@
+; top-most EditorConfig file
+root = true
+
+; Unix-style newlines
+[*]
+charset = utf-8
+end_of_line = LF
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{php,html,twig}]
+indent_style = space
+indent_size = 4

.gitattributes

@@ -1,3 +1,4 @@
+* text=auto eol=lf
 /.yarn/**            linguist-vendored
 /.yarn/releases/*    binary
 /.yarn/plugins/**/*  binary

.github/workflows/release-on-npm.yaml

@@ -3,7 +3,7 @@ name: Release on NPM
 on:
   push:
     tags:
-        - 'v*.*.*'
+        - 'v2.*.*'
 
 jobs:
     release:
@@ -32,7 +32,7 @@ jobs:
           - run: yarn --immutable
 
           - name: Update version of JS packages
-            run: yarn workspaces foreach -A version --immediate "${{ env.VERSION }}"
+            run: yarn workspaces foreach -pA exec "npm version ${{ env.VERSION }} --no-git-tag-version --no-workspaces-update"
 
           - name: Commit changes
             run: |

.github/workflows/test.yaml

@@ -41,7 +41,7 @@ jobs:
 
             - name: Check if JS dist files are current
               run: |
-                if [[ -n $(git status --porcelain) ]]; then
+                if ! git diff --quiet; then
                   echo "The Git workspace is unclean! Changes detected:"
                   git status --porcelain
                   git diff
@@ -84,12 +84,6 @@ jobs:
                     minimum-stability: 'dev'
                   - php-version: '8.3'
                     minimum-stability: 'dev'
-                  - component: Map # does not support PHP 8.1
-                    php-version: '8.1'
-                  - component: Map/src/Bridge/Google # does not support PHP 8.1
-                    php-version: '8.1'
-                  - component: Map/src/Bridge/Leaflet # does not support PHP 8.1
-                    php-version: '8.1'
                   - component: Swup  # has no tests
                   - component: Turbo # has its own workflow (test-turbo.yml)
                   - component: Typed  # has no tests

.github/workflows/toolkit-kits-cs.yaml

@@ -0,0 +1,28 @@
+name: Toolkit Kits
+
+on:
+    push:
+        paths:
+            - 'src/Toolkit/kits/**'
+    pull_request:
+        paths:
+            - 'src/Toolkit/kits/**'
+
+jobs:
+    kits-cs:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - uses: shivammathur/setup-php@v2
+              with:
+                php-version: 8.3
+
+            - name: Install composer packages
+              uses: ramsey/composer-install@v3
+              with:
+                working-directory: src/Toolkit
+
+            - name: Check kits code style
+              run: php vendor/bin/twig-cs-fixer check kits
+              working-directory: src/Toolkit

src/Autocomplete/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.25.0
+
+-   Escape `querySelector` dynamic selector with `CSS.escape()` #2663
+
 ## 2.23.0
 
 -   Deprecate `ExtraLazyChoiceLoader` in favor of `Symfony\Component\Form\ChoiceList\Loader\LazyChoiceLoader`

src/Autocomplete/assets/README.md

@@ -14,6 +14,8 @@ 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`.
+
 ## Resources
 
 -   [Documentation](https://symfony.com/bundles/ux-autocomplete/current/index.html)

src/Autocomplete/assets/dist/controller.js

@@ -1,32 +1,32 @@
 import { Controller } from '@hotwired/stimulus';
 import TomSelect from 'tom-select';
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
-
-
-function __classPrivateFieldGet(receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise, SuppressedError, Symbol */
+
+
+function __classPrivateFieldGet(receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
 var _default_1_instances, _default_1_getCommonConfig, _default_1_createAutocomplete, _default_1_createAutocompleteWithHtmlContents, _default_1_createAutocompleteWithRemoteData, _default_1_stripTags, _default_1_mergeObjects, _default_1_createTomSelect;
@@ -270,7 +270,7 @@ _default_1_instances = new WeakSet(), _default_1_getCommonConfig = function _def
             let orderedOption = null;
             for (const [, tomSelectOption] of Object.entries(this.tomSelect.options)) {
                 if (tomSelectOption.$order === optionOrder) {
-                    orderedOption = parentElement.querySelector(`:scope > option[value="${tomSelectOption[this.tomSelect.settings.valueField]}"]`);
+                    orderedOption = parentElement.querySelector(`:scope > option[value="${CSS.escape(tomSelectOption[this.tomSelect.settings.valueField])}"]`);
                     break;
                 }
             }

src/Autocomplete/assets/package.json

@@ -2,7 +2,7 @@
     "name": "@symfony/ux-autocomplete",
     "description": "JavaScript Autocomplete functionality for Symfony",
     "license": "MIT",
-    "version": "2.23.0",
+    "version": "2.24.0",
     "keywords": [
         "symfony-ux"
     ],

src/Autocomplete/assets/src/controller.ts

@@ -192,7 +192,7 @@ export default class extends Controller {
                 for (const [, tomSelectOption] of Object.entries(this.tomSelect.options)) {
                     if (tomSelectOption.$order === optionOrder) {
                         orderedOption = parentElement.querySelector(
-                            `:scope > option[value="${tomSelectOption[this.tomSelect.settings.valueField]}"]`
+                            `:scope > option[value="${CSS.escape(tomSelectOption[this.tomSelect.settings.valueField])}"]`
                         );
 
                         break;

src/Chartjs/assets/README.md

@@ -14,6 +14,8 @@ 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`.
+
 ## Resources
 
 -   [Documentation](https://symfony.com/bundles/ux-chartjs/current/index.html)

src/Chartjs/assets/package.json

@@ -2,7 +2,7 @@
     "name": "@symfony/ux-chartjs",
     "description": "Chart.js integration for Symfony",
     "license": "MIT",
-    "version": "2.23.0",
+    "version": "2.24.0",
     "keywords": [
         "symfony-ux"
     ],

src/Cropperjs/assets/README.md

@@ -14,6 +14,8 @@ 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`.
+
 ## Resources
 
 -   [Documentation](https://symfony.com/bundles/ux-cropperjs/current/index.html)

src/Cropperjs/assets/package.json

@@ -2,7 +2,7 @@
     "name": "@symfony/ux-cropperjs",
     "description": "Cropper.js integration for Symfony",
     "license": "MIT",
-    "version": "2.23.0",
+    "version": "2.24.0",
     "keywords": [
         "symfony-ux"
     ],

src/Dropzone/assets/README.md

@@ -14,6 +14,8 @@ 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`.
+
 ## Resources
 
 -   [Documentation](https://symfony.com/bundles/ux-dropzone/current/index.html)

src/Dropzone/assets/package.json

@@ -2,7 +2,7 @@
     "name": "@symfony/ux-dropzone",
     "description": "File input dropzones for Symfony Forms",
     "license": "MIT",
-    "version": "2.23.0",
+    "version": "2.24.0",
     "keywords": [
         "symfony-ux"
     ],

src/Icons/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 2.25.0
+
+-   Improve DX when `symfony/http-client` is not installed.
+
+## 2.24.0
+
+-    Add `xmlns` attribute to icons downloaded with Iconify, to correctly render icons browser as an external file, in SVG editors, and in files explorers or text editors previews.
+It **may breaks your pipeline** if you assert on `ux_icon()` or `<twig:ux:icon>` output in your tests, and forgot [to lock your icons](https://symfony.com/bundles/ux-icons/current/index.html#locking-on-demand-icons).
+We recommend you to **lock** your icons **before** upgrading to UX Icons 2.24. We also suggest you to to **force-lock** your icons **after** upgrading to UX Icons 2.24, to add the attribute `xmlns` to your icons already downloaded from Iconify.
+
 ## 2.20.0
 
 -   Add `aliases` configuration option to define icon alternative names.

src/Icons/config/iconify.php

@@ -11,12 +11,17 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use Symfony\UX\Icons\Command\ImportIconCommand;
+use Symfony\UX\Icons\Command\LockIconsCommand;
+use Symfony\UX\Icons\Command\SearchIconCommand;
 use Symfony\UX\Icons\Command\WarmCacheCommand;
 use Symfony\UX\Icons\IconCacheWarmer;
+use Symfony\UX\Icons\Iconify;
 use Symfony\UX\Icons\IconRenderer;
 use Symfony\UX\Icons\IconRendererInterface;
 use Symfony\UX\Icons\Registry\CacheIconRegistry;
 use Symfony\UX\Icons\Registry\ChainIconRegistry;
+use Symfony\UX\Icons\Registry\IconifyOnDemandRegistry;
 use Symfony\UX\Icons\Registry\LocalSvgIconRegistry;
 use Symfony\UX\Icons\Twig\IconFinder;
 use Symfony\UX\Icons\Twig\UXIconExtension;
@@ -86,5 +91,39 @@
                 service('.ux_icons.cache_warmer'),
             ])
             ->tag('console.command')
+
+        ->set('.ux_icons.iconify', Iconify::class)
+            ->args([
+                service('.ux_icons.cache'),
+                abstract_arg('endpoint'),
+                service('http_client')->nullOnInvalid(),
+            ])
+
+        ->set('.ux_icons.iconify_on_demand_registry', IconifyOnDemandRegistry::class)
+            ->args([
+                service('.ux_icons.iconify'),
+            ])
+            ->tag('ux_icons.registry', ['priority' => -10])
+
+        ->set('.ux_icons.command.import', ImportIconCommand::class)
+            ->args([
+                service('.ux_icons.iconify'),
+                service('.ux_icons.local_svg_icon_registry'),
+            ])
+            ->tag('console.command')
+
+        ->set('.ux_icons.command.lock', LockIconsCommand::class)
+            ->args([
+                service('.ux_icons.iconify'),
+                service('.ux_icons.local_svg_icon_registry'),
+                service('.ux_icons.icon_finder'),
+            ])
+            ->tag('console.command')
+
+        ->set('.ux_icons.command.search', SearchIconCommand::class)
+            ->args([
+                service('.ux_icons.iconify'),
+            ])
+            ->tag('console.command')
     ;
 };