Skip to content

Commit ce90869

Browse files
OskarStarkOskarStark
committed
Merge branch 'develop'
* develop: (53 commits) Enhancement: Update dependencies in `composer.json` (#2003) composer(deps): bump symfony/console from 7.2.5 to 7.2.6 (#2002) composer(deps-dev): bump phpunit/phpunit from 12.1.3 to 12.1.4 (#2001) composer(deps-dev): bump phpstan/phpstan from 2.1.13 to 2.1.14 (#2000) composer(deps-dev): bump rector/rector from 2.0.14 to 2.0.15 (#1999) composer(deps): bump symfony/yaml from 7.2.5 to 7.2.6 (#1998) composer(deps): bump symfony/string from 7.2.0 to 7.2.6 (#1997) composer(deps): bump symfony/config from 7.2.3 to 7.2.6 (#1996) composer(deps): bump symfony/dependency-injection from 7.2.5 to 7.2.6 (#1994) composer(deps-dev): bump symfony/var-dumper from 7.2.3 to 7.2.6 (#1995) Enhancement: Update dependencies in `composer.json` (#1993) composer(deps-dev): bump rector/rector from 2.0.12 to 2.0.14 (#1992) composer(deps-dev): bump phpstan/phpstan from 2.1.12 to 2.1.13 (#1991) composer(deps-dev): bump rector/rector from 2.0.11 to 2.0.12 (#1990) composer(deps-dev): bump phpunit/phpunit from 12.1.2 to 12.1.3 (#1989) github-actions(deps): bump stefanzweifel/git-auto-commit-action from 5.1.0 to 5.2.0 (#1988) Enhancement: Update dependencies in `composer.json` (#1987) Enhancement: Update dependencies in `composer.json` (#1986) composer(deps-dev): bump phpstan/phpstan from 2.1.11 to 2.1.12 (#1985) composer(deps-dev): bump ergebnis/composer-normalize from 2.46.0 to 2.47.0 (#1984) ...
2 parents da21cc4 + 6ebb1d9 commit ce90869

File tree

8 files changed

+281
-574
lines changed

8 files changed

+281
-574
lines changed

‎.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/checkout@v4
2424

2525
- name: "Install PHP with extensions"
26-
uses: "shivammathur/setup-php@2.32.0"
26+
uses: "shivammathur/setup-php@v2"
2727
with:
2828
coverage: "none"
2929
extensions: "${{ env.REQUIRED_PHP_EXTENSIONS }}"

‎.github/workflows/ci.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/checkout@v4
2626

2727
- name: "Install PHP with extensions"
28-
uses: "shivammathur/setup-php@2.32.0"
28+
uses: "shivammathur/setup-php@v2"
2929
with:
3030
coverage: "none"
3131
extensions: "${{ env.REQUIRED_PHP_EXTENSIONS }}"
@@ -53,7 +53,7 @@ jobs:
5353
uses: actions/checkout@v4
5454

5555
- name: Install PHP with extensions
56-
uses: shivammathur/setup-php@2.32.0
56+
uses: shivammathur/setup-php@v2
5757
with:
5858
coverage: "none"
5959
php-version: ${{ matrix.php-version }}
@@ -82,7 +82,7 @@ jobs:
8282
uses: actions/checkout@v4
8383

8484
- name: Install PHP with extensions
85-
uses: shivammathur/setup-php@2.32.0
85+
uses: shivammathur/setup-php@v2
8686
with:
8787
coverage: "none"
8888
php-version: ${{ matrix.php-version }}
@@ -111,7 +111,7 @@ jobs:
111111
uses: actions/checkout@v4
112112

113113
- name: "Install PHP with extensions"
114-
uses: "shivammathur/setup-php@2.32.0"
114+
uses: "shivammathur/setup-php@v2"
115115
with:
116116
coverage: "none"
117117
extensions: "${{ env.REQUIRED_PHP_EXTENSIONS }}"
@@ -159,7 +159,7 @@ jobs:
159159

160160
-
161161
name: "Install PHP with extensions"
162-
uses: "shivammathur/setup-php@2.32.0"
162+
uses: "shivammathur/setup-php@v2"
163163
with:
164164
coverage: "none"
165165
extensions: "${{ env.REQUIRED_PHP_EXTENSIONS }}"
@@ -193,7 +193,7 @@ jobs:
193193

194194
-
195195
name: "Install PHP with extensions"
196-
uses: "shivammathur/setup-php@2.32.0"
196+
uses: "shivammathur/setup-php@v2"
197197
with:
198198
coverage: "none"
199199
extensions: "${{ env.REQUIRED_PHP_EXTENSIONS }}"
@@ -211,3 +211,7 @@ jobs:
211211
-
212212
name: "Check for implicit dependencies"
213213
run: "vendor/bin/composer-require-checker check --config-file=$(pwd)/composer-require-checker.json composer.json"
214+
215+
-
216+
name: "Check for security vulnerabilities"
217+
run: "composer audit"

‎.github/workflows/documentation.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
-
3232
name: "Install PHP with extensions"
33-
uses: "shivammathur/setup-php@2.32.0"
33+
uses: "shivammathur/setup-php@v2"
3434
with:
3535
coverage: "none"
3636
extensions: "${{ env.REQUIRED_PHP_EXTENSIONS }}"
@@ -49,7 +49,7 @@ jobs:
4949

5050
-
5151
name: "Commit regenerated docs/rules.md file"
52-
uses: "stefanzweifel/git-auto-commit-action@v5.1.0"
52+
uses: "stefanzweifel/git-auto-commit-action@v5.2.0"
5353
with:
5454
branch: "${{ github.head_ref }}"
5555
commit_author: "${{ env.COMMITTER_NAME }} <${{ env.COMMITTER_EMAIL }}>"

‎Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ refactoring:
2727
.PHONY: dependency-analysis
2828
dependency-analysis: vendor ## Runs a dependency analysis with maglnet/composer-require-checker
2929
symfony php vendor/bin/composer-require-checker check --config-file=$(shell pwd)/composer-require-checker.json
30-
vendor/bin/composer-unused
30+
symfony php vendor/bin/composer-unused
31+
symfony composer audit
3132

3233
.PHONY: docs
3334
docs: vendor

‎composer.json

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,31 @@
99
"ext-mbstring": "*",
1010
"composer/semver": "^3.4.3",
1111
"ondram/ci-detector": "^4.2.0",
12-
"symfony/config": "^7.2.3",
13-
"symfony/console": "^7.2.1",
14-
"symfony/dependency-injection": "^7.2.4",
12+
"symfony/config": "^7.2.6",
13+
"symfony/console": "^7.2.6",
14+
"symfony/dependency-injection": "^7.2.6",
1515
"symfony/finder": "^7.2.2",
1616
"symfony/options-resolver": "^7.2.0",
1717
"symfony/service-contracts": "^3.5.1",
18-
"symfony/string": "^7.2.0",
19-
"symfony/yaml": "^7.2.3",
18+
"symfony/string": "^7.2.6",
19+
"symfony/yaml": "^7.2.6",
2020
"webmozart/assert": "^1.11"
2121
},
2222
"require-dev": {
23-
"ergebnis/composer-normalize": "^2.45.0",
23+
"ergebnis/composer-normalize": "^2.47.0",
2424
"ergebnis/data-provider": "^3.4",
25-
"ergebnis/php-cs-fixer-config": "^6.44.0",
26-
"friendsofphp/php-cs-fixer": "^3.70.1",
27-
"icanhazstring/composer-unused": "^0.9.0",
25+
"ergebnis/php-cs-fixer-config": "^6.46.0",
26+
"friendsofphp/php-cs-fixer": "^3.75.0",
27+
"icanhazstring/composer-unused": "^0.9.2",
2828
"maglnet/composer-require-checker": "^4.16.1",
2929
"mikey179/vfsstream": "^1.6.12",
3030
"phpstan/extension-installer": "^1.4.3",
31-
"phpstan/phpstan": "^2.1.6",
32-
"phpstan/phpstan-phpunit": "^2.0.4",
31+
"phpstan/phpstan": "^2.1.14",
32+
"phpstan/phpstan-phpunit": "^2.0.6",
3333
"phpstan/phpstan-webmozart-assert": "^2.0.0",
34-
"phpunit/phpunit": "^12.0.5",
35-
"rector/rector": "^2.0.9",
36-
"symfony/var-dumper": "^7.2.3"
34+
"phpunit/phpunit": "^12.1.4",
35+
"rector/rector": "^2.0.15",
36+
"symfony/var-dumper": "^7.2.6"
3737
},
3838
"replace": {
3939
"paragonie/random_compat": "^2.0",
@@ -51,12 +51,6 @@
5151
"symfony/polyfill-php83": "*",
5252
"symfony/polyfill-php84": "*"
5353
},
54-
"repositories": [
55-
{
56-
"type": "vcs",
57-
"url": "https://github.com/Drenso/composer-unused"
58-
}
59-
],
6054
"autoload": {
6155
"psr-4": {
6256
"App\\": "src/"

0 commit comments

Comments
 (0)