Skip to content

Commit 52231e3

Browse files
Merge pull request #21 from Laragear/feat/php-8.2
[1.x] Adds PHP 8.2, Laravel 10 support
2 parents 6889023 + 9a5fa17 commit 52231e3

File tree

4 files changed

+42
-53
lines changed

4 files changed

+42
-53
lines changed

.github/workflows/php.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: "Set up PHP"
3030
uses: "shivammathur/setup-php@v2"
3131
with:
32-
php-version: "8.1"
32+
php-version: "latest"
3333
tools: "parallel-lint"
3434

3535
- name: "Checkout code"
@@ -52,11 +52,16 @@ jobs:
5252
php-version:
5353
- "8.0"
5454
- "8.1"
55+
- "8.2"
5556
laravel-constrain:
5657
- "9.*"
58+
- "10.*"
5759
dependencies:
5860
- "lowest"
5961
- "highest"
62+
exclude:
63+
- laravel-constrain: "10.*"
64+
php-version: "8.0"
6065
steps:
6166
- name: "Set up PHP"
6267
uses: "shivammathur/setup-php@v2"
@@ -77,7 +82,7 @@ jobs:
7782
run: "composer run-script test"
7883

7984
- name: "Upload coverage to Codecov"
80-
uses: "codecov/codecov-action@v2"
85+
uses: "codecov/codecov-action@v3"
8186

8287
static_analysis:
8388
name: "3️⃣ Static Analysis"
@@ -91,6 +96,7 @@ jobs:
9196
with:
9297
tools: "phpstan"
9398
php-version: "latest"
99+
coverage: "none"
94100

95101
- name: "Checkout code"
96102
uses: "actions/checkout@v3"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
/coverage
55
/.idea
66
.phpunit.result.cache
7+
.phpunit.cache
78
phpunit.xml.dist.bak
89
composer.lock

composer.json

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,24 @@
99
{
1010
"name": "Italo Baeza C.",
1111
"email": "[email protected]",
12-
"homepage": "https://patreon.com/packagesforlaravel"
12+
"homepage": "https://github.com/sponsors/DarkGhostHunter"
1313
}
1414
],
1515
"support": {
1616
"source": "https://github.com/laragear/cache-query",
1717
"issues": "https://github.com/laragear/cache-query/issues"
1818
},
1919
"require": {
20-
"php": "^8.0.2",
21-
"illuminate/cache": "9.*",
22-
"illuminate/config": "9.*",
23-
"illuminate/database": "9.*",
24-
"illuminate/support": "9.*",
25-
"illuminate/container": "9.*",
26-
"illuminate/contracts": "9.*"
20+
"php": "8.*",
21+
"illuminate/cache": "9.*|10.*",
22+
"illuminate/config": "9.*|10.*",
23+
"illuminate/database": "9.*|10.*",
24+
"illuminate/support": "9.*|10.*",
25+
"illuminate/container": "9.*|10.*",
26+
"illuminate/contracts": "9.*|10.*"
2727
},
2828
"require-dev": {
29-
"orchestra/testbench": "7.*",
30-
"phpunit/phpunit": "^9.5"
29+
"orchestra/testbench": "^7.22|8.*"
3130
},
3231
"autoload": {
3332
"psr-4": {
@@ -55,16 +54,8 @@
5554
},
5655
"funding": [
5756
{
58-
"type": "Patreon",
59-
"url": "https://patreon.com/PackagesForLaravel"
60-
},
61-
{
62-
"type": "Ko-Fi",
63-
"url": "https://ko-fi.com/DarkGhostHunter"
64-
},
65-
{
66-
"type": "Buy me a cofee",
67-
"url": "https://www.buymeacoffee.com/darkghosthunter"
57+
"type": "Github Sponsorship",
58+
"url": "https://github.com/sponsors/DarkGhostHunter"
6859
},
6960
{
7061
"type": "Paypal",

phpunit.xml

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit bootstrap="vendor/autoload.php"
3-
backupGlobals="false"
4-
backupStaticAttributes="false"
5-
colors="true"
6-
verbose="true"
7-
convertErrorsToExceptions="true"
8-
convertNoticesToExceptions="true"
9-
convertWarningsToExceptions="true"
10-
processIsolation="false"
11-
stopOnFailure="false">
12-
<testsuites>
13-
<testsuite name="Test Suite">
14-
<directory>tests</directory>
15-
</testsuite>
16-
</testsuites>
17-
<filter>
18-
<whitelist>
19-
<directory suffix=".php">src/</directory>
20-
</whitelist>
21-
</filter>
22-
<logging>
23-
<log type="coverage-clover" target="build/logs/clover.xml"/>
24-
</logging>
25-
<php>
26-
<env name="APP_ENV" value="testing"/>
27-
<env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
28-
<env name="DB_CONNECTION" value="sqlite"/>
29-
<env name="DB_DATABASE" value=":memory:"/>
30-
<env name="CACHE_DRIVER" value="array"/>
31-
</php>
32-
</phpunit>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache">
3+
<coverage>
4+
<include>
5+
<directory suffix=".php">src/</directory>
6+
</include>
7+
<report>
8+
<clover outputFile="build/logs/clover.xml"/>
9+
</report>
10+
</coverage>
11+
<testsuites>
12+
<testsuite name="Test Suite">
13+
<directory>tests</directory>
14+
</testsuite>
15+
</testsuites>
16+
<php>
17+
<env name="APP_ENV" value="testing"/>
18+
<env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
19+
<env name="DB_CONNECTION" value="sqlite"/>
20+
<env name="DB_DATABASE" value=":memory:"/>
21+
<env name="CACHE_DRIVER" value="array"/>
22+
</php>
23+
</phpunit>

0 commit comments

Comments
 (0)