Skip to content

Commit be4feb4

Browse files
committed
Merge branch 'develop'
* develop: add support for immutable 5 fix psalm errors test against lowest dependencies test against php 8.3
2 parents cd82e0c + 426caf0 commit be4feb4

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed

.github/workflows/ci.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ jobs:
88
strategy:
99
matrix:
1010
os: [ubuntu-latest, macOS-latest]
11-
php-version: ['8.1', '8.2']
11+
php-version: ['8.1', '8.2', '8.3']
12+
dependencies: ['lowest', 'highest']
1213
name: 'PHPUnit'
1314
steps:
1415
- name: Checkout
@@ -22,6 +23,8 @@ jobs:
2223
ini-values: xdebug.max_nesting_level=2048
2324
- name: Composer
2425
uses: "ramsey/composer-install@v2"
26+
with:
27+
dependency-versions: ${{ matrix.dependencies }}
2528
- name: PHPUnit
2629
run: vendor/bin/phpunit --coverage-clover=coverage.clover
2730
- uses: codecov/codecov-action@v1
@@ -31,7 +34,8 @@ jobs:
3134
runs-on: ubuntu-latest
3235
strategy:
3336
matrix:
34-
php-version: ['8.1', '8.2']
37+
php-version: ['8.1', '8.2', '8.3']
38+
dependencies: ['lowest', 'highest']
3539
name: 'Psalm'
3640
steps:
3741
- name: Checkout
@@ -43,6 +47,8 @@ jobs:
4347
extensions: mbstring, intl
4448
- name: Composer
4549
uses: "ramsey/composer-install@v2"
50+
with:
51+
dependency-versions: ${{ matrix.dependencies }}
4652
- name: Psalm
4753
run: vendor/bin/psalm --shepherd
4854
cs:

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 3.1.0 - 2023-09-24
4+
5+
### Added
6+
7+
- Support for `innmind/immutable:~5.0`
8+
39
## 3.0.3 - 2023-05-01
410

511
### Fixed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"require": {
1818
"php": "~8.1",
19-
"innmind/immutable": "~4.13",
19+
"innmind/immutable": "~4.13|~5.0",
2020
"ramsey/uuid": "~4.7",
2121
"innmind/operating-system": "~3.7",
2222
"innmind/framework": "~1.1",

src/Profiler/Load.php

+2
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public function __invoke(Directory $raw): Maybe
6666
})
6767
->flatMap(function($start) use ($raw) {
6868
if (!\is_array($start)) {
69+
/** @var Maybe<Profile> */
6970
return Maybe::nothing();
7071
}
7172

@@ -110,6 +111,7 @@ private function exit(Profile $profile, Directory $raw): Profile
110111
})
111112
->flatMap(static function($exit) {
112113
if (!\is_array($exit)) {
114+
/** @var Maybe<array{string, Status}> */
113115
return Maybe::nothing();
114116
}
115117

0 commit comments

Comments
 (0)