Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
* master:
  add support for immutable 5
  test against lowest dependencies
  use psalm 5
  test against php 8.3
  • Loading branch information
Baptouuuu committed Sep 23, 2023
2 parents e80d518 + 5691570 commit aa7e468
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest]
php-version: ['8.1', '8.2']
php-version: ['8.1', '8.2', '8.3']
dependency-versions: ['lowest', 'highest']
name: 'PHPUnit'
steps:
- name: Checkout
Expand All @@ -22,6 +23,8 @@ jobs:
ini-values: xdebug.max_nesting_level=2048
- name: Composer
uses: "ramsey/composer-install@v2"
with:
dependency-versions: ${{ matrix.dependencies }}
- name: PHPUnit
run: vendor/bin/phpunit --coverage-clover=coverage.clover
- uses: codecov/codecov-action@v1
Expand All @@ -31,7 +34,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-version: ['8.1', '8.2']
php-version: ['8.1', '8.2', '8.3']
dependency-versions: ['lowest', 'highest']
name: 'Psalm'
steps:
- name: Checkout
Expand All @@ -43,6 +47,8 @@ jobs:
extensions: mbstring, intl
- name: Composer
uses: "ramsey/composer-install@v2"
with:
dependency-versions: ${{ matrix.dependencies }}
- name: Psalm
run: vendor/bin/psalm --shepherd
cs:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 3.2.0 - 2023-09-23

### Added

- Support for `innmind/immutable:~5.0`

## 3.1.0 - 2023-01-29

### Added
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"require": {
"php": "~8.1",
"innmind/immutable": "~4.9",
"innmind/immutable": "~4.9|~5.0",
"innmind/http": "~5.3|~6.0"
},
"autoload": {
Expand All @@ -32,7 +32,7 @@
},
"require-dev": {
"phpunit/phpunit": "~9.0",
"vimeo/psalm": "~4.4",
"vimeo/psalm": "~5.12",
"innmind/coding-standard": "~2.0"
}
}
2 changes: 2 additions & 0 deletions psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<psalm
errorLevel="1"
resolveFromConfigFile="true"
findUnusedCode="false"
findUnusedBaselineEntry="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
Expand Down

0 comments on commit aa7e468

Please sign in to comment.