Skip to content

Commit f1f4ca5

Browse files
GrahamCampbellGrahamCampbell
committed
Drop PHP 7.1 and support PHP 8.3
1 parent 1a7ea2a commit f1f4ca5

17 files changed

+109
-125
lines changed

‎.gitattributes

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
/.gitignore export-ignore
88
/.github export-ignore
99
/Makefile export-ignore
10-
/phpstan.src.neon.dist export-ignore
11-
/phpstan.tests.neon.dist export-ignore
10+
/phpstan-baseline.neon export-ignore
11+
/phpstan.neon.dist export-ignore
1212
/phpunit.xml.dist export-ignore
1313
/psalm-baseline.xml export-ignore
1414
/psalm.xml export-ignore

‎.github/workflows/static.yml

+11-39
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,22 @@ on:
55
pull_request:
66

77
jobs:
8-
phpstan_src:
9-
name: PHPStan Source
8+
phpstan:
9+
name: PHPStan
1010
runs-on: ubuntu-22.04
1111

1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: 8.2
19+
php-version: '8.3'
2020
tools: composer:v2
2121
coverage: none
22+
env:
23+
update: true
2224

2325
- name: Install Dependencies
2426
uses: nick-invision/retry@v2
@@ -35,54 +37,24 @@ jobs:
3537
command: composer bin phpstan update --no-interaction --no-progress
3638

3739
- name: Execute PHPStan
38-
run: vendor/bin/phpstan analyze src -c phpstan.src.neon.dist --no-progress
39-
40-
phpstan_tests:
41-
name: PHPStan Tests
42-
runs-on: ubuntu-22.04
43-
44-
steps:
45-
- name: Checkout code
46-
uses: actions/checkout@v3
47-
48-
- name: Setup PHP
49-
uses: shivammathur/setup-php@v2
50-
with:
51-
php-version: 8.2
52-
tools: composer:v2
53-
coverage: none
54-
55-
- name: Install Dependencies
56-
uses: nick-invision/retry@v2
57-
with:
58-
timeout_minutes: 5
59-
max_attempts: 5
60-
command: composer update --no-interaction --no-progress
61-
62-
- name: Install PHPStan
63-
uses: nick-invision/retry@v2
64-
with:
65-
timeout_minutes: 5
66-
max_attempts: 5
67-
command: composer bin phpstan update --no-interaction --no-progress
68-
69-
- name: Execute PHPStan
70-
run: vendor/bin/phpstan analyze tests -c phpstan.tests.neon.dist --no-progress
40+
run: vendor/bin/phpstan analyze --no-progress
7141

7242
psalm:
7343
name: Psalm
7444
runs-on: ubuntu-22.04
7545

7646
steps:
7747
- name: Checkout code
78-
uses: actions/checkout@v3
48+
uses: actions/checkout@v4
7949

8050
- name: Setup PHP
8151
uses: shivammathur/setup-php@v2
8252
with:
83-
php-version: 8.2
53+
php-version: '8.3'
8454
tools: composer:v2
8555
coverage: none
56+
env:
57+
update: true
8658

8759
- name: Install Dependencies
8860
uses: nick-invision/retry@v2

‎.github/workflows/tests.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
14+
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
1515

1616
steps:
1717
- name: Checkout Code
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919

2020
- name: Setup PHP
2121
uses: shivammathur/setup-php@v2
@@ -43,11 +43,11 @@ jobs:
4343

4444
strategy:
4545
matrix:
46-
php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
46+
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
4747

4848
steps:
4949
- name: Checkout Code
50-
uses: actions/checkout@v3
50+
uses: actions/checkout@v4
5151

5252
- name: Setup PHP
5353
uses: shivammathur/setup-php@v2

‎Makefile

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
install:
2-
@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:8.2-base update
3-
@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:8.2-base bin all update
2+
@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:8.3-base update
3+
@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:8.3-base bin all update
44

55
phpunit:
6-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit --rm registry.gitlab.com/grahamcampbell/php:8.2-cli
6+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit --rm registry.gitlab.com/grahamcampbell/php:8.3-cli
77

8-
phpstan-analyze-src:
9-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:8.2-cli analyze src -c phpstan.src.neon.dist
8+
phpstan-analyze:
9+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:8.3-cli analyze
1010

11-
phpstan-analyze-tests:
12-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:8.2-cli analyze tests -c phpstan.tests.neon.dist
11+
phpstan-baseline:
12+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:8.3-cli analyze --generate-baseline
1313

1414
psalm-analyze:
15-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.2-cli
15+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.3-cli
1616

1717
psalm-baseline:
18-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:7.4-cli --set-baseline=psalm-baseline.xml
18+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.3-cli --set-baseline=psalm-baseline.xml
1919

2020
psalm-show-info:
21-
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.2-cli --show-info=true
21+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.3-cli --show-info=true
2222

23-
test: phpunit phpstan-analyze-src phpstan-analyze-tests psalm-analyze
23+
test: phpunit phpstan-analyze psalm-analyze
2424

2525
clean:
2626
@rm -rf .phpunit.result.cache composer.lock vendor vendor-bin/*/composer.lock vendor-bin/*/vendor

‎UPGRADING.md

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

3+
## V5.5 to V5.6
4+
5+
Bumping the minimum required PHP version is not a breaking change, however it is notable. Since version 5.6.0, we now require PHP 7.2.5 or higher. Installation metrics show that for some time, PHP 7.1 has represented only around 0.1% of installs of V5.
6+
7+
Release notes for 5.6.0 are available [here](https://github.com/vlucas/phpdotenv/releases/tag/v5.6.0).
8+
39
## V4 to V5
410

511
### Introduction

‎composer.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.1.3 || ^8.0",
19+
"php": "^7.2.5 || ^8.0",
2020
"ext-pcre": "*",
21-
"graham-campbell/result-type": "^1.0.2",
22-
"phpoption/phpoption": "^1.8",
23-
"symfony/polyfill-ctype": "^1.23",
24-
"symfony/polyfill-mbstring": "^1.23.1",
25-
"symfony/polyfill-php80": "^1.23.1"
21+
"graham-campbell/result-type": "^1.1.2",
22+
"phpoption/phpoption": "^1.9.2",
23+
"symfony/polyfill-ctype": "^1.24",
24+
"symfony/polyfill-mbstring": "^1.24",
25+
"symfony/polyfill-php80": "^1.24"
2626
},
2727
"require-dev": {
2828
"ext-filter": "*",
29-
"bamarni/composer-bin-plugin": "^1.4.1",
30-
"phpunit/phpunit": "^7.5.20 || ^8.5.30 || ^9.5.25"
29+
"bamarni/composer-bin-plugin": "^1.8.2",
30+
"phpunit/phpunit":"^8.5.34 || ^9.6.13 || ^10.4.2"
3131
},
3232
"autoload": {
3333
"psr-4": {
@@ -54,7 +54,7 @@
5454
"forward-command": true
5555
},
5656
"branch-alias": {
57-
"dev-master": "5.5-dev"
57+
"dev-master": "5.6-dev"
5858
}
5959
}
6060
}

‎phpstan-baseline.neon

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
parameters:
2+
ignoreErrors:
3+
-
4+
message: "#^Anonymous function should return GrahamCampbell\\\\ResultType\\\\Result\\<array\\{mixed, mixed\\}, string\\> but returns GrahamCampbell\\\\ResultType\\\\Result\\<array\\{Dotenv\\\\Parser\\\\Value, mixed\\}, string\\>\\.$#"
5+
count: 1
6+
path: src/Parser/EntryParser.php
7+
8+
-
9+
message: "#^Only booleans are allowed in a negated boolean, int\\|false given\\.$#"
10+
count: 1
11+
path: src/Parser/Lexer.php
12+
13+
-
14+
message: "#^Parameter \\#1 \\$readers of class Dotenv\\\\Repository\\\\RepositoryBuilder constructor expects array\\<Dotenv\\\\Repository\\\\Adapter\\\\ReaderInterface\\>, array\\<Dotenv\\\\Repository\\\\Adapter\\\\ReaderInterface\\|S\\> given\\.$#"
15+
count: 2
16+
path: src/Repository/RepositoryBuilder.php
17+
18+
-
19+
message: "#^Parameter \\#2 \\$writers of class Dotenv\\\\Repository\\\\RepositoryBuilder constructor expects array\\<Dotenv\\\\Repository\\\\Adapter\\\\WriterInterface\\>, array\\<Dotenv\\\\Repository\\\\Adapter\\\\WriterInterface\\|S\\> given\\.$#"
20+
count: 2
21+
path: src/Repository/RepositoryBuilder.php

‎phpstan.neon.dist

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
includes:
2+
- phpstan-baseline.neon
3+
4+
parameters:
5+
level: max
6+
paths:
7+
- src

‎phpstan.src.neon.dist

-7
This file was deleted.

‎phpstan.tests.neon.dist

-6
This file was deleted.

‎phpunit.xml.dist

+11-27
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit backupGlobals="false"
3-
backupStaticAttributes="false"
4-
beStrictAboutTestsThatDoNotTestAnything="true"
5-
beStrictAboutOutputDuringTests="true"
6-
bootstrap="vendor/autoload.php"
7-
colors="true"
8-
convertDeprecationsToExceptions="true"
9-
convertErrorsToExceptions="true"
10-
convertNoticesToExceptions="true"
11-
convertWarningsToExceptions="true"
12-
failOnRisky="true"
13-
failOnWarning="false"
14-
processIsolation="false"
15-
stopOnError="false"
16-
stopOnFailure="false"
17-
verbose="true"
18-
>
19-
<testsuites>
20-
<testsuite name="PHP Dotenv Test Suite">
21-
<directory suffix="Test.php">./tests</directory>
22-
</testsuite>
23-
</testsuites>
24-
<filter>
25-
<whitelist processUncoveredFilesFromWhitelist="true">
26-
<directory suffix=".php">./src</directory>
27-
</whitelist>
28-
</filter>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutOutputDuringTests="true" bootstrap="vendor/autoload.php" colors="true" failOnRisky="true" failOnWarning="true" processIsolation="false" stopOnError="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd">
3+
<testsuites>
4+
<testsuite name="PHP Dotenv Test Suite">
5+
<directory suffix="Test.php">./tests</directory>
6+
</testsuite>
7+
</testsuites>
8+
<source>
9+
<include>
10+
<directory suffix=".php">./src</directory>
11+
</include>
12+
</source>
2913
</phpunit>

‎psalm-baseline.xml

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.x-dev@">
2+
<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
3+
<file src="src/Repository/Adapter/EnvConstAdapter.php">
4+
<RedundantConditionGivenDocblockType>
5+
<code>\is_scalar($value)</code>
6+
</RedundantConditionGivenDocblockType>
7+
</file>
38
<file src="src/Repository/RepositoryBuilder.php">
4-
<InvalidStringClass occurrences="3">
9+
<InvalidStringClass>
510
<code>$adapter::create()</code>
611
<code>$reader::create()</code>
712
<code>$writer::create()</code>
813
</InvalidStringClass>
9-
<MissingClosureReturnType occurrences="3">
14+
<MissingClosureReturnType>
1015
<code>static function ($adapter) {</code>
1116
<code>static function ($reader) {</code>
1217
<code>static function ($writer) {</code>
1318
</MissingClosureReturnType>
1419
</file>
1520
<file src="src/Util/Regex.php">
16-
<UndefinedFunction occurrences="1">
17-
<code>\preg_last_error_msg()</code>
18-
</UndefinedFunction>
21+
<ArgumentTypeCoercion>
22+
<code>$pattern</code>
23+
<code>$pattern</code>
24+
<code>$pattern</code>
25+
<code>$pattern</code>
26+
</ArgumentTypeCoercion>
1927
</file>
2028
</files>

‎tests/Dotenv/Loader/LoaderTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function testLoaderWithGarbage()
5959
/**
6060
* @return array<int,\Dotenv\Repository\Adapter\AdapterInterface|string>[]
6161
*/
62-
public function providesAdapters()
62+
public static function providesAdapters()
6363
{
6464
return [
6565
[ArrayAdapter::create()->get()],

‎tests/Dotenv/Parser/LexerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ final class LexerTest extends TestCase
1212
/**
1313
* @return array{string,string[]}[]
1414
*/
15-
public function provideLexCases()
15+
public static function provideLexCases()
1616
{
1717
return [
1818
['', []],

‎tests/Dotenv/ValidatorTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public function testDotenvStringOfSpacesConsideredEmpty()
207207
*
208208
* @return string[][]
209209
*/
210-
public function validBooleanValuesDataProvider()
210+
public static function validBooleanValuesDataProvider()
211211
{
212212
return [
213213
['VALID_EXPLICIT_LOWERCASE_TRUE'],
@@ -263,7 +263,7 @@ public function testCanValidateBooleansIfPresent(string $boolean)
263263
*
264264
* @return string[][]
265265
*/
266-
public function invalidBooleanValuesDataProvider()
266+
public static function invalidBooleanValuesDataProvider()
267267
{
268268
return [
269269
['INVALID_SOMETHING'],
@@ -332,7 +332,7 @@ public function testIfPresentBooleanNonExist()
332332
*
333333
* @return string[][]
334334
*/
335-
public function validIntegerValuesDataProvider()
335+
public static function validIntegerValuesDataProvider()
336336
{
337337
return [
338338
['VALID_ZERO'],
@@ -370,7 +370,7 @@ public function testCanValidateIntegersIfPresent(string $integer)
370370
*
371371
* @return string[][]
372372
*/
373-
public function invalidIntegerValuesDataProvider()
373+
public static function invalidIntegerValuesDataProvider()
374374
{
375375
return [
376376
['INVALID_SOMETHING'],

0 commit comments

Comments
 (0)