Skip to content

Commit 1b722a0

Browse files
GemorrojGemorroj
committed
build: min php version is 8.2
1 parent 03ab907 commit 1b722a0

File tree

7 files changed

+33
-73
lines changed

7 files changed

+33
-73
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,6 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
include:
13-
- operating-system: 'ubuntu-latest'
14-
php-version: '8.0'
15-
job-description: 'Ubuntu; PHP 8.0; latest-deps'
16-
17-
- operating-system: 'ubuntu-latest'
18-
php-version: '8.0'
19-
composer-flags: '--prefer-lowest'
20-
job-description: 'Ubuntu; PHP 8.0; lowest-deps'
21-
22-
- operating-system: 'ubuntu-latest'
23-
php-version: '8.1'
24-
job-description: 'Ubuntu; PHP 8.1; latest-deps'
25-
26-
- operating-system: 'ubuntu-latest'
27-
php-version: '8.1'
28-
composer-flags: '--prefer-lowest'
29-
job-description: 'Ubuntu; PHP 8.1; lowest-deps'
30-
3113
- operating-system: 'ubuntu-latest'
3214
php-version: '8.2'
3315
job-description: 'Ubuntu; PHP 8.2; latest-deps'

‎.php-cs-fixer.dist.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
->setRules([
99
'@Symfony' => true,
1010
'@Symfony:risky' => true,
11-
'@PHP80Migration:risky' => true,
12-
'@PHP80Migration' => true,
11+
'@PHP82Migration:risky' => true,
12+
'@PHP82Migration' => true,
13+
'@PHPUnit100Migration:risky' => true,
1314

1415
'combine_consecutive_issets' => true,
1516
'combine_consecutive_unsets' => true,

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313

1414
### Requirements:
15-
- PHP >= 8.0.2
15+
- PHP >= 8.2
1616
- ext-zip
1717
- ext-dom
1818
- ext-xmlreader

‎composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
}
1111
],
1212
"require": {
13-
"php": ">=8.0.2",
13+
"php": ">=8.2",
1414
"ext-zip": "*",
1515
"ext-dom": "*",
1616
"ext-xmlreader": "*",
1717
"ext-libxml": "*"
1818
},
1919
"require-dev": {
20-
"phpunit/phpunit": "^9.6",
21-
"friendsofphp/php-cs-fixer": "^3.68",
22-
"phpstan/phpstan": "^2"
20+
"phpunit/phpunit": "^11.5.15",
21+
"friendsofphp/php-cs-fixer": "^3.73.1",
22+
"phpstan/phpstan": "^2.1"
2323
},
2424
"autoload": {
2525
"psr-4": {

‎tests/Driver/Epub3DriverTest.php‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,20 @@
88
use EbookReader\Driver\Epub3Driver;
99
use EbookReader\Exception\ParserException;
1010
use EbookReader\Resource\Style;
11+
use PHPUnit\Framework\Attributes\DataProvider;
1112
use PHPUnit\Framework\TestCase;
1213

1314
class Epub3DriverTest extends TestCase
1415
{
15-
/**
16-
* @dataProvider filesMetaProvider
17-
*/
16+
#[DataProvider('filesMetaProvider')]
1817
public function testIsValid(string $file): void
1918
{
2019
$driver = new Epub3Driver($file);
2120
$result = $driver->isValid();
2221
self::assertTrue($result);
2322
}
2423

25-
/**
26-
* @dataProvider filesProviderFake
27-
*/
24+
#[DataProvider('filesProviderFake')]
2825
public function testIsValidFake(string $file): void
2926
{
3027
$driver = new Epub3Driver($file);
@@ -34,9 +31,8 @@ public function testIsValidFake(string $file): void
3431

3532
/**
3633
* @param Style[] $expectedStyles
37-
*
38-
* @dataProvider filesDataProvider
3934
*/
35+
#[DataProvider('filesDataProvider')]
4036
public function testGetData(
4137
string $file,
4238
int $expectedCount,
@@ -71,9 +67,7 @@ public function testGetData(
7167
}
7268
}
7369

74-
/**
75-
* @dataProvider filesMetaProvider
76-
*/
70+
#[DataProvider('filesMetaProvider')]
7771
public function testGetMeta(
7872
string $file,
7973
string $expectedTitle,
@@ -101,9 +95,7 @@ public function testGetMeta(
10195
self::assertSame($expectedPublishDay, $meta->getPublishDay());
10296
}
10397

104-
/**
105-
* @dataProvider filesProviderFake
106-
*/
98+
#[DataProvider('filesProviderFake')]
10799
public function testGetMetaFake(string $file): void
108100
{
109101
$driver = new Epub3Driver($file);
@@ -114,15 +106,15 @@ public function testGetMetaFake(string $file): void
114106
/**
115107
* @return string[][]
116108
*/
117-
public function filesProviderFake(): array
109+
public static function filesProviderFake(): array
118110
{
119111
return [
120112
[__DIR__.'/../fixtures/fake.xml'],
121113
[__DIR__.'/../fixtures/fake.zip'],
122114
];
123115
}
124116

125-
public function filesDataProvider(): array
117+
public static function filesDataProvider(): array
126118
{
127119
return [
128120
[__DIR__.'/../fixtures/epub/epub3-opf2.epub',
@@ -152,7 +144,7 @@ public function filesDataProvider(): array
152144
/**
153145
* @return string[][]
154146
*/
155-
public function filesMetaProvider(): array
147+
public static function filesMetaProvider(): array
156148
{
157149
return [
158150
[__DIR__.'/../fixtures/epub/epub3-opf2.epub',

‎tests/Driver/Fb2DriverTest.php‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,28 @@
99
use EbookReader\Driver\Fb2Driver;
1010
use EbookReader\Exception\ParserException;
1111
use EbookReader\Resource\Style;
12+
use PHPUnit\Framework\Attributes\DataProvider;
1213
use PHPUnit\Framework\TestCase;
1314

1415
class Fb2DriverTest extends TestCase
1516
{
16-
/**
17-
* @dataProvider filesProvider
18-
*/
17+
#[DataProvider('filesProvider')]
1918
public function testIsValid(string $file): void
2019
{
2120
$driver = new Fb2Driver($file);
2221
$result = $driver->isValid();
2322
self::assertTrue($result);
2423
}
2524

26-
/**
27-
* @dataProvider filesProviderFake
28-
*/
25+
#[DataProvider('filesProviderFake')]
2926
public function testIsValidFake(string $file): void
3027
{
3128
$driver = new Fb2Driver($file);
3229
$result = $driver->isValid();
3330
self::assertFalse($result);
3431
}
3532

36-
/**
37-
* @dataProvider filesProvider
38-
*/
33+
#[DataProvider('filesProvider')]
3934
public function testGetMeta(
4035
string $file,
4136
string $expectedTitle,
@@ -63,9 +58,7 @@ public function testGetMeta(
6358
self::assertSame($expectedPublishDay, $meta->getPublishDay());
6459
}
6560

66-
/**
67-
* @dataProvider filesProviderFake
68-
*/
61+
#[DataProvider('filesProviderFake')]
6962
public function testGetMetaFake(string $file): void
7063
{
7164
$driver = new Fb2Driver($file);
@@ -76,7 +69,7 @@ public function testGetMetaFake(string $file): void
7669
/**
7770
* @return string[][]
7871
*/
79-
public function filesProviderFake(): array
72+
public static function filesProviderFake(): array
8073
{
8174
return [
8275
[__DIR__.'/../fixtures/fake.xml'],
@@ -87,9 +80,8 @@ public function filesProviderFake(): array
8780
/**
8881
* @param Style[] $expectedStyles
8982
* @param Fb2DataEpigraph[] $expectedEpigraphs
90-
*
91-
* @dataProvider filesDataProvider
9283
*/
84+
#[DataProvider('filesDataProvider')]
9385
public function testGetData(
9486
string $file,
9587
int $expectedCount,
@@ -130,7 +122,7 @@ public function testGetData(
130122
}
131123
}
132124

133-
public function filesDataProvider(): array
125+
public static function filesDataProvider(): array
134126
{
135127
return [
136128
[__DIR__.'/../fixtures/fb2/fb2.fb2',
@@ -171,7 +163,7 @@ public function filesDataProvider(): array
171163
];
172164
}
173165

174-
public function filesProvider(): array
166+
public static function filesProvider(): array
175167
{
176168
return [
177169
[__DIR__.'/../fixtures/fb2/fb2.fb2',

‎tests/Driver/MobiDriverTest.php‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,28 @@
66

77
use EbookReader\Driver\MobiDriver;
88
use EbookReader\Exception\ParserException;
9+
use PHPUnit\Framework\Attributes\DataProvider;
910
use PHPUnit\Framework\TestCase;
1011

1112
class MobiDriverTest extends TestCase
1213
{
13-
/**
14-
* @dataProvider filesProvider
15-
*/
14+
#[DataProvider('filesProvider')]
1615
public function testIsValid(string $file): void
1716
{
1817
$driver = new MobiDriver($file);
1918
$result = $driver->isValid();
2019
self::assertTrue($result);
2120
}
2221

23-
/**
24-
* @dataProvider filesProviderFake
25-
*/
22+
#[DataProvider('filesProviderFake')]
2623
public function testIsValidFake(string $file): void
2724
{
2825
$driver = new MobiDriver($file);
2926
$result = $driver->isValid();
3027
self::assertFalse($result);
3128
}
3229

33-
/**
34-
* @dataProvider filesProvider
35-
*/
30+
#[DataProvider('filesProvider')]
3631
public function testRead(
3732
string $file,
3833
string $expectedTitle,
@@ -60,9 +55,7 @@ public function testRead(
6055
self::assertSame($expectedPublishDay, $meta->getPublishDay());
6156
}
6257

63-
/**
64-
* @dataProvider filesProviderFake
65-
*/
58+
#[DataProvider('filesProviderFake')]
6659
public function testReadFake(string $file): void
6760
{
6861
$driver = new MobiDriver($file);
@@ -73,15 +66,15 @@ public function testReadFake(string $file): void
7366
/**
7467
* @return string[][]
7568
*/
76-
public function filesProviderFake(): array
69+
public static function filesProviderFake(): array
7770
{
7871
return [
7972
[__DIR__.'/../fixtures/fake.xml'],
8073
[__DIR__.'/../fixtures/fake.zip'],
8174
];
8275
}
8376

84-
public function filesProvider(): array
77+
public static function filesProvider(): array
8578
{
8679
return [
8780
[__DIR__.'/../fixtures/mobi/mobi.mobi',

0 commit comments

Comments
 (0)