Skip to content

Commit eded191

Browse files
committed
Merge branch 'develop'
* develop: drop php 8.1 support require http and filesystem 7
2 parents 1ec800d + 1563970 commit eded191

6 files changed

Lines changed: 27 additions & 11 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 3 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', '8.3']
11+
php-version: ['8.2', '8.3']
1212
dependency-versions: ['lowest', 'highest']
1313
name: 'PHPUnit'
1414
steps:
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ubuntu-latest
3434
strategy:
3535
matrix:
36-
php-version: ['8.1', '8.2', '8.3']
36+
php-version: ['8.2', '8.3']
3737
dependency-versions: ['lowest', 'highest']
3838
name: 'Psalm'
3939
steps:
@@ -54,7 +54,7 @@ jobs:
5454
runs-on: ubuntu-latest
5555
strategy:
5656
matrix:
57-
php-version: ['8.1']
57+
php-version: ['8.2']
5858
name: 'CS'
5959
steps:
6060
- name: Checkout

CHANGELOG.md

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

3+
## 5.3.0 - 2023-10-22
4+
5+
### Changed
6+
7+
- Requires `innmind/filesystem:~7.0`
8+
- Requires `innmind/http:~7.0`
9+
10+
### Removed
11+
12+
- Support for PHP `8.1`
13+
314
## 5.2.0 - 2023-09-23
415

516
### Added

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
"issues": "http://github.com/Innmind/LogReader/issues"
1515
},
1616
"require": {
17-
"php": "~8.1",
17+
"php": "~8.2",
1818
"innmind/immutable": "~4.9|~5.0",
1919
"innmind/time-continuum": "~3.1",
2020
"psr/log": "^3.0",
2121
"innmind/url": "~4.1",
22-
"innmind/http": "~5.3|~6.0",
23-
"innmind/filesystem": "~6.1",
22+
"innmind/http": "~7.0",
23+
"innmind/filesystem": "~7.0",
2424
"innmind/json": "^1.1"
2525
},
2626
"autoload": {

src/LineParser/ApacheAccess.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
};
1919
use Innmind\Http\{
2020
ProtocolVersion,
21-
Message\Method,
22-
Message\StatusCode,
21+
Method,
22+
Response\StatusCode,
2323
};
2424
use Innmind\Immutable\{
2525
Str,

tests/LineParser/ApacheAccessTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
Format\ISO8601,
1515
};
1616
use Innmind\Http\{
17-
Message\Method,
18-
Message\StatusCode,
17+
Method,
18+
Response\StatusCode,
1919
ProtocolVersion,
2020
};
2121
use Innmind\Url\{

tests/ReaderTest.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
};
1111
use Innmind\TimeContinuum\Earth\Clock;
1212
use Innmind\Filesystem\File\Content;
13+
use Innmind\IO\IO;
1314
use Innmind\Stream\Readable\Stream;
1415
use Innmind\Immutable\Sequence;
1516
use PHPUnit\Framework\TestCase;
@@ -19,7 +20,11 @@ class ReaderTest extends TestCase
1920
public function testParse()
2021
{
2122
$read = Reader::of(Monolog::of(new Clock));
22-
$file = Content\OfStream::of(Stream::of(\fopen('fixtures/symfony.log', 'r')));
23+
$file = Content::oneShot(
24+
IO::of(static fn() => null)->readable()->wrap(
25+
Stream::of(\fopen('fixtures/symfony.log', 'r')),
26+
),
27+
);
2328

2429
$stream = $read($file);
2530

0 commit comments

Comments
 (0)