Skip to content

Commit

Permalink
Merge pull request #21 from Laragear/feat/php-8.2
Browse files Browse the repository at this point in the history
[1.x] Adds PHP 8.2, Laravel 10 support
  • Loading branch information
DarkGhostHunter authored Feb 21, 2023
2 parents 6889023 + 9a5fa17 commit 52231e3
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 53 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: "Set up PHP"
uses: "shivammathur/setup-php@v2"
with:
php-version: "8.1"
php-version: "latest"
tools: "parallel-lint"

- name: "Checkout code"
Expand All @@ -52,11 +52,16 @@ jobs:
php-version:
- "8.0"
- "8.1"
- "8.2"
laravel-constrain:
- "9.*"
- "10.*"
dependencies:
- "lowest"
- "highest"
exclude:
- laravel-constrain: "10.*"
php-version: "8.0"
steps:
- name: "Set up PHP"
uses: "shivammathur/setup-php@v2"
Expand All @@ -77,7 +82,7 @@ jobs:
run: "composer run-script test"

- name: "Upload coverage to Codecov"
uses: "codecov/codecov-action@v2"
uses: "codecov/codecov-action@v3"

static_analysis:
name: "3️⃣ Static Analysis"
Expand All @@ -91,6 +96,7 @@ jobs:
with:
tools: "phpstan"
php-version: "latest"
coverage: "none"

- name: "Checkout code"
uses: "actions/checkout@v3"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
/coverage
/.idea
.phpunit.result.cache
.phpunit.cache
phpunit.xml.dist.bak
composer.lock
31 changes: 11 additions & 20 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,24 @@
{
"name": "Italo Baeza C.",
"email": "[email protected]",
"homepage": "https://patreon.com/packagesforlaravel"
"homepage": "https://github.com/sponsors/DarkGhostHunter"
}
],
"support": {
"source": "https://github.com/laragear/cache-query",
"issues": "https://github.com/laragear/cache-query/issues"
},
"require": {
"php": "^8.0.2",
"illuminate/cache": "9.*",
"illuminate/config": "9.*",
"illuminate/database": "9.*",
"illuminate/support": "9.*",
"illuminate/container": "9.*",
"illuminate/contracts": "9.*"
"php": "8.*",
"illuminate/cache": "9.*|10.*",
"illuminate/config": "9.*|10.*",
"illuminate/database": "9.*|10.*",
"illuminate/support": "9.*|10.*",
"illuminate/container": "9.*|10.*",
"illuminate/contracts": "9.*|10.*"
},
"require-dev": {
"orchestra/testbench": "7.*",
"phpunit/phpunit": "^9.5"
"orchestra/testbench": "^7.22|8.*"
},
"autoload": {
"psr-4": {
Expand Down Expand Up @@ -55,16 +54,8 @@
},
"funding": [
{
"type": "Patreon",
"url": "https://patreon.com/PackagesForLaravel"
},
{
"type": "Ko-Fi",
"url": "https://ko-fi.com/DarkGhostHunter"
},
{
"type": "Buy me a cofee",
"url": "https://www.buymeacoffee.com/darkghosthunter"
"type": "Github Sponsorship",
"url": "https://github.com/sponsors/DarkGhostHunter"
},
{
"type": "Paypal",
Expand Down
53 changes: 22 additions & 31 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,32 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="vendor/autoload.php"
backupGlobals="false"
backupStaticAttributes="false"
colors="true"
verbose="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false">
<testsuites>
<testsuite name="Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">src/</directory>
</whitelist>
</filter>
<logging>
<log type="coverage-clover" target="build/logs/clover.xml"/>
</logging>
<php>
<env name="APP_ENV" value="testing"/>
<env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
<env name="DB_CONNECTION" value="sqlite"/>
<env name="DB_DATABASE" value=":memory:"/>
<env name="CACHE_DRIVER" value="array"/>
</php>
</phpunit>
<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">
<coverage>
<include>
<directory suffix=".php">src/</directory>
</include>
<report>
<clover outputFile="build/logs/clover.xml"/>
</report>
</coverage>
<testsuites>
<testsuite name="Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>
<php>
<env name="APP_ENV" value="testing"/>
<env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
<env name="DB_CONNECTION" value="sqlite"/>
<env name="DB_DATABASE" value=":memory:"/>
<env name="CACHE_DRIVER" value="array"/>
</php>
</phpunit>

0 comments on commit 52231e3

Please sign in to comment.