Skip to content

Commit 99c8d73

Browse files
authored
Merge pull request #29 from nick322/28
feat(#28): PHP 8.4 support
2 parents 6b00ebc + e81da89 commit 99c8d73

File tree

4 files changed

+27
-30
lines changed

4 files changed

+27
-30
lines changed

.github/workflows/tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
strategy:
2020
fail-fast: true
2121
matrix:
22-
php: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
23-
stability: [prefer-lowest, prefer-stable]
22+
php: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
23+
stability: [prefer-stable]
2424

2525
name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
2626

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
"type": "library",
55
"license": "MIT",
66
"require": {
7-
"php": "^7.3 || ^7.4 || ^8.0 || ^8.1 || ^8.2 || ^8.3",
7+
"php": "^7.3 || ^7.4 || ^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4",
88
"ext-openssl": "*",
99
"ext-hash": "*",
1010
"ext-simplexml": "*",
1111
"mnapoli/silly": "^1.0",
1212
"pear/ole": "v1.0.0"
1313
},
1414
"require-dev": {
15-
"php": "^7.3 || ^7.4 || ^8.0 || ^8.1 || ^8.2 || ^8.3",
15+
"php": "^7.3 || ^7.4 || ^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4",
1616
"ext-openssl": "*",
1717
"ext-hash": "*",
18-
"phpunit/phpunit": "^9.5 || ^10.0"
18+
"phpunit/phpunit": "^9.6 || ^10 || ^11"
1919
},
2020
"autoload": {
2121
"psr-4": {

phpunit.xml

+21-24
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit backupGlobals="false"
3-
backupStaticAttributes="false"
4-
beStrictAboutTestsThatDoNotTestAnything="false"
5-
colors="true"
6-
convertDeprecationsToExceptions="true"
7-
convertErrorsToExceptions="true"
8-
convertNoticesToExceptions="true"
9-
convertWarningsToExceptions="true"
10-
processIsolation="false"
11-
stopOnError="false"
12-
stopOnFailure="false"
13-
verbose="true"
14-
>
15-
<testsuites>
16-
<testsuite name="Laravel Test Suite">
17-
<directory suffix="Test.php">./tests</directory>
18-
</testsuite>
19-
</testsuites>
20-
<php>
21-
<ini name="date.timezone" value="UTC" />
22-
<ini name="intl.default_locale" value="C.UTF-8" />
23-
<ini name="memory_limit" value="128M" />
24-
</php>
25-
</phpunit>
2+
<phpunit
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
backupGlobals="false"
5+
beStrictAboutTestsThatDoNotTestAnything="false"
6+
colors="true"
7+
processIsolation="false"
8+
stopOnError="false"
9+
stopOnFailure="false"
10+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
11+
>
12+
<testsuites>
13+
<testsuite name="Test Suite">
14+
<directory suffix="Test.php">./tests</directory>
15+
</testsuite>
16+
</testsuites>
17+
<php>
18+
<ini name="date.timezone" value="UTC"/>
19+
<ini name="intl.default_locale" value="C.UTF-8"/>
20+
<ini name="memory_limit" value="128M"/>
21+
</php>
22+
</phpunit>

src/Encrypt.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function password(string $password)
6262
return $this;
6363
}
6464

65-
public function output(string $filePath = null)
65+
public function output(?string $filePath = null)
6666
{
6767
if (!$this->NOFILE && is_null($filePath)) {
6868
throw new Exception('Output Filepath cannot be NULL when NOFILE is False');

0 commit comments

Comments
 (0)