Merge branch 'symfony:2.x' into svelte-4-support

Author: ChqThomas

.github/workflows/doctor-rst.yaml

@@ -2,7 +2,11 @@ name: RST Linter
 
 on:
     push:
+        paths-ignore:
+            - 'ux.symfony.com/**'
     pull_request:
+        paths-ignore:
+            - 'ux.symfony.com/**'
 
 jobs:
     doctor-rst:
@@ -16,7 +20,7 @@ jobs:
               run: mkdir .cache
 
             - name: Extract base branch name
-              run: echo "##[set-output name=branch;]$(echo ${GITHUB_BASE_REF:=${GITHUB_REF##*/}})"
+              run: echo "branch=$(echo ${GITHUB_BASE_REF:=${GITHUB_REF##*/}})" >> $GITHUB_OUTPUT
               id: extract_base_branch
 
             - name: Cache DOCtor-RST

.github/workflows/test-turbo.yml

@@ -2,14 +2,18 @@ name: Symfony UX Turbo
 
 on:
     push:
+        paths:
+            - 'src/Turbo/**'
     pull_request:
+        paths:
+            - 'src/Turbo/**'
 
 jobs:
     phpstan:
         runs-on: ubuntu-latest
         steps:
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
@@ -34,8 +38,12 @@ jobs:
         strategy:
            fail-fast: false
            matrix:
-               php-version: ['8.1']
-               dependency-version: ['lowest', 'highest']
+               php-version: ['8.1', '8.2']
+               include:
+                  - php-version: '8.1'
+                    dependency-version: 'lowest'
+                  - php-version: '8.2'
+                    dependency-version: 'highest'
 
         services:
             mercure:
@@ -52,7 +60,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
@@ -69,7 +77,7 @@ jobs:
               id: yarn-cache-dir-path
               run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
-            - uses: actions/cache@v2
+            - uses: actions/cache@v3
               id: yarn-cache
               with:
                   path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -92,3 +100,5 @@ jobs:
             - name: Run tests
               working-directory: src/Turbo
               run: vendor/bin/simple-phpunit
+              env:
+                  SYMFONY_DEPRECATIONS_HELPER: 'max[self]=1'

.github/workflows/test.yaml

@@ -2,13 +2,17 @@ name: Symfony UX
 
 on:
     push:
+        paths-ignore:
+            - 'ux.symfony.com/**'
     pull_request:
+        paths-ignore:
+            - 'ux.symfony.com/**'
 
 jobs:
     coding-style-php:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@master
+            - uses: actions/checkout@v3
             - uses: shivammathur/setup-php@v2
               with:
                   php-version: '8.1'
@@ -20,11 +24,11 @@ jobs:
         name: JavaScript Coding Style
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@master
+            - uses: actions/checkout@v3
             - name: Get yarn cache directory path
               id: yarn-cache-dir-path
               run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-            - uses: actions/cache@v2
+            - uses: actions/cache@v3
               id: yarn-cache
               with:
                   path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -39,11 +43,11 @@ jobs:
         name: Check for UnBuilt JS Dist Files
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@master
+            - uses: actions/checkout@v3
             - name: Get yarn cache directory path
               id: yarn-cache-dir-path
               run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-            - uses: actions/cache@v2
+            - uses: actions/cache@v3
               id: yarn-cache
               with:
                   path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -86,8 +90,12 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: ['8.1']
-                dependency-version: ['lowest', 'highest']
+                php-version: ['8.1', '8.2']
+                include:
+                  - php-version: '8.1'
+                    dependency-version: 'lowest'
+                  - php-version: '8.2'
+                    dependency-version: 'highest'
                 component: ${{ fromJson(needs.tests-php-components.outputs.components )}}
                 exclude:
                   - component: Swup  # has no tests
@@ -124,11 +132,11 @@ jobs:
     tests-js:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@master
+            - uses: actions/checkout@v3
             - name: Get yarn cache directory path
               id: yarn-cache-dir-path
               run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-            - uses: actions/cache@v2
+            - uses: actions/cache@v3
               id: yarn-cache
               with:
                   path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

.github/workflows/ux.symfony.com.yaml

@@ -2,7 +2,11 @@ name: ux.symfony.com
 
 on:
     push:
+        paths:
+            - 'ux.symfony.com/**'
     pull_request:
+        paths:
+            - 'ux.symfony.com/**'
 
 jobs:
     tests:
@@ -24,5 +28,8 @@ jobs:
               with:
                 working-directory: ux.symfony.com
 
+            - name: Build Sass assets
+              run: php bin/console sass:build
+
             - name: Tests
               run: vendor/bin/phpunit

.php-cs-fixer.dist.php

@@ -1,24 +1,33 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 if (!file_exists(__DIR__.'/src')) {
     exit(0);
 }
 
+$fileHeaderComment = <<<'EOF'
+This file is part of the Symfony package.
+
+(c) Fabien Potencier <[email protected]>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+EOF;
+
 return (new PhpCsFixer\Config())
     ->setRules([
+        '@PHPUnit75Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        '@PHPUnit75Migration:risky' => true,
-        'php_unit_dedicate_assert' => ['target' => '5.6'],
-        'array_syntax' => ['syntax' => 'short'],
-        'fopen_flags' => false,
-        'protected_to_private' => false,
-        'native_constant_invocation' => true,
-        'combine_nested_dirname' => true,
-        'list_syntax' => ['syntax' => 'short'],
-        'ordered_imports' => [
-            'imports_order' => ['const', 'class', 'function'],
-        ],
+        'header_comment' => ['header' => $fileHeaderComment],
     ])
     ->setRiskyAllowed(true)
     ->setFinder(
@@ -28,6 +37,5 @@
             ->notPath('#/Fixtures/#')
             ->notPath('#/app/var/#')
             ->notPath('#/var/cache/#')
-            ->notPath('Turbo/Attribute/Broadcast.php') // Need https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/4702
     )
 ;

README.md

@@ -22,7 +22,7 @@ or with [AssetMapper](https://symfony.com/doc/current/frontend/asset_mapper.html
 ## Resources
 
 -   [Install Symfony UX](https://symfony.com/doc/current/frontend/ux.html).
--   [List of UX Packages](https://symfony.com/doc/current/frontend/ux.html#ux-packages-list).
+-   [List of UX Packages](https://symfony.com/bundles/StimulusBundle/current/index.html#the-ux-packages).
 -   [Symfony UX Official Demo](https://ux.symfony.com).
 -   Watch the [Stimulus Screencast on SymfonyCasts](https://symfonycasts.com/screencast/stimulus).
 

bin/run-vitest-all.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Get all workspace names
+workspaces=$(yarn workspaces info | grep -o '@symfony/[^"]*')
+
+# Flag to track if any test fails
+all_tests_passed=true
+
+for workspace in $workspaces; do
+  echo "Running tests in $workspace..."
+
+  # Run the tests and if they fail, set the flag to false
+  yarn workspace $workspace run vitest --run || { echo "$workspace failed"; all_tests_passed=false; }
+done
+
+# Check the flag at the end and exit with code 1 if any test failed
+if [ "$all_tests_passed" = false ]; then
+  echo "Some tests failed."
+  exit 1
+else
+  echo "All tests passed!"
+  exit 0
+fi

composer.json

@@ -1,9 +1,12 @@
 {
     "name": "symfony/ux",
     "license": "MIT",
+    "keywords": [
+        "dev"
+    ],
     "require-dev": {
-        "symfony/filesystem": "^5.2|^6.0",
-        "symfony/finder": "^5.4|^6.0",
+        "symfony/filesystem": "^5.2|^6.0|^7.0",
+        "symfony/finder": "^5.4|^6.0|^7.0",
         "php-cs-fixer/shim": "^3.13"
     }
 }

jest.config.js

@@ -5,7 +5,7 @@
     ],
     "scripts": {
         "build": "node bin/build_javascript.js && node bin/build_styles.js",
-        "test": "yarn workspaces run jest",
+        "test": "bin/run-vitest-all.sh",
         "lint": "yarn workspaces run eslint src test",
         "format": "prettier src/*/assets/src/*.ts src/*/assets/test/*.js {,src/*/}*.{json,md} --write",
         "check-lint": "yarn lint --no-fix",
@@ -22,16 +22,14 @@
         "@symfony/stimulus-testing": "^2.0.1",
         "@typescript-eslint/eslint-plugin": "^5.2.0",
         "@typescript-eslint/parser": "^5.2.0",
-        "babel-jest": "^27.3.1",
         "clean-css-cli": "^5.6.2",
         "eslint": "^8.1.0",
         "eslint-config-prettier": "^8.0.0",
-        "eslint-plugin-jest": "^25.2.2",
-        "jest": "^27.3.1",
         "prettier": "^2.2.1",
         "rollup": "^3.7.0",
         "tslib": "^2.3.1",
-        "typescript": "^4.4.4"
+        "typescript": "^4.4.4",
+        "vitest": "^0.34.6"
     },
     "eslintConfig": {
         "root": true,
@@ -61,9 +59,6 @@
             {
                 "files": [
                     "src/*/assets/test/**/*.ts"
-                ],
-                "extends": [
-                    "plugin:jest/recommended"
                 ]
             }
         ]
@@ -72,7 +67,7 @@
         "printWidth": 120,
         "trailingComma": "es5",
         "tabWidth": 4,
-        "jsxBracketSameLine": true,
+        "bracketSameLine": true,
         "singleQuote": true
     }
 }

package.json

@@ -4,6 +4,5 @@
 /phpunit.xml.dist export-ignore
 /assets/.gitignore export-ignore
 /assets/src/**/*.ts export-ignore
-/assets/jest.config.js export-ignore
 /assets/test export-ignore
 /tests export-ignore

src/Autocomplete/.gitattributes

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.13.0
+
+-   Add new BaseEntityAutocompleteType
+
 ## 2.9.0
 
 -   Add support for symfony/asset-mapper

src/Autocomplete/CHANGELOG.md

@@ -29,7 +29,7 @@
     },
     "devDependencies": {
         "@hotwired/stimulus": "^3.0.0",
-        "fetch-mock-jest": "^1.5.1",
-        "tom-select": "^2.2.2"
+        "tom-select": "^2.2.2",
+        "vitest-fetch-mock": "^0.2.2"
     }
 }