Skip to content

Commit 2dc03b4

Browse files
SonataCISonataCI
authored
Merge 4.x into 5.x
2 parents c1c23b8 + 4918731 commit 2dc03b4

30 files changed

Lines changed: 65 additions & 140 deletions

‎.gitattributes‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,3 @@ rector.php export-ignore
1313
phpstan.neon.dist export-ignore
1414
phpstan-baseline.neon export-ignore
1515
phpstan-console-application.php export-ignore
16-
psalm.xml export-ignore
17-
psalm-baseline.xml export-ignore

‎.github/workflows/lint.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Install PHP with extensions
3030
uses: shivammathur/setup-php@v2
3131
with:
32-
php-version: '8.4'
32+
php-version: '8.5'
3333
coverage: none
3434
tools: composer:v2
3535
extensions: mongodb
@@ -54,7 +54,7 @@ jobs:
5454
- name: Install PHP with extensions
5555
uses: shivammathur/setup-php@v2
5656
with:
57-
php-version: '8.4'
57+
php-version: '8.5'
5858
coverage: none
5959
tools: composer:v2, composer-normalize:2
6060
env:

‎.github/workflows/qa.yaml‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Install PHP with extensions
3030
uses: shivammathur/setup-php@v2
3131
with:
32-
php-version: '8.4'
32+
php-version: '8.5'
3333
coverage: none
3434
tools: composer:v2
3535
extensions: mongodb
@@ -42,31 +42,6 @@ jobs:
4242
- name: PHPStan
4343
run: vendor/bin/phpstan --no-progress --memory-limit=1G analyse --error-format=github
4444

45-
psalm:
46-
name: Psalm
47-
48-
runs-on: ubuntu-latest
49-
50-
steps:
51-
- name: Checkout code
52-
uses: actions/checkout@v4
53-
54-
- name: Install PHP with extensions
55-
uses: shivammathur/setup-php@v2
56-
with:
57-
php-version: '8.4'
58-
coverage: none
59-
tools: composer:v2
60-
extensions: mongodb
61-
62-
- name: Install Composer dependencies (highest)
63-
uses: ramsey/composer-install@v3
64-
with:
65-
dependency-versions: highest
66-
67-
- name: Psalm
68-
run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.4
69-
7045
rector:
7146
name: Rector
7247

@@ -79,7 +54,7 @@ jobs:
7954
- name: Install PHP with extensions
8055
uses: shivammathur/setup-php@v2
8156
with:
82-
php-version: '8.4'
57+
php-version: '8.5'
8358
coverage: none
8459
tools: composer:v2
8560
extensions: mongodb

‎.github/workflows/symfony-lint.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Install PHP with extensions
3030
uses: shivammathur/setup-php@v2
3131
with:
32-
php-version: '8.4'
32+
php-version: '8.5'
3333
coverage: none
3434
tools: composer:v2
3535

@@ -53,7 +53,7 @@ jobs:
5353
- name: Install PHP with extensions
5454
uses: shivammathur/setup-php@v2
5555
with:
56-
php-version: '8.4'
56+
php-version: '8.5'
5757
coverage: none
5858
tools: composer:v2
5959

@@ -77,7 +77,7 @@ jobs:
7777
- name: Install PHP with extensions
7878
uses: shivammathur/setup-php@v2
7979
with:
80-
php-version: '8.4'
80+
php-version: '8.5'
8181
coverage: none
8282
tools: composer:v2
8383

@@ -101,7 +101,7 @@ jobs:
101101
- name: Install PHP with extensions
102102
uses: shivammathur/setup-php@v2
103103
with:
104-
php-version: '8.4'
104+
php-version: '8.5'
105105
coverage: none
106106
tools: composer:v2
107107

‎.github/workflows/test.yaml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,36 +34,42 @@ jobs:
3434
- 27017:27017
3535

3636
strategy:
37+
fail-fast: false
3738
matrix:
3839
php-version:
39-
- '8.1'
4040
- '8.2'
4141
- '8.3'
4242
- '8.4'
43+
- '8.5'
4344
dependencies: [highest]
4445
allowed-to-fail: [false]
4546
symfony-require: ['']
4647
variant: [normal]
4748
include:
48-
- php-version: '8.1'
49+
- php-version: '8.2'
4950
dependencies: lowest
5051
allowed-to-fail: false
5152
variant: normal
52-
- php-version: '8.4'
53+
- php-version: '8.5'
5354
dependencies: highest
5455
allowed-to-fail: false
5556
symfony-require: 6.4.*
5657
variant: symfony/symfony:"6.4.*"
57-
- php-version: '8.4'
58+
- php-version: '8.5'
5859
dependencies: highest
5960
allowed-to-fail: false
60-
symfony-require: 7.1.*
61-
variant: symfony/symfony:"7.1.*"
62-
- php-version: '8.4'
61+
symfony-require: 7.3.*
62+
variant: symfony/symfony:"7.3.*"
63+
- php-version: '8.5'
6364
dependencies: highest
6465
allowed-to-fail: false
65-
symfony-require: 7.2.*
66-
variant: symfony/symfony:"7.2.*"
66+
symfony-require: 7.4.*
67+
variant: symfony/symfony:"7.4.*"
68+
- php-version: '8.5'
69+
dependencies: highest
70+
allowed-to-fail: false
71+
symfony-require: 8.0.*
72+
variant: symfony/symfony:"8.0.*"
6773

6874
steps:
6975
- name: Checkout

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ composer.lock
1010
phpunit.xml
1111
phpstan.neon
1212
/.phpunit.result.cache
13+
tests/App/config/reference.php
1314
/docs/_build/

‎Makefile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,6 @@ phpstan:
116116
vendor/bin/phpstan --memory-limit=1G analyse
117117
.PHONY: phpstan
118118

119-
psalm:
120-
vendor/bin/psalm --php-version=8.4
121-
.PHONY: psalm
122-
123119
rector:
124120
vendor/bin/rector
125121
.PHONY: rector

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Symfony SonataClassificationBundle
1010

1111
[![Latest Stable Version](https://poser.pugx.org/sonata-project/classification-bundle/v/stable)](https://packagist.org/packages/sonata-project/classification-bundle)
1212
[![Latest Unstable Version](https://poser.pugx.org/sonata-project/classification-bundle/v/unstable)](https://packagist.org/packages/sonata-project/classification-bundle)
13-
[![Psalm Type Coverage][shepherd_stable_badge]][shepherd_stable_link]
1413
[![License](https://poser.pugx.org/sonata-project/classification-bundle/license)](https://packagist.org/packages/sonata-project/classification-bundle)
1514

1615
[![Total Downloads](https://poser.pugx.org/sonata-project/classification-bundle/downloads)](https://packagist.org/packages/sonata-project/classification-bundle)

‎composer.json‎

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@
2121
],
2222
"homepage": "https://docs.sonata-project.org/projects/SonataClassificationBundle",
2323
"require": {
24-
"php": "^8.1",
24+
"php": "^8.2",
2525
"cocur/slugify": "^4.0",
2626
"doctrine/collections": "^1.6 || ^2.0",
2727
"doctrine/persistence": "^3.0.2 || ^4.0",
28-
"sonata-project/doctrine-extensions": "^1.13 || ^2.0",
29-
"sonata-project/form-extensions": "^1.4 || ^2.0",
30-
"symfony/config": "^6.4 || ^7.1",
31-
"symfony/console": "^6.4 || ^7.1",
32-
"symfony/dependency-injection": "^6.4 || ^7.1",
33-
"symfony/form": "^6.4 || ^7.1",
34-
"symfony/framework-bundle": "^6.4 || ^7.1",
35-
"symfony/http-foundation": "^6.4 || ^7.1",
36-
"symfony/http-kernel": "^6.4 || ^7.1",
37-
"symfony/options-resolver": "^6.4 || ^7.1",
38-
"symfony/routing": "^6.4 || ^7.1",
39-
"symfony/translation": "^6.4 || ^7.1",
40-
"symfony/validator": "^6.4 || ^7.1",
28+
"sonata-project/doctrine-extensions": "^2.0",
29+
"sonata-project/form-extensions": "^2.0",
30+
"symfony/config": "^6.4 || ^7.3",
31+
"symfony/console": "^6.4 || ^7.3",
32+
"symfony/dependency-injection": "^6.4 || ^7.3",
33+
"symfony/form": "^6.4 || ^7.3",
34+
"symfony/framework-bundle": "^6.4 || ^7.3",
35+
"symfony/http-foundation": "^6.4 || ^7.3",
36+
"symfony/http-kernel": "^6.4 || ^7.3",
37+
"symfony/options-resolver": "^6.4 || ^7.3",
38+
"symfony/routing": "^6.4 || ^7.3",
39+
"symfony/translation": "^6.4 || ^7.3",
40+
"symfony/validator": "^6.4 || ^7.3",
4141
"twig/twig": "^3.0"
4242
},
4343
"require-dev": {
@@ -50,34 +50,31 @@
5050
"knplabs/knp-menu-bundle": "^3.0",
5151
"masterminds/html5": "^2.7",
5252
"matthiasnoback/symfony-config-test": "^6.1",
53-
"matthiasnoback/symfony-dependency-injection-test": "^6.1",
53+
"matthiasnoback/symfony-dependency-injection-test": "^6.2",
5454
"phpstan/extension-installer": "^1.0",
5555
"phpstan/phpdoc-parser": "^1.0",
5656
"phpstan/phpstan": "^1.0 || ^2.0",
5757
"phpstan/phpstan-phpunit": "^1.0 || ^2.0",
5858
"phpstan/phpstan-strict-rules": "^1.0 || ^2.0",
5959
"phpstan/phpstan-symfony": "^1.0 || ^2.0",
60-
"phpunit/phpunit": "^10.5.54 || ^11.5.38 || ^12.3.10",
61-
"psalm/plugin-phpunit": "^0.18 || ^0.19",
62-
"psalm/plugin-symfony": "^5.0",
60+
"phpunit/phpunit": "^11.5.38 || ^12.3.10",
6361
"rector/rector": "^1.1 || ^2.0",
64-
"sonata-project/admin-bundle": "^4.35.4",
65-
"sonata-project/block-bundle": "^4.11 || ^5.0",
62+
"sonata-project/admin-bundle": "^4.39",
63+
"sonata-project/block-bundle": "^5.0",
6664
"sonata-project/doctrine-orm-admin-bundle": "^4.0",
67-
"symfony/asset": "^6.4 || ^7.1",
68-
"symfony/browser-kit": "^6.4 || ^7.1",
69-
"symfony/filesystem": "^6.4 || ^7.1",
70-
"symfony/security-bundle": "^6.4 || ^7.1",
71-
"symfony/security-csrf": "^6.4 || ^7.1",
72-
"symfony/twig-bundle": "^6.4 || ^7.1",
73-
"symfony/yaml": "^6.4 || ^7.1",
74-
"vimeo/psalm": "^5.0 || ^6.10"
65+
"symfony/asset": "^6.4 || ^7.3",
66+
"symfony/browser-kit": "^6.4 || ^7.3",
67+
"symfony/filesystem": "^6.4 || ^7.3",
68+
"symfony/security-bundle": "^6.4 || ^7.3",
69+
"symfony/security-csrf": "^6.4 || ^7.3",
70+
"symfony/twig-bundle": "^6.4 || ^7.3",
71+
"symfony/yaml": "^6.4 || ^7.3"
7572
},
7673
"conflict": {
7774
"doctrine/mongodb-odm": "<2.4",
7875
"doctrine/orm": "<2.14",
7976
"sonata-project/admin-bundle": "<4.14",
80-
"sonata-project/block-bundle": "<4.11",
77+
"sonata-project/block-bundle": "<5.0",
8178
"sonata-project/doctrine-orm-admin-bundle": "<4.0"
8279
},
8380
"suggest": {

‎psalm.xml‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)