Skip to content

Commit

Permalink
Merge pull request #409 from origamiphp/feat/upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
ajardin authored Mar 10, 2023
2 parents f97b8f7 + 3f1aa17 commit 2c7e57d
Show file tree
Hide file tree
Showing 33 changed files with 450 additions and 1,325 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/continuous-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: 'Compiles the project into a PHAR archive'
run: |
composer global require humbug/box
composer global require humbug/box:4.2.0
make box
- name: 'Prepares the local Git repository which contains the PHAR archive'
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ jobs:
- name: 'Executes the static analysis on all PHP files with PHPStan'
run: make phpstan

- name: 'Executes the static analysis on all PHP files with Psalm'
run: make psalm

- name: 'Executes the automated refactoring in dry-run mode on all PHP files'
run: make rector-audit

Expand All @@ -68,5 +65,5 @@ jobs:

- name: 'Compiles the project into a PHAR archive'
run: |
composer global require humbug/box
composer global require humbug/box:4.2.0
make box
2 changes: 1 addition & 1 deletion .github/workflows/release-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: 'Compiles the project into a PHAR archive'
run: |
composer global require humbug/box
composer global require humbug/box:4.2.0
make box
- name: 'Prepares the local Git repository which contains the PHAR archive'
Expand Down
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ box: ## Compiles the project into a PHAR archive
.PHONY: box

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

composer: ## Executes the analysis on the Composer files
Expand Down Expand Up @@ -45,10 +45,6 @@ phpunit: ## Executes the unit and functional tests
./bin/phpunit --testdox
.PHONY: phpunit

psalm: ## Executes the static analysis on all PHP files with Psalm
./vendor/bin/psalm --show-info=true --find-dead-code --stats --shepherd
.PHONY: psalm

rector-audit: ## Executes the automated refactoring in dry-run mode on all PHP files
./vendor/bin/rector process --dry-run
.PHONY: rector-audit
Expand Down
25 changes: 11 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"ext-xml": "*",
"ext-zlib": "*",
"composer/semver": "^3.3.2",
"ergebnis/environment-variables": "^1.3",
"ergebnis/environment-variables": "^1.4",
"symfony/console": "6.2.*",
"symfony/dotenv": "6.2.*",
"symfony/filesystem": "6.2.*",
"symfony/flex": "^2.2.3",
"symfony/flex": "^2.2.5",
"symfony/framework-bundle": "6.2.*",
"symfony/http-client": "6.2.*",
"symfony/process": "6.2.*",
Expand All @@ -34,20 +34,17 @@
"symfony/yaml": "6.2.*"
},
"require-dev": {
"codecov/codecov-php": "dev-master",
"friendsofphp/php-cs-fixer": "^3.12",
"phpspec/prophecy": "^1.15",
"codecov/codecov-php": "dev-main",
"friendsofphp/php-cs-fixer": "^3.14.4",
"phpspec/prophecy": "^1.17",
"phpspec/prophecy-phpunit": "^2.0.1",
"phpstan/phpstan": "^1.8.10",
"phpstan/phpstan-phpunit": "^1.1.1",
"phpstan/phpstan-symfony": "^1.2.14",
"psalm/plugin-phpunit": "^0.16.1",
"psalm/plugin-symfony": "^3.1.9",
"rector/rector": "^0.14.6",
"symfony/maker-bundle": "^1.47",
"phpstan/phpstan": "^1.10.5",
"phpstan/phpstan-phpunit": "^1.3.10",
"phpstan/phpstan-symfony": "^1.2.23",
"rector/rector": "^0.15.21",
"symfony/maker-bundle": "^1.48",
"symfony/phpunit-bridge": "6.2.*",
"symfony/var-dumper": "6.2.*",
"vimeo/psalm": "^4.29"
"symfony/var-dumper": "6.2.*"
},
"replace": {
"paragonie/random_compat": "2.*",
Expand Down
Loading

0 comments on commit 2c7e57d

Please sign in to comment.