Skip to content

Commit c9e93ec

Browse files
authored
Merge branch 'main' into NonInteractive_formlogin
2 parents 496beed + 0624f13 commit c9e93ec

File tree

167 files changed

+541
-229
lines changed

Some content is hidden

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

167 files changed

+541
-229
lines changed

.github/workflows/ci-static-analysis.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626
-
2727
name: Install PHP
2828
uses: "shivammathur/setup-php@v2"
29+
with:
30+
php-version: 8.2
2931

3032
-
3133
name: Validate composer.json
@@ -58,6 +60,8 @@ jobs:
5860

5961
- name: Install PHP
6062
uses: "shivammathur/setup-php@v2"
63+
with:
64+
php-version: 8.2
6165

6266
- name: Install Composer Dependencies
6367
uses: "ramsey/composer-install@v2"

.github/workflows/ci-windows.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ env:
1313
SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
1414
MAKER_SKIP_MERCURE_TEST: 1
1515
MAKER_SKIP_PANTHER_TEST: 1
16+
MAKER_TEST_WINDOWS: 1
1617
MAKER_DISABLE_FILE_LINKS: 1
1718
MAKER_ALLOW_DEV_DEPS_IN_APP: 0
1819
SYMFONY_VERSION: '7.0.x-dev'

.symfony.bundle.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ branches: ["main"]
22

33
maintained_branches: ["main"]
44

5-
doc_dir: "src/Resources/doc"
5+
doc_dir: "docs"
66

_docs_build/build.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
$outputDir = __DIR__.'/output';
3131
$buildConfig = (new BuildConfig())
3232
->setSymfonyVersion('7.1')
33-
->setContentDir(__DIR__.'/../src/Resources/doc')
33+
->setContentDir(__DIR__.'/../docs')
3434
->setOutputDir($outputDir)
3535
->setImagesDir(__DIR__.'/output/_images')
3636
->setImagesPublicPrefix('_images')

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"php": ">=8.1",
1717
"doctrine/inflector": "^2.0",
1818
"nikic/php-parser": "^4.18|^5.0",
19+
"php-cs-fixer/shim": "^v3.64",
1920
"symfony/config": "^6.4|^7.0",
2021
"symfony/console": "^6.4|^7.0",
2122
"symfony/dependency-injection": "^6.4|^7.0",
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
The <info>%command.name%</info> command generates or updates databases services in compose.yaml
2-
3-
<info>php %command.full_name%</info>
4-
5-
Supports MySQL, MariaDB and PostgreSQL
1+
The <info>%command.name%</info> command generates or updates databases services in compose.yaml
2+
3+
<info>php %command.full_name%</info>
4+
5+
Supports MySQL, MariaDB and PostgreSQL

0 commit comments

Comments
 (0)