Skip to content

Commit ebbf053

Browse files
committed
Merge branch 'develop'
* develop: add support for immutable 5 use blackbox 5 test against php 8.3
2 parents 5205bd8 + cab8137 commit ebbf053

6 files changed

Lines changed: 90 additions & 93 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 4 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.1', '8.2']
11+
php-version: ['8.2', '8.3']
1212
dependencies: ['lowest', 'highest']
1313
name: 'PHPUnit'
1414
steps:
@@ -31,7 +31,7 @@ jobs:
3131
strategy:
3232
matrix:
3333
os: [ubuntu-latest, macOS-latest]
34-
php-version: ['8.1', '8.2']
34+
php-version: ['8.2', '8.3']
3535
dependencies: ['lowest', 'highest']
3636
name: 'Coverage'
3737
steps:
@@ -58,7 +58,7 @@ jobs:
5858
runs-on: ubuntu-latest
5959
strategy:
6060
matrix:
61-
php-version: ['8.1', '8.2']
61+
php-version: ['8.2', '8.3']
6262
dependencies: ['lowest', 'highest']
6363
name: 'Psalm'
6464
steps:
@@ -79,7 +79,7 @@ jobs:
7979
runs-on: ubuntu-latest
8080
strategy:
8181
matrix:
82-
php-version: ['8.1']
82+
php-version: ['8.2']
8383
name: 'CS'
8484
steps:
8585
- name: Checkout

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
composer.lock
22
vendor
33
.phpunit.result.cache
4+
.phpunit.cache

CHANGELOG.md

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

3+
## 1.4.0 - 2023-09-24
4+
5+
### Added
6+
7+
- Support for `innmind/immutable:~5.0`
8+
9+
### Removed
10+
11+
- Support for PHP `8.1`
12+
313
## 1.3.0 - 2023-05-01
414

515
### Added

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
"issues": "http://github.com/Innmind/framework/issues"
1616
},
1717
"require": {
18-
"php": "~8.1",
18+
"php": "~8.2",
1919
"innmind/operating-system": "^3.2",
2020
"innmind/cli": "^3.1",
21-
"innmind/immutable": "^4.9",
21+
"innmind/immutable": "^4.9|~5.0",
2222
"innmind/di": "^2.0",
2323
"ramsey/uuid": "^4.7",
2424
"innmind/url": "^4.1",
@@ -37,14 +37,14 @@
3737
}
3838
},
3939
"require-dev": {
40-
"phpunit/phpunit": "~9.0",
40+
"phpunit/phpunit": "~10.2",
4141
"vimeo/psalm": "~5.6",
42-
"innmind/black-box": "^4.17",
42+
"innmind/black-box": "~5.5",
4343
"innmind/coding-standard": "~2.0",
4444
"innmind/async-http-server": "~1.0"
4545
},
4646
"conflict": {
47-
"innmind/black-box": "<4.7|~5.0",
47+
"innmind/black-box": "<5.0|~6.0",
4848
"innmind/async-http-server": "<1.0|~2.0"
4949
},
5050
"suggest": {

phpunit.xml.dist

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" printerClass="Innmind\BlackBox\PHPUnit\ResultPrinterV9" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
3-
<coverage>
4-
<include>
5-
<directory>.</directory>
6-
</include>
7-
<exclude>
8-
<directory>./tests</directory>
9-
<directory>./vendor</directory>
10-
</exclude>
11-
</coverage>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" cacheDirectory=".phpunit.cache">
3+
<extensions>
4+
<bootstrap class="Innmind\BlackBox\PHPUnit\Extension">
5+
</bootstrap>
6+
</extensions>
7+
<coverage/>
128
<php>
13-
<ini name="memory_limit" value="-1" />
9+
<ini name="memory_limit" value="-1"/>
1410
</php>
1511
<testsuites>
1612
<testsuite name="Test suite">
1713
<directory>./tests</directory>
1814
</testsuite>
1915
</testsuites>
16+
<source>
17+
<include>
18+
<directory>.</directory>
19+
</include>
20+
<exclude>
21+
<directory>./tests</directory>
22+
<directory>./vendor</directory>
23+
</exclude>
24+
</source>
2025
</phpunit>

0 commit comments

Comments
 (0)