Skip to content

Commit 2c7e57d

Browse files
authored
Merge pull request #409 from origamiphp/feat/upgrade
2 parents f97b8f7 + 3f1aa17 commit 2c7e57d

33 files changed

+450
-1325
lines changed

.github/workflows/continuous-deployment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
4747
- name: 'Compiles the project into a PHAR archive'
4848
run: |
49-
composer global require humbug/box
49+
composer global require humbug/box:4.2.0
5050
make box
5151
5252
- name: 'Prepares the local Git repository which contains the PHAR archive'

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ jobs:
4242
- name: 'Executes the static analysis on all PHP files with PHPStan'
4343
run: make phpstan
4444

45-
- name: 'Executes the static analysis on all PHP files with Psalm'
46-
run: make psalm
47-
4845
- name: 'Executes the automated refactoring in dry-run mode on all PHP files'
4946
run: make rector-audit
5047

@@ -68,5 +65,5 @@ jobs:
6865

6966
- name: 'Compiles the project into a PHAR archive'
7067
run: |
71-
composer global require humbug/box
68+
composer global require humbug/box:4.2.0
7269
make box

.github/workflows/release-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
4747
- name: 'Compiles the project into a PHAR archive'
4848
run: |
49-
composer global require humbug/box
49+
composer global require humbug/box:4.2.0
5050
make box
5151
5252
- name: 'Prepares the local Git repository which contains the PHAR archive'

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ box: ## Compiles the project into a PHAR archive
1717
.PHONY: box
1818

1919
ci: ## Executes all the Continuous Integration tests
20-
make composer lint phpcsfixer-audit phpstan psalm phpunit rector-audit
20+
make composer lint phpcsfixer-audit phpstan phpunit rector-audit
2121
.PHONY: ci
2222

2323
composer: ## Executes the analysis on the Composer files
@@ -45,10 +45,6 @@ phpunit: ## Executes the unit and functional tests
4545
./bin/phpunit --testdox
4646
.PHONY: phpunit
4747

48-
psalm: ## Executes the static analysis on all PHP files with Psalm
49-
./vendor/bin/psalm --show-info=true --find-dead-code --stats --shepherd
50-
.PHONY: psalm
51-
5248
rector-audit: ## Executes the automated refactoring in dry-run mode on all PHP files
5349
./vendor/bin/rector process --dry-run
5450
.PHONY: rector-audit

composer.json

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"ext-xml": "*",
2020
"ext-zlib": "*",
2121
"composer/semver": "^3.3.2",
22-
"ergebnis/environment-variables": "^1.3",
22+
"ergebnis/environment-variables": "^1.4",
2323
"symfony/console": "6.2.*",
2424
"symfony/dotenv": "6.2.*",
2525
"symfony/filesystem": "6.2.*",
26-
"symfony/flex": "^2.2.3",
26+
"symfony/flex": "^2.2.5",
2727
"symfony/framework-bundle": "6.2.*",
2828
"symfony/http-client": "6.2.*",
2929
"symfony/process": "6.2.*",
@@ -34,20 +34,17 @@
3434
"symfony/yaml": "6.2.*"
3535
},
3636
"require-dev": {
37-
"codecov/codecov-php": "dev-master",
38-
"friendsofphp/php-cs-fixer": "^3.12",
39-
"phpspec/prophecy": "^1.15",
37+
"codecov/codecov-php": "dev-main",
38+
"friendsofphp/php-cs-fixer": "^3.14.4",
39+
"phpspec/prophecy": "^1.17",
4040
"phpspec/prophecy-phpunit": "^2.0.1",
41-
"phpstan/phpstan": "^1.8.10",
42-
"phpstan/phpstan-phpunit": "^1.1.1",
43-
"phpstan/phpstan-symfony": "^1.2.14",
44-
"psalm/plugin-phpunit": "^0.16.1",
45-
"psalm/plugin-symfony": "^3.1.9",
46-
"rector/rector": "^0.14.6",
47-
"symfony/maker-bundle": "^1.47",
41+
"phpstan/phpstan": "^1.10.5",
42+
"phpstan/phpstan-phpunit": "^1.3.10",
43+
"phpstan/phpstan-symfony": "^1.2.23",
44+
"rector/rector": "^0.15.21",
45+
"symfony/maker-bundle": "^1.48",
4846
"symfony/phpunit-bridge": "6.2.*",
49-
"symfony/var-dumper": "6.2.*",
50-
"vimeo/psalm": "^4.29"
47+
"symfony/var-dumper": "6.2.*"
5148
},
5249
"replace": {
5350
"paragonie/random_compat": "2.*",

0 commit comments

Comments
 (0)