Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  add support for immutable 5
  fix psalm errors
  test against lowest dependencies
  test against php 8.3
  • Loading branch information
Baptouuuu committed Sep 24, 2023
2 parents cd82e0c + 426caf0 commit be4feb4
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 3 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']
dependencies: ['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']
dependencies: ['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.1.0 - 2023-09-24

### Added

- Support for `innmind/immutable:~5.0`

## 3.0.3 - 2023-05-01

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion 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.13",
"innmind/immutable": "~4.13|~5.0",
"ramsey/uuid": "~4.7",
"innmind/operating-system": "~3.7",
"innmind/framework": "~1.1",
Expand Down
2 changes: 2 additions & 0 deletions src/Profiler/Load.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public function __invoke(Directory $raw): Maybe
})
->flatMap(function($start) use ($raw) {
if (!\is_array($start)) {
/** @var Maybe<Profile> */
return Maybe::nothing();
}

Expand Down Expand Up @@ -110,6 +111,7 @@ private function exit(Profile $profile, Directory $raw): Profile
})
->flatMap(static function($exit) {
if (!\is_array($exit)) {
/** @var Maybe<array{string, Status}> */
return Maybe::nothing();
}

Expand Down

0 comments on commit be4feb4

Please sign in to comment.