Skip to content

Commit 8528789

Browse files
Marco van AngerenMarco van Angeren
Marco van Angeren
authored and
Marco van Angeren
committed
Fixed merge conflicts
2 parents 5b388c1 + 4596143 commit 8528789

File tree

236 files changed

+4533
-907
lines changed

Some content is hidden

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

236 files changed

+4533
-907
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
ai.symfony.com @javiereguiluz
12
demo @chr-hertel @OskarStark
23
examples @chr-hertel @OskarStark
34
fixtures @chr-hertel @OskarStark

‎.github/workflows/code-quality.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
php-version: [ '8.4' ]
24+
php-version: [ '8.5' ]
2525
steps:
2626
- name: Checkout
2727
uses: actions/checkout@v6

‎.github/workflows/deptrac.yaml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: deptrac
2+
3+
on:
4+
push:
5+
paths-ignore:
6+
- 'src/*/doc/**'
7+
- 'src/**/*.md'
8+
pull_request:
9+
paths-ignore:
10+
- 'src/*/doc/**'
11+
- 'src/**/*.md'
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
15+
cancel-in-progress: true
16+
17+
jobs:
18+
deptrac:
19+
name: deptrac
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: Checkout
23+
uses: actions/checkout@v5
24+
25+
- name: Configure environment
26+
run: |
27+
echo COLUMNS=120 >> $GITHUB_ENV
28+
echo COMPOSER_UP='composer update --prefer-lowest --no-progress --no-interaction --ansi --ignore-platform-req=ext-mongodb' >> $GITHUB_ENV
29+
30+
- name: Setup PHP
31+
uses: shivammathur/setup-php@v2
32+
with:
33+
php-version: '8.5'
34+
35+
- name: Get composer cache directory
36+
id: composer-cache
37+
run: |
38+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
39+
40+
- name: Cache packages dependencies
41+
uses: actions/cache@v4
42+
with:
43+
path: ${{ steps.composer-cache.outputs.dir }}
44+
key: ${{ runner.os }}-composer-packages-${{ hashFiles('src/**/composer.json') }}
45+
restore-keys: |
46+
${{ runner.os }}-composer-packages
47+
48+
- name: Install root dependencies
49+
uses: ramsey/composer-install@v3
50+
51+
- name: Build root packages
52+
run: php .github/build-packages.php
53+
54+
- name: Run deptrac/deptrac
55+
run: $COMPOSER_UP && vendor/bin/deptrac

‎.github/workflows/doctor-rst.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ jobs:
3434
key: doctor-rst-${{ steps.extract_base_branch.outputs.branch }}
3535

3636
- name: DOCtor-RST
37-
uses: docker://oskarstark/doctor-rst:1.70.2
37+
uses: docker://oskarstark/doctor-rst:1.72.0
3838
with:
3939
args: --short --error-format=github --cache-file=/github/workspace/.cache/doctor-rst.cache

‎.github/workflows/integration-tests.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
php-version: ['8.2', '8.3', '8.4', '8.5']
26+
php-version: ['8.2', '8.5']
2727
dependency-version: ['']
2828
symfony-version: ['']
2929
include:
@@ -104,6 +104,10 @@ jobs:
104104
composer-options: "--no-scripts"
105105
working-directory: demo
106106

107+
- name: Link local packages
108+
working-directory: demo
109+
run: ../link
110+
107111
- run: composer run-script auto-scripts --no-interaction
108112
working-directory: demo
109113

‎.github/workflows/run-examples.yaml‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
pull_request:
55
types: [labeled]
66

7+
#permissions:
8+
# pull-requests: write
9+
710
defaults:
811
run:
912
working-directory: examples
@@ -30,15 +33,18 @@ jobs:
3033
- name: Run OpenAI examples
3134
id: run-examples
3235
run: ./runner openai
36+
env:
37+
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
38+
39+
# - name: Remove label
40+
# if: always()
41+
# uses: actions/github-script@v7
42+
# with:
43+
# script: |
44+
# await github.rest.issues.removeLabel({
45+
# owner: context.repo.owner,
46+
# repo: context.repo.repo,
47+
# issue_number: context.issue.number,
48+
# name: 'Run examples'
49+
# });
3350

34-
- name: Remove label
35-
if: always()
36-
uses: actions/github-script@v7
37-
with:
38-
script: |
39-
await github.rest.issues.removeLabel({
40-
owner: context.repo.owner,
41-
repo: context.repo.repo,
42-
issue_number: context.issue.number,
43-
name: 'Run examples'
44-
});

‎.github/workflows/unit-tests.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
php-version: ['8.2', '8.3', '8.4', '8.5']
26+
php-version: ['8.2', '8.5']
2727
dependency-version: ['']
2828
symfony-version: ['']
2929
include:
@@ -34,7 +34,7 @@ jobs:
3434
- php-version: '8.2'
3535
symfony-version: '7.4.*'
3636
# Symfony 8.0
37-
- php-version: '8.4'
37+
- php-version: '8.5'
3838
symfony-version: '8.0.*'
3939

4040
env:
@@ -74,6 +74,10 @@ jobs:
7474
restore-keys: |
7575
${{ runner.os }}-composer-packages-${{ matrix.php-version }}-${{ matrix.dependency-version }}-${{ matrix.symfony-version }}
7676
77+
- name: Remove deptrac/deptrac for Symfony 8
78+
if: matrix.symfony-version == '8.0.*'
79+
run: composer remove deptrac/deptrac --dev --no-update
80+
7781
- name: Install root dependencies
7882
uses: ramsey/composer-install@v3
7983

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.deptrac.cache
12
.doctor-rst.cache
23
.php-cs-fixer.cache
34
.phpunit.cache

‎.php-cs-fixer.dist.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
return (new PhpCsFixer\Config())
3131
// @see https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/pull/7777
3232
->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
33+
->setUnsupportedPhpVersionAllowed(true)
3334
->setRules([
3435
'@Symfony' => true,
3536
'@Symfony:risky' => true,

‎ai.symfony.com/composer.json‎

Lines changed: 48 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,27 @@
11
{
2-
"type": "project",
2+
"description": "The ai.symfony.com website.",
33
"license": "proprietary",
4-
"minimum-stability": "stable",
5-
"prefer-stable": true,
4+
"type": "project",
65
"require": {
7-
"php": ">=8.2",
6+
"php": ">=8.4",
87
"ext-ctype": "*",
98
"ext-iconv": "*",
10-
"symfony/asset": "*",
11-
"symfony/asset-mapper": "*",
12-
"symfony/console": "*",
13-
"symfony/dotenv": "*",
9+
"symfony/asset": "^7.3",
10+
"symfony/asset-mapper": "^7.3",
11+
"symfony/console": "^7.3",
12+
"symfony/dotenv": "^7.3",
1413
"symfony/flex": "^2",
15-
"symfony/framework-bundle": "*",
16-
"symfony/runtime": "*",
14+
"symfony/framework-bundle": "^7.3",
15+
"symfony/runtime": "^7.3",
1716
"symfony/stimulus-bundle": "^2.31",
18-
"symfony/twig-bundle": "*",
17+
"symfony/twig-bundle": "^7.3",
1918
"symfony/ux-icons": "^2.31",
20-
"symfony/yaml": "*",
19+
"symfony/yaml": "^7.3",
2120
"twig/extra-bundle": "^3.0",
2221
"twig/twig": "^3.0"
2322
},
24-
"config": {
25-
"allow-plugins": {
26-
"php-http/discovery": true,
27-
"symfony/flex": true,
28-
"symfony/runtime": true
29-
},
30-
"sort-packages": true
31-
},
32-
"autoload": {
33-
"psr-4": {
34-
"App\\": "src/"
35-
}
36-
},
37-
"autoload-dev": {
38-
"psr-4": {
39-
"App\\Tests\\": "tests/"
40-
}
23+
"require-dev": {
24+
"symfony/maker-bundle": "^1.64"
4125
},
4226
"replace": {
4327
"symfony/polyfill-ctype": "*",
@@ -47,31 +31,50 @@
4731
"symfony/polyfill-php74": "*",
4832
"symfony/polyfill-php80": "*",
4933
"symfony/polyfill-php81": "*",
50-
"symfony/polyfill-php82": "*"
51-
},
52-
"scripts": {
53-
"auto-scripts": {
54-
"cache:clear": "symfony-cmd",
55-
"assets:install %PUBLIC_DIR%": "symfony-cmd",
56-
"importmap:install": "symfony-cmd"
57-
},
58-
"post-install-cmd": [
59-
"@auto-scripts"
60-
],
61-
"post-update-cmd": [
62-
"@auto-scripts"
63-
]
34+
"symfony/polyfill-php82": "*",
35+
"symfony/polyfill-php83": "*",
36+
"symfony/polyfill-php84": "*"
6437
},
6538
"conflict": {
6639
"symfony/symfony": "*"
6740
},
41+
"minimum-stability": "stable",
42+
"prefer-stable": true,
43+
"autoload": {
44+
"psr-4": {
45+
"App\\": "src/"
46+
}
47+
},
48+
"autoload-dev": {
49+
"psr-4": {
50+
"App\\Tests\\": "tests/"
51+
}
52+
},
53+
"config": {
54+
"allow-plugins": {
55+
"php-http/discovery": true,
56+
"symfony/flex": true,
57+
"symfony/runtime": true
58+
},
59+
"sort-packages": true
60+
},
6861
"extra": {
6962
"symfony": {
7063
"allow-contrib": false,
7164
"require": "7.3.*"
7265
}
7366
},
74-
"require-dev": {
75-
"symfony/maker-bundle": "^1.64"
67+
"scripts": {
68+
"post-install-cmd": [
69+
"@auto-scripts"
70+
],
71+
"post-update-cmd": [
72+
"@auto-scripts"
73+
],
74+
"auto-scripts": {
75+
"cache:clear": "symfony-cmd",
76+
"assets:install %PUBLIC_DIR%": "symfony-cmd",
77+
"importmap:install": "symfony-cmd"
78+
}
7679
}
7780
}

0 commit comments

Comments
 (0)