Skip to content

Commit 728060e

Browse files
94noni94noni
authored
Merge branch 'main' into ft-sf-ux-stimulus-demo
2 parents 906417f + 3965fa3 commit 728060e

Some content is hidden

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

64 files changed

+1251
-1522
lines changed

‎.devcontainer/devcontainer.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
3+
"features": {
4+
"ghcr.io/shyim/devcontainers-features/symfony-cli:0": {},
5+
"ghcr.io/shyim/devcontainers-features/php:0": {
6+
"version": "8.1"
7+
},
8+
"ghcr.io/devcontainers/features/node:1": {
9+
"version": "lts"
10+
}
11+
},
12+
"updateContentCommand": {
13+
"composer install": ["composer", "install"],
14+
"yarn": ["yarn"]
15+
},
16+
"postAttachCommand": {
17+
"server": "symfony server:start",
18+
"yarn": ["yarn", "watch"]
19+
}
20+
}

‎.env

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# Real environment variables win over .env files.
1010
#
1111
# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
12+
# https://symfony.com/doc/current/configuration/secrets.html
1213
#
1314
# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
1415
# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
@@ -30,5 +31,5 @@ DATABASE_URL=sqlite:///%kernel.project_dir%/data/database.sqlite
3031
###< doctrine/doctrine-bundle ###
3132

3233
###> symfony/mailer ###
33-
# MAILER_DSN=smtp://localhost
34+
# MAILER_DSN=null://null
3435
###< symfony/mailer ###

‎.github/workflows/lint.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@ on:
99
env:
1010
fail-fast: true
1111

12+
permissions:
13+
contents: read
14+
1215
jobs:
1316
php-cs-fixer:
1417
name: PHP-CS-Fixer
1518
runs-on: ubuntu-latest
1619
steps:
1720
- name: "Checkout code"
18-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
1922

2023
- name: PHP-CS-Fixer
2124
uses: docker://oskarstark/php-cs-fixer-ga
@@ -31,10 +34,10 @@ jobs:
3134

3235
steps:
3336
- name: "Checkout code"
34-
uses: actions/checkout@v2.3.3
37+
uses: actions/checkout@v3
3538

3639
- name: "Install PHP with extensions"
37-
uses: shivammathur/setup-php@2.7.0
40+
uses: shivammathur/setup-php@v2
3841
with:
3942
coverage: "none"
4043
extensions: intl
@@ -43,10 +46,10 @@ jobs:
4346

4447
- name: "Set composer cache directory"
4548
id: composer-cache
46-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
49+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
4750

4851
- name: "Cache composer"
49-
uses: actions/cache@v2.1.2
52+
uses: actions/cache@v3
5053
with:
5154
path: ${{ steps.composer-cache.outputs.dir }}
5255
key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('composer.lock') }}
@@ -83,13 +86,9 @@ jobs:
8386
if: always() && steps.install.outcome == 'success'
8487
run: composer validate --strict
8588

86-
- name: Download Symfony CLI
87-
if: always() && steps.install.outcome == 'success'
88-
run: wget https://get.symfony.com/cli/installer -O - | bash
89-
9089
- name: Check if any dependencies are compromised
9190
if: always() && steps.install.outcome == 'success'
92-
run: /home/runner/.symfony/bin/symfony check:security
91+
run: composer audit
9392

9493
- name: Run PHPStan
9594
if: always() && steps.install.outcome == 'success'

‎.github/workflows/tests.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ env:
1010
fail-fast: true
1111
PHPUNIT_FLAGS: "-v"
1212
SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
13-
SYMFONY_REQUIRE: ">=6.0"
1413
SYMFONY_DEPRECATIONS_HELPER: 7
1514

15+
permissions:
16+
contents: read
17+
1618
jobs:
1719
test:
1820
name: "${{ matrix.operating-system }} / PHP ${{ matrix.php-version }}"
@@ -31,10 +33,10 @@ jobs:
3133

3234
steps:
3335
- name: "Checkout code"
34-
uses: actions/checkout@v2.3.3
36+
uses: actions/checkout@v3
3537

3638
- name: "Install PHP with extensions"
37-
uses: shivammathur/setup-php@2.7.0
39+
uses: shivammathur/setup-php@v2
3840
with:
3941
coverage: "none"
4042
extensions: "intl, mbstring, pdo_sqlite"
@@ -46,18 +48,16 @@ jobs:
4648

4749
- name: "Set composer cache directory"
4850
id: composer-cache
49-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
51+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
52+
shell: bash
5053

5154
- name: "Cache composer"
52-
uses: actions/cache@v2.1.2
55+
uses: actions/cache@v3
5356
with:
5457
path: ${{ steps.composer-cache.outputs.dir }}
5558
key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}
5659
restore-keys: ${{ runner.os }}-${{ matrix.php-version }}-composer-
5760

58-
- name: "Require symfony/flex"
59-
run: composer require --no-progress --no-scripts --no-plugins symfony/flex
60-
6161
- name: "Install dependencies"
6262
run: composer update --no-interaction --prefer-dist --optimize-autoloader
6363

‎.php-cs-fixer.dist.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@
3939
'blank_line_between_import_groups' => false,
4040
])
4141
->setFinder($finder)
42-
->setCacheFile(__DIR__.'/var/.php_cs.cache')
42+
->setCacheFile(__DIR__.'/var/.php-cs-fixer.cache')
4343
;

‎assets/bootstrap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { startStimulusApp } from '@symfony/stimulus-bridge';
44
export const app = startStimulusApp(require.context(
55
'@symfony/stimulus-bridge/lazy-controller-loader!./controllers',
66
true,
7-
/\.(j|t)sx?$/
7+
/\.[jt]sx?$/
88
));
99

1010
// register any custom, 3rd party controllers here

‎composer.json

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,32 @@
1616
"php": ">=8.1",
1717
"ext-pdo_sqlite": "*",
1818
"doctrine/dbal": "^3.1",
19-
"doctrine/doctrine-bundle": "^2.5",
19+
"doctrine/doctrine-bundle": "^2.7",
2020
"doctrine/doctrine-migrations-bundle": "^3.0",
2121
"doctrine/orm": "^2.10",
2222
"league/commonmark": "^2.1",
23-
"sensio/framework-extra-bundle": "^6.2",
2423
"symfony/apache-pack": "^1.0",
25-
"symfony/asset": "^6.1",
26-
"symfony/console": "^6.1",
27-
"symfony/dotenv": "^6.1",
28-
"symfony/expression-language": "^6.1",
24+
"symfony/asset": "^6.2",
25+
"symfony/console": "^6.2",
26+
"symfony/dotenv": "^6.2",
27+
"symfony/expression-language": "^6.2",
2928
"symfony/flex": "^2.0",
30-
"symfony/form": "^6.1",
31-
"symfony/framework-bundle": "^6.1",
32-
"symfony/html-sanitizer": "^6.1",
33-
"symfony/http-client": "^6.1",
34-
"symfony/intl": "^6.1",
35-
"symfony/mailer": "^6.1",
29+
"symfony/form": "^6.2",
30+
"symfony/framework-bundle": "^6.2",
31+
"symfony/html-sanitizer": "^6.2",
32+
"symfony/http-client": "^6.2",
33+
"symfony/intl": "^6.2",
34+
"symfony/mailer": "^6.2",
3635
"symfony/monolog-bundle": "^3.7",
3736
"symfony/polyfill-intl-messageformatter": "^1.12",
38-
"symfony/runtime": "^6.1",
39-
"symfony/security-bundle": "^6.1",
40-
"symfony/string": "^6.1",
41-
"symfony/translation": "^6.1",
42-
"symfony/twig-bundle": "^6.1",
43-
"symfony/validator": "^6.1",
37+
"symfony/runtime": "^6.2",
38+
"symfony/security-bundle": "^6.2",
39+
"symfony/string": "^6.2",
40+
"symfony/translation": "^6.2",
41+
"symfony/twig-bundle": "^6.2",
42+
"symfony/validator": "^6.2",
4443
"symfony/webpack-encore-bundle": "^1.13",
45-
"symfony/yaml": "^6.1",
44+
"symfony/yaml": "^6.2",
4645
"twig/extra-bundle": "^3.3",
4746
"twig/intl-extra": "^3.3",
4847
"twig/markdown-extra": "^3.3"
@@ -51,27 +50,26 @@
5150
"dama/doctrine-test-bundle": "^7.0",
5251
"doctrine/doctrine-fixtures-bundle": "^3.4",
5352
"phpstan/phpstan": "^1.2",
54-
"symfony/browser-kit": "^6.1",
55-
"symfony/css-selector": "^6.1",
56-
"symfony/debug-bundle": "^6.1",
53+
"symfony/browser-kit": "^6.2",
54+
"symfony/css-selector": "^6.2",
55+
"symfony/debug-bundle": "^6.2",
5756
"symfony/maker-bundle": "^1.36",
58-
"symfony/phpunit-bridge": "^6.1",
59-
"symfony/stopwatch": "^6.1",
60-
"symfony/web-profiler-bundle": "^6.1"
57+
"symfony/phpunit-bridge": "^6.2",
58+
"symfony/stopwatch": "^6.2",
59+
"symfony/web-profiler-bundle": "^6.2"
6160
},
6261
"config": {
62+
"allow-plugins": {
63+
"symfony/flex": true,
64+
"symfony/runtime": true
65+
},
6366
"platform": {
6467
"php": "8.1.0"
6568
},
6669
"preferred-install": {
6770
"*": "dist"
6871
},
69-
"sort-packages": true,
70-
"allow-plugins": {
71-
"composer/package-versions-deprecated": true,
72-
"symfony/flex": true,
73-
"symfony/runtime": true
74-
}
72+
"sort-packages": true
7573
},
7674
"autoload": {
7775
"psr-4": {
@@ -98,7 +96,7 @@
9896
"extra": {
9997
"symfony": {
10098
"allow-contrib": true,
101-
"require": "6.1.*"
99+
"require": "6.2.*"
102100
}
103101
}
104102
}

0 commit comments

Comments
 (0)