Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Laravel 11 #89

Merged
merged 11 commits into from
Mar 13, 2024
Merged

Laravel 11 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5f9c857
L11
SamuelMwangiW Jan 16, 2024
e2532f4
Added collision ^8
SamuelMwangiW Jan 16, 2024
bc876ac
Use Laravel 11 fork saloonphp/laravel-plugin#54
SamuelMwangiW Jan 16, 2024
8f52e18
Update phpunit.xml.dist config
SamuelMwangiW Jan 25, 2024
4ef591b
Use saloonphp/laravel-plugin#61 instead
SamuelMwangiW Mar 7, 2024
3737b98
Experiment with integration path
SamuelMwangiW Jan 29, 2024
220127d
Merge branch 'main' into laravel-11
SamuelMwangiW Mar 7, 2024
ce1acc7
formatting
SamuelMwangiW Mar 7, 2024
681e235
Provide Github token to composer
SamuelMwangiW Mar 7, 2024
3f6ca62
Remove unrelated saloon.integrations_path
SamuelMwangiW Mar 7, 2024
776cd34
Prep laravel 11 support
SamuelMwangiW Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/phpstan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ jobs:
with:
php-version: ${{ matrix.php }}
coverage: none
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Install composer dependencies
uses: ramsey/composer-install@v3
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,16 @@ jobs:
matrix:
os: [ubuntu-latest]
php: [8.1, 8.2, 8.3]
laravel: [10.*]
laravel: [10.*, 11.*]
stability: [prefer-lowest, prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 11.*
testbench: 9.*
exclude:
- php: 8.1
laravel: 11.*

name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}

Expand All @@ -41,6 +46,8 @@ jobs:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, fileinfo
coverage: pcov
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Setup problem matchers
run: |
Expand Down
12 changes: 6 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
],
"require": {
"php": "^8.1",
"illuminate/contracts": "^10.0",
"saloonphp/laravel-plugin": "^3.0",
"illuminate/contracts": "^10.0|^11.0",
"saloonphp/laravel-plugin": "^3.5",
"spatie/laravel-package-tools": "^1.14"
},
"require-dev": {
"guzzlehttp/guzzle": "^7.4",
"larastan/larastan": "^2.7",
"nunomaduro/collision": "^7.0",
"orchestra/testbench": "^8.0",
"pestphp/pest": "^2.0",
"nunomaduro/collision": "^7.0|^8.0.1",
"orchestra/testbench": "^8.0|^9.0",
"pestphp/pest": "^2.30",
"pestphp/pest-plugin-laravel": "^2.0",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan-deprecation-rules": "^1.0",
Expand Down Expand Up @@ -68,6 +68,6 @@
}
}
},
"minimum-stability": "dev",
"minimum-stability": "stable",
"prefer-stable": true
}
68 changes: 28 additions & 40 deletions phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
backupGlobals="false"
bootstrap="vendor/autoload.php"
colors="true"
processIsolation="false"
stopOnFailure="false"
executionOrder="random"
failOnWarning="true"
failOnRisky="true"
failOnEmptyTestSuite="true"
beStrictAboutOutputDuringTests="true"
cacheDirectory=".phpunit.cache"
backupStaticProperties="false"
>
<testsuites>
<testsuite name="SamuelMwangiW Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>
<coverage>
<include>
<directory suffix=".php">./src</directory>
</include>
<report>
<clover outputFile="build/logs/clover.xml"/>
</report>
</coverage>
<logging>
<junit outputFile="build/report.junit.xml"/>
</logging>
<php>
<env name="AFRICASTALKING_USERNAME" value="sandbox"/>
<env name="AFRICASTALKING_API_KEY" value=""/>
<env name="AFRICASTALKING_FROM" value=""/>
<env name="AFRICASTALKING_BACKUP_SENDERID" value=""/>
<env name="AFRICASTALKING_PAYMENT_PRODUCT" value=""/>
<env name="AFRICASTALKING_PREMIUM_SHORTCODE" value=""/>
<env name="AFRICASTALKING_VOICE_PHONE_NUMBER" value=""/>
</php>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
<testsuites>
<testsuite name="SamuelMwangiW Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>
<coverage>
<report>
<clover outputFile="build/logs/clover.xml"/>
</report>
</coverage>
<logging>
<junit outputFile="build/report.junit.xml"/>
</logging>
<php>
<env name="AFRICASTALKING_USERNAME" value="sandbox"/>
<env name="AFRICASTALKING_API_KEY" value=""/>
<env name="AFRICASTALKING_FROM" value=""/>
<env name="AFRICASTALKING_BACKUP_SENDERID" value=""/>
<env name="AFRICASTALKING_PAYMENT_PRODUCT" value=""/>
<env name="AFRICASTALKING_PREMIUM_SHORTCODE" value=""/>
<env name="AFRICASTALKING_VOICE_PHONE_NUMBER" value=""/>
</php>
<source>
<include>
<directory suffix=".php">./src</directory>
</include>
</source>
</phpunit>
Loading