Skip to content

Commit

Permalink
Add support for Symfony 6 (#4)
Browse files Browse the repository at this point in the history
Update composer dependencies to add support for Symfony 6
  • Loading branch information
kielabokkie authored May 9, 2023
1 parent 4f4ca91 commit 240db20
Show file tree
Hide file tree
Showing 14 changed files with 949 additions and 1,036 deletions.
18 changes: 14 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,45 @@
name: CI

on:
pull_request: ~
workflow_dispatch: ~
push:
branches: [ main ]

jobs:
psalm:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: ./.github/actions/setup-php
- name: Build
run: make psalm-github

phpstan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: ./.github/actions/setup-php
- name: Build
run: make phpstan-github

cs-fixer:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: ./.github/actions/setup-php
- name: Build
run: make fix-github

phpunit:
runs-on: ubuntu-latest
strategy:
matrix:
php-version: [ '8.0', '8.1', '8.2' ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: ./.github/actions/setup-php
with:
php-version: ${{ matrix.php-version }}
- name: Build
run: make phpunit-github
1 change: 1 addition & 0 deletions .idea/abnlookup.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,10 @@ phpunit:
.PHONY: phpunit-github
phpunit-github:
php vendor/bin/phpunit --printer mheap\\GithubActionsReporter\\Printer

.PHONY: all
all:
make fix
make psalm
make phpstan
make phpunit
36 changes: 21 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@
"require": {
"php": ">=8.0",
"ext-json": "*",
"symfony/validator": "^5.0",
"symfony/http-client": "^5.0",
"doctrine/annotations": "^1.0",
"phpdocumentor/reflection-docblock": "^5.3",
"phpstan/phpdoc-parser": "^1.2",
"symfony/property-access": "^5.0",
"symfony/property-info": "^5.0",
"symfony/serializer": "^5.0",
"symfony/cache": "^5.0"
"symfony/cache": "^5.0 | ^6.0",
"symfony/http-client": "^5.0 | ^6.0",
"symfony/property-access": "^5.0 | ^6.0",
"symfony/property-info": "^5.0 | ^6.0",
"symfony/serializer": "^5.0 | ^6.0",
"symfony/validator": "^5.0 | ^6.0"
},
"require-dev": {
"ext-zip": "*",
"phpunit/phpunit": "^9.5",
"fakerphp/faker": "1.14.1",
"friendsofphp/php-cs-fixer": "^3.3",
"vimeo/psalm": "^4.14",
"phpstan/phpstan": "^1.2",
"mheap/phpunit-github-actions-printer": "^1.5",
"pepakriz/phpstan-exception-rules": "^0.12.0",
"phpmd/phpmd": "^2.11",
"fakerphp/faker": "1.14.1",
"symfony/flex": "^2.0",
"phpstan/phpstan-strict-rules": "^1.1",
"phpstan/phpstan": "^1.2",
"phpstan/phpstan-phpunit": "^1.0",
"pepakriz/phpstan-exception-rules": "^0.12.0",
"phpstan/phpstan-strict-rules": "^1.1",
"phpunit/phpunit": "^9.5",
"staabm/annotate-pull-request-from-checkstyle": "^1.7",
"mheap/phpunit-github-actions-printer": "^1.5"
"symfony/flex": "^2.0",
"vimeo/psalm": "^4.14"
},
"license": "MIT",
"autoload": {
Expand All @@ -45,7 +45,13 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "^5.0"
"require": "^5.0 | ^6.0"
}
},
"config": {
"allow-plugins": {
"symfony/flex": true
},
"sort-packages": true
}
}
Loading

0 comments on commit 240db20

Please sign in to comment.