Skip to content
This repository has been archived by the owner on Feb 26, 2023. It is now read-only.

Add support for symfony 5 #25

Merged
merged 3 commits into from
Dec 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@ branches:
contexts:
- "Coding Standards (7.4)"
- "Static Code Analysis (7.4)"
- "Tests (7.3, lowest)"
- "Tests (7.3, highest)"
- "Tests (7.4, lowest)"
- "Tests (7.4, highest)"
- "Tests (7.3, lowest, ~4.2)"
- "Tests (7.3, lowest, ~5.0)"
- "Tests (7.3, highest, ~4.2)"
- "Tests (7.3, highest, ~5.0)"
- "Tests (7.4, lowest, ~4.2)"
- "Tests (7.4, lowest, ~5.0)"
- "Tests (7.4, highest, ~4.2)"
- "Tests (7.4, highest, ~5.0)"
- "Code Coverage (7.4)"
- "Mutation Tests (7.4)"
- "Mutation Tests (7.4)"
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ jobs:
- lowest
- highest

symfony:
- ~4.2
- ~5.0

steps:
- name: "Checkout"
uses: actions/checkout@v1
Expand All @@ -132,6 +136,9 @@ jobs:
restore-keys: |
php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-

- name: "Lock symfony version"
run: composer require "symfony/symfony:${{ matrix.symfony }}" --no-update

- name: "Install lowest dependencies with composer"
if: matrix.dependencies == 'lowest'
run: composer update --no-interaction --no-progress --no-suggest --prefer-lowest
Expand Down
23 changes: 11 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,27 @@
"require": {
"php": "^7.3",
"ext-json": "*",
"doctrine/doctrine-cache-bundle": "^1.3.5",
"psr/cache": "^1.0",
"psr/http-client": "^1.0",
"psr/http-message": "^1.0",
"sonata-project/block-bundle": "^4.0",
"sonata-project/form-extensions": "^1.0",
"symfony/config": "^4.2",
"symfony/dependency-injection": "^4.2",
"symfony/expression-language": "^4.2",
"symfony/form": "^4.2",
"symfony/framework-bundle": "^4.2",
"symfony/http-foundation": "^4.2",
"symfony/http-kernel": "^4.2",
"symfony/options-resolver": "^4.2",
"symfony/twig-bundle": "^4.2"
"symfony/config": "^4.2 || ^5.0",
"symfony/dependency-injection": "^4.2 || ^5.0",
"symfony/expression-language": "^4.2 || ^5.0",
"symfony/form": "^4.2 || ^5.0",
"symfony/framework-bundle": "^4.2 || ^5.0",
"symfony/http-foundation": "^4.2 || ^5.0",
"symfony/http-kernel": "^4.2 || ^5.0",
"symfony/options-resolver": "^4.2 || ^5.0",
"symfony/twig-bundle": "^4.2 || ^5.0"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.3",
"localheinz/composer-normalize": "^1.3",
"nyholm/psr7": "^1.0",
"symfony/cache": "^3.4 || ^4.2",
"symfony/http-client": "^3.4 || ^4.2"
"symfony/cache": "^4.2 || ^5.0",
"symfony/http-client": "^4.2 || ^5.0"
},
"config": {
"sort-packages": true
Expand Down
5 changes: 0 additions & 5 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ parameters:
count: 1
path: src/Backend/PsrBackend.php

-
message: "#^Call to an undefined method Twig\\\\Environment::expects\\(\\)\\.$#"
count: 1
path: tests/Block/Service/ShariffShareBlockServiceTest.php

-
message: "#^PHPDoc tag @throws with type Psr\\\\Cache\\\\InvalidArgumentException is not subtype of Throwable$#"
count: 1
Expand Down