Skip to content

Commit d7f9b01

Browse files
Added support for PHP 8.4
1 parent 980aa98 commit d7f9b01

16 files changed

+178
-115
lines changed

.editorconfig

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,26 @@ root = true
55

66
[*]
77
charset = utf-8
8+
end_of_line = lf
89
indent_size = 4
910
indent_style = space
10-
end_of_line = lf
1111
insert_final_newline = true
1212
trim_trailing_whitespace = true
1313

1414
[*.js]
1515
indent_size = 2
1616

17-
[*.json]
18-
indent_size = 2
19-
20-
[*.json.dist]
21-
indent_size = 2
22-
23-
[*.json5]
24-
indent_size = 2
25-
26-
[*.json5.dist]
17+
[*.{json,json.dist}]
2718
indent_size = 2
2819

2920
[*.md]
3021
trim_trailing_whitespace = false
3122

32-
[*.neon]
33-
indent_size = 2
34-
35-
[*.neon.dist]
36-
indent_size = 2
37-
38-
[*.xml]
39-
indent_size = 2
40-
41-
[*.xml.dist]
23+
[*.{neon,neon.dist}]
4224
indent_size = 2
4325

44-
[*.yml]
26+
[*.{xml,xml.dist}]
4527
indent_size = 2
4628

47-
[*.yml.dist]
29+
[*.{yml,yml.dist}]
4830
indent_size = 2

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Path-based git attributes
22
# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
33

4-
# Ignore all test and documentation with "export-ignore".
4+
# Ignore tests and tooling with "export-ignore"
55
/.github/ export-ignore
66
/tests/ export-ignore
77
/.editorconfig export-ignore

.github/workflows/run-tests.yml

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,36 @@ on:
88
schedule:
99
- cron: "0 0 * * 0"
1010

11-
permissions:
12-
contents: read
13-
1411
jobs:
1512

16-
vlucas-phpdotenv-php83-82-81-80:
13+
vlucas-phpdotenv-php84-83-82-81-80:
1714

1815
name: "PHP${{ matrix.php }} vlucas/phpdotenv ${{ matrix.vlucas-phpdotenv }} ${{ matrix.os-title }} ${{ matrix.dependency-prefer-title }}"
1916
runs-on: "${{ matrix.os }}"
17+
permissions:
18+
contents: "read"
2019
strategy:
2120
fail-fast: true
2221
matrix:
2322
os: [ "ubuntu-latest", "macos-latest", "windows-latest" ]
24-
php: [ "8.3", "8.2", "8.1", "8.0" ]
23+
php: [ "8.4", "8.3", "8.2", "8.1", "8.0" ]
2524
vlucas-phpdotenv: [ "^5.0", "^4.1.5", "^3.6.4", "^2.0", "^1.1.0" ]
2625
dependency-prefer: [ "prefer-stable", "prefer-lowest" ]
2726
include:
27+
- php: "8.4"
28+
phpunit: "^11.1"
29+
phpunit-config-file: "phpunit.github-actions.xml.dist"
2830
- php: "8.3"
29-
phpunit: "^10.1.0"
31+
phpunit: "^10.1"
3032
phpunit-config-file: "phpunit.github-actions.xml.dist"
3133
- php: "8.2"
32-
phpunit: "^10.1.0"
34+
phpunit: "^10.1"
3335
phpunit-config-file: "phpunit.github-actions.xml.dist"
3436
- php: "8.2"
35-
phpunit: "^10.1.0"
37+
phpunit: "^10.1"
3638
phpunit-config-file: "phpunit.github-actions.xml.dist"
3739
- php: "8.1"
38-
phpunit: "^10.1.0"
40+
phpunit: "^10.1"
3941
phpunit-config-file: "phpunit.github-actions.xml.dist"
4042
- php: "8.0"
4143
phpunit: "^9.3"
@@ -196,29 +198,32 @@ jobs:
196198

197199

198200

199-
symfony-dotenv-php83-82-81-80:
201+
symfony-dotenv-php84-83-82-81-80:
200202

201203
name: "PHP${{ matrix.php }} symfony/dotenv ${{ matrix.symfony-dotenv }} ${{ matrix.os-title }} ${{ matrix.dependency-prefer-title }}"
202204
runs-on: "${{ matrix.os }}"
203205
strategy:
204206
fail-fast: true
205207
matrix:
206208
os: [ "ubuntu-latest", "macos-latest", "windows-latest" ]
207-
php: [ "8.3", "8.2", "8.1", "8.0" ]
209+
php: [ "8.4", "8.3", "8.2", "8.1", "8.0" ]
208210
symfony-dotenv: [ "^7.0", "^6.0", "^5.0", "^4.0", "^3.3" ]
209211
dependency-prefer: [ "prefer-stable", "prefer-lowest" ]
210212
include:
213+
- php: "8.4"
214+
phpunit: "^11.0"
215+
phpunit-config-file: "phpunit.github-actions.xml.dist"
211216
- php: "8.3"
212-
phpunit: "^10.1.0"
217+
phpunit: "^10.1"
213218
phpunit-config-file: "phpunit.github-actions.xml.dist"
214219
- php: "8.2"
215-
phpunit: "^10.1.0"
220+
phpunit: "^10.1"
216221
phpunit-config-file: "phpunit.github-actions.xml.dist"
217222
- php: "8.2"
218-
phpunit: "^10.1.0"
223+
phpunit: "^10.1"
219224
phpunit-config-file: "phpunit.github-actions.xml.dist"
220225
- php: "8.1"
221-
phpunit: "^10.1.0"
226+
phpunit: "^10.1"
222227
phpunit-config-file: "phpunit.github-actions.xml.dist"
223228
- php: "8.0"
224229
phpunit: "^9.3"

CHANGELOG.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,20 @@
22

33
All notable changes to `code-distortion/fluent-dotenv` will be documented in this file.
44

5-
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6+
7+
8+
9+
## [0.3.4] - 2025-01-29
10+
11+
### Added
12+
- Added support for PHP 8.4
613

714

815

916
## [0.3.3] - 2023-12-31
1017

11-
### Changed
18+
### Added
1219
- Updated package tooling
1320

1421

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 Tim Chandler
3+
Copyright (c) 2025 Tim Chandler
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# FluentDotEnv
22

33
[![Latest Version on Packagist](https://img.shields.io/packagist/v/code-distortion/fluent-dotenv.svg?style=flat-square)](https://packagist.org/packages/code-distortion/fluent-dotenv)
4-
[![PHP Version](https://img.shields.io/badge/PHP-7.0%20to%208.3-blue?style=flat-square)](https://php.net)
4+
[![PHP Version](https://img.shields.io/badge/PHP-7.0%20to%208.4-blue?style=flat-square)](https://php.net)
55
[![vlucas/phpdotenv](https://img.shields.io/badge/vlucas%2Fphpdotenv-1.1%20to%205.x-blue?style=flat-square)](https://github.com/vlucas/phpdotenv)
66
[![symfony/dotenv](https://img.shields.io/badge/symfony%2Fdotenv-3.3%20to%207.x-blue?style=flat-square)](https://github.com/symfony/dotenv)
77
[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/code-distortion/fluent-dotenv/run-tests.yml?branch=master&style=flat-square)](https://github.com/code-distortion/fluent-dotenv/actions)
@@ -72,7 +72,7 @@ Install the package via composer:
7272
composer require code-distortion/fluent-dotenv
7373
```
7474

75-
You must also include either vlucas/phpdotenv or symfony/dotenv in your project:
75+
You must also include either `vlucas/phpdotenv` or `symfony/dotenv` in your project:
7676

7777
``` bash
7878
composer require vlucas/phpdotenv

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
}
2525
],
2626
"require": {
27-
"php": "7.0.* | 7.1.* | 7.2.* | 7.3.* | 7.4.* | 8.0.* | 8.1.* | 8.2.* | 8.3.*",
27+
"php": "7.0.* | 7.1.* | 7.2.* | 7.3.* | 7.4.* | 8.0.* | 8.1.* | 8.2.* | 8.3.* | 8.4.*",
2828
"ext-mbstring": "*"
2929
},
3030
"require-dev": {
31-
"infection/infection": "^0.10 | ^0.11 | ^0.12 | ^0.13 | ^0.14 | ^0.15 | ^0.16 | ^0.17 | ^0.18 | ^0.19 | ^0.20 | ^0.21 | ^0.22 | ^0.23 | ^0.24 | ^0.25 | ^0.26 | ^0.27",
32-
"jchook/phpunit-assert-throws": "^1.0",
33-
"phpstan/phpstan": "^0.9 | ^0.10 | ^0.11 | ^0.12 | ^1.0",
34-
"phpunit/phpunit": "~4.8 | ^5.0 | ^6.0 | ^7.0 | ^8.4 | ^9.0 | ^10.0",
35-
"squizlabs/php_codesniffer": "^3.8.0",
31+
"infection/infection": "^0.10 | ^0.11 | ^0.12 | ^0.13 | ^0.14 | ^0.15 | ^0.16 | ^0.17 | ^0.18 | ^0.19 | ^0.20 | ^0.21 | ^0.22 | ^0.23 | ^0.24 | ^0.25 | ^0.26 | ^0.27 | ^0.28 | ^0.29",
32+
"phpstan/phpstan": "^0.9 | ^0.10 | ^0.11 | ^0.12 | ^1.0 | ^2.0",
33+
"phpstan/phpstan-strict-rules": "^0.9 | ^0.10 | ^0.11 | ^0.12 | ^1.0 | ^2.0",
34+
"phpunit/phpunit": "~4.8 | ^5.0 | ^6.0 | ^7.0 | ^8.4 | ^9.0 | ^10.0 | ^11.0",
35+
"squizlabs/php_codesniffer": "^3.11.2",
3636
"vlucas/phpdotenv": "^1.1.0 | ^2.0 | ^3.0 | ^4.0 | ^5.0"
3737
},
3838
"autoload": {

infection.json.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"source": {
44
"directories": [
55
"src"
6-
],
6+
]
77
},
88
"timeout": 300,
99
"logs": {
1010
"text": "infection/infection.log",
1111
"html": "infection/infection.html",
1212
"summary": "infection/summary.log",
1313
"json": "infection/infection-log.json",
14-
"perMutator": "infection/per-mutator.md",
14+
"perMutator": "infection/per-mutator.md"
1515
},
1616
"mutators": {
1717
"@default": true

phpstan.neon.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
includes:
2+
- vendor/phpstan/phpstan-strict-rules/rules.neon
13
parameters:
24
paths:
35
- src/
46
- tests/
57
level: max
68
parallel:
79
processTimeout: 300.0
10+
excludePaths:
11+
- /**/ManualTest.php

phpunit.github-actions.up-to-9.xml.dist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<phpunit
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
5-
backupGlobals="true"
5+
backupGlobals="false"
66
backupStaticAttributes="true"
7-
beStrictAboutOutputDuringTests="false"
7+
beStrictAboutOutputDuringTests="true"
88
bootstrap="vendor/autoload.php"
99
colors="false"
1010
convertDeprecationsToExceptions="false"
@@ -28,7 +28,7 @@
2828
>
2929
<testsuites>
3030
<testsuite name="Unit">
31-
<directory suffix="Test.php">./tests/Unit</directory>
31+
<directory suffix="Test.php">./tests/Unit/</directory>
3232
</testsuite>
3333
</testsuites>
3434
</phpunit>

0 commit comments

Comments
 (0)