Skip to content

Commit 077dccf

Browse files
committed
Merge branch 'develop'
* develop: add support for immutable 5 use rmamsey/composer-install test against php 8.3
2 parents 62ed9f1 + 7415b3c commit 077dccf

File tree

3 files changed

+21
-57
lines changed

3 files changed

+21
-57
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
os: [ubuntu-latest, macOS-latest]
11-
php-version: ['8.2']
11+
php-version: ['8.2', '8.3']
1212
dependencies: ['lowest', 'highest']
1313
name: 'Tests'
1414
steps:
@@ -20,21 +20,10 @@ jobs:
2020
php-version: ${{ matrix.php-version }}
2121
extensions: mbstring, intl
2222
coverage: xdebug
23-
- name: Get Composer Cache Directory
24-
id: composer-cache
25-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
26-
- name: Cache dependencies
27-
uses: actions/cache@v1
23+
- name: Composer
24+
uses: "ramsey/composer-install@v2"
2825
with:
29-
path: ${{ steps.composer-cache.outputs.dir }}
30-
key: ${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-${{ hashFiles('**/composer.json') }}
31-
restore-keys: ${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
32-
- name: Install Dependencies
33-
if: ${{ matrix.dependencies == 'lowest' }}
34-
run: composer update --prefer-lowest --no-progress
35-
- name: Install Dependencies
36-
if: ${{ matrix.dependencies == 'highest' }}
37-
run: composer install --no-progress
26+
dependency-versions: ${{ matrix.dependencies }}
3827
- name: PHPUnit
3928
run: vendor/bin/phpunit --coverage-clover=coverage.clover --exclude-group=fixtures
4029
- uses: codecov/codecov-action@v1
@@ -45,7 +34,7 @@ jobs:
4534
strategy:
4635
matrix:
4736
os: [ubuntu-latest, macOS-latest]
48-
php-version: ['8.2']
37+
php-version: ['8.2', '8.3']
4938
dependencies: ['lowest', 'highest']
5039
name: 'Fixtures'
5140
steps:
@@ -57,21 +46,10 @@ jobs:
5746
php-version: ${{ matrix.php-version }}
5847
extensions: mbstring, intl
5948
coverage: xdebug
60-
- name: Get Composer Cache Directory
61-
id: composer-cache
62-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
63-
- name: Cache dependencies
64-
uses: actions/cache@v1
49+
- name: Composer
50+
uses: "ramsey/composer-install@v2"
6551
with:
66-
path: ${{ steps.composer-cache.outputs.dir }}
67-
key: ${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-${{ hashFiles('**/composer.json') }}
68-
restore-keys: ${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
69-
- name: Install Dependencies
70-
if: ${{ matrix.dependencies == 'lowest' }}
71-
run: composer update --prefer-lowest --no-progress
72-
- name: Install Dependencies
73-
if: ${{ matrix.dependencies == 'highest' }}
74-
run: composer install --no-progress
52+
dependency-versions: ${{ matrix.dependencies }}
7553
- name: PHPUnit
7654
run: vendor/bin/phpunit --coverage-clover=coverage.clover --group=fixtures
7755
- uses: codecov/codecov-action@v1
@@ -81,7 +59,7 @@ jobs:
8159
runs-on: ubuntu-latest
8260
strategy:
8361
matrix:
84-
php-version: ['8.2']
62+
php-version: ['8.2', '8.3']
8563
dependencies: ['lowest', 'highest']
8664
name: 'Psalm'
8765
steps:
@@ -92,21 +70,10 @@ jobs:
9270
with:
9371
php-version: ${{ matrix.php-version }}
9472
extensions: mbstring, intl
95-
- name: Get Composer Cache Directory
96-
id: composer-cache
97-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
98-
- name: Cache dependencies
99-
uses: actions/cache@v1
73+
- name: Composer
74+
uses: "ramsey/composer-install@v2"
10075
with:
101-
path: ${{ steps.composer-cache.outputs.dir }}
102-
key: ${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-${{ hashFiles('**/composer.json') }}
103-
restore-keys: ${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
104-
- name: Install Dependencies
105-
if: ${{ matrix.dependencies == 'lowest' }}
106-
run: composer update --prefer-lowest --no-progress
107-
- name: Install Dependencies
108-
if: ${{ matrix.dependencies == 'highest' }}
109-
run: composer install --no-progress
76+
dependency-versions: ${{ matrix.dependencies }}
11077
- name: Psalm
11178
run: vendor/bin/psalm --shepherd
11279
cs:
@@ -123,16 +90,7 @@ jobs:
12390
with:
12491
php-version: ${{ matrix.php-version }}
12592
extensions: mbstring, intl
126-
- name: Get Composer Cache Directory
127-
id: composer-cache
128-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
129-
- name: Cache dependencies
130-
uses: actions/cache@v2
131-
with:
132-
path: ${{ steps.composer-cache.outputs.dir }}
133-
key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
134-
restore-keys: ${{ runner.os }}-${{ matrix.php-version }}-composer-
135-
- name: Install Dependencies
136-
run: composer install --no-progress
93+
- name: Composer
94+
uses: "ramsey/composer-install@v2"
13795
- name: CS
13896
run: vendor/bin/php-cs-fixer fix --diff --dry-run

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 4.3.0 - 2023-09-16
4+
5+
### Added
6+
7+
- Support for `innmind/immutable` `5`
8+
39
## 4.2.0 - 2023-07-08
410

511
### Changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"require": {
1818
"php": "~8.2",
19-
"innmind/immutable": "~4.15",
19+
"innmind/immutable": "~4.15|~5.0",
2020
"league/uri-parser": "~1.2",
2121
"league/uri-components": "~2.0"
2222
},

0 commit comments

Comments
 (0)