Skip to content

Commit 392a557

Browse files
committed
Merge branch '2.x' into 3.x
* 2.x: [LiveComponent] Fix new URL calculation when having `#[LiveProp]` with custom `modifier` which returns a new `LiveProp` [LiveComponent] Fix new URL calculation when having `#[LiveProp]` with `useSerializerForHydration: true` and `#[SerializedName]` [CI] Fix highest dev jobs Run latest PHP-CS-Fixer with improved configuration [CI] Remove PHP-CS-Fixer job [Pkg] Ensure UX Map assets are built first [Toolkit] Fix comptability with Windows [LiveComponent] Exclude unstable tests on Windows with @transient-on-windows # Conflicts: # src/LazyImage/tests/BlurHash/BlurHashTest.php # src/LazyImage/tests/Kernel/AppKernelTrait.php # src/TogglePassword/tests/Kernel/TwigAppKernel.php
2 parents 6885988 + 5eb1153 commit 392a557

File tree

51 files changed

+841
-824
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+841
-824
lines changed

.github/workflows/code-quality.yaml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,6 @@ jobs:
3232
- run: pnpm install --frozen-lockfile
3333
- run: pnpm run ci
3434

35-
coding-style-php:
36-
runs-on: ubuntu-latest
37-
steps:
38-
- uses: actions/checkout@v4
39-
40-
- uses: shivammathur/setup-php@v2
41-
with:
42-
php-version: '8.1'
43-
44-
- name: Install root dependencies
45-
uses: ramsey/composer-install@v3
46-
with:
47-
working-directory: ${{ github.workspace }}
48-
49-
- name: php-cs-fixer
50-
run: ./vendor/bin/php-cs-fixer fix --dry-run --diff
51-
5235
phpstan:
5336
name: PHPStan
5437
runs-on: ubuntu-latest

.github/workflows/unit-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
echo COLUMNS=120 >> $GITHUB_ENV
6666
echo COMPOSER_MIN_STAB='composer config minimum-stability ${{ matrix.minimum-stability || 'stable' }} --ansi' >> $GITHUB_ENV
6767
echo COMPOSER_UP='composer update ${{ matrix.dependency-version == 'lowest' && '--prefer-lowest' || '' }} --no-progress --no-interaction --ansi' >> $GITHUB_ENV
68-
echo PHPUNIT='vendor/bin/simple-phpunit' >> $GITHUB_ENV
68+
echo PHPUNIT='vendor/bin/simple-phpunit ${{ matrix.os == 'windows-latest' && '--exclude-group transient-on-windows' || '' }}' >> $GITHUB_ENV
6969
[ 'lowest' = '${{ matrix.dependency-version }}' ] && export SYMFONY_DEPRECATIONS_HELPER=weak
7070
7171
# Turbo has its own workflow file

.php-cs-fixer.dist.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
return (new PhpCsFixer\Config())
3131
->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
3232
->setRules([
33-
'@PHPUnit75Migration:risky' => true,
33+
'@PHP81Migration' => true, // take lowest version from `git grep -h '"php"' **/composer.json | uniq | sort`
34+
'@PHPUnit91Migration:risky' => true,
3435
'@Symfony' => true,
3536
'@Symfony:risky' => true,
3637
'protected_to_private' => false,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"src/*/src/Bridge/*/assets"
88
],
99
"scripts": {
10-
"build": "pnpm run -r --aggregate-output build",
10+
"build": "pnpm run --filter @symfony/ux-map build && pnpm run -r --aggregate-output build",
1111
"test": "pnpm run -r --aggregate-output test",
1212
"check": "biome check",
1313
"ci": "biome ci"

src/Autocomplete/src/Maker/MakeAutocompleteField.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ public function configureCommand(Command $command, InputConfiguration $inputConf
5757
{
5858
$command
5959
->setHelp(<<<EOF
60-
The <info>%command.name%</info> command generates an Ajax-autocomplete form field class for symfony/ux-autocomplete
60+
The <info>%command.name%</info> command generates an Ajax-autocomplete form field class for symfony/ux-autocomplete
6161
62-
<info>php %command.full_name%</info>
62+
<info>php %command.full_name%</info>
6363
64-
The command will ask you which entity the field is for and what to call your new class.
65-
EOF)
64+
The command will ask you which entity the field is for and what to call your new class.
65+
EOF)
6666
;
6767
}
6868

src/Autocomplete/tests/Fixtures/Kernel.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,13 @@ protected function build(ContainerBuilder $container): void
8181
public function process(ContainerBuilder $container): void
8282
{
8383
$container->removeDefinition('doctrine.orm.listeners.pdo_session_handler_schema_listener');
84+
85+
if (\PHP_VERSION_ID >= 80400) {
86+
// Workaround for `RuntimeException: Unable to create the Doctrine Proxy directory "". in vendor/symfony/doctrine-bridge/CacheWarmer/ProxyCacheWarmer.php:49`
87+
// when running PHP 8.4 and Doctrine ORM 3.5+.
88+
$container->getDefinition('doctrine.orm.default_configuration')
89+
->addMethodCall('setProxyDir', ['%doctrine.orm.proxy_dir%']);
90+
}
8491
}
8592
}, PassConfig::TYPE_BEFORE_OPTIMIZATION, 1);
8693
}
@@ -126,6 +133,9 @@ protected function configureContainer(ContainerConfigurator $c): void
126133
];
127134
}
128135
if (null !== $doctrineBundleVersion = InstalledVersions::getVersion('doctrine/doctrine-bundle')) {
136+
if (version_compare($doctrineBundleVersion, '2.8.0', '>=')) {
137+
$doctrineConfig['orm']['enable_lazy_ghost_objects'] = true;
138+
}
129139
if (\PHP_VERSION_ID >= 80400 && version_compare($doctrineBundleVersion, '2.15.0', '>=')) {
130140
$doctrineConfig['orm']['enable_native_lazy_objects'] = true;
131141
}

src/Chartjs/tests/Kernel/TwigAppKernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ private function createTmpDir(string $type): string
5757
$dir = sys_get_temp_dir().'/chartjs_bundle/'.uniqid($type.'_', true);
5858

5959
if (!file_exists($dir)) {
60-
mkdir($dir, 0777, true);
60+
mkdir($dir, 0o777, true);
6161
}
6262

6363
return $dir;

src/Cropperjs/tests/Kernel/AppKernelTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ private function createTmpDir(string $type): string
3333
$dir = sys_get_temp_dir().'/cropperjs_bundle/'.uniqid($type.'_', true);
3434

3535
if (!file_exists($dir)) {
36-
mkdir($dir, 0777, true);
36+
mkdir($dir, 0o777, true);
3737
}
3838

3939
return $dir;

src/Dropzone/tests/Kernel/AppKernelTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ private function createTmpDir(string $type): string
3333
$dir = sys_get_temp_dir().'/dropzone_bundle/'.uniqid($type.'_', true);
3434

3535
if (!file_exists($dir)) {
36-
mkdir($dir, 0777, true);
36+
mkdir($dir, 0o777, true);
3737
}
3838

3939
return $dir;

src/Icons/src/Command/SearchIconCommand.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ protected function configure(): void
5151
->addArgument('name', InputArgument::OPTIONAL, 'Name of the icon (leave empty to search for sets)')
5252
->setHelp(
5353
<<<EOF
54-
The <info>%command.name%</info> command search icon sets and icons from ux.symfony.com
54+
The <info>%command.name%</info> command search icon sets and icons from ux.symfony.com
5555
56-
To search for <comment>icon sets</comment>, pass the prefix or name of the icon set (or a part of it):
56+
To search for <comment>icon sets</comment>, pass the prefix or name of the icon set (or a part of it):
5757
58-
<info>php %command.full_name% bootstrap</info>
59-
<info>php %command.full_name% material</info>
58+
<info>php %command.full_name% bootstrap</info>
59+
<info>php %command.full_name% material</info>
6060
61-
To search for <comment>icons</comment>, pass the prefix of the icon set and the name of the icon:
61+
To search for <comment>icons</comment>, pass the prefix of the icon set and the name of the icon:
6262
63-
<info>php %command.full_name% bootstrap star</info>
63+
<info>php %command.full_name% bootstrap star</info>
6464
65-
EOF
65+
EOF
6666
);
6767
}
6868

0 commit comments

Comments
 (0)