Skip to content

Commit

Permalink
L11 support (#31)
Browse files Browse the repository at this point in the history
* L11 support

* add 8.3 for testing

* update phpunit and other dependencies

* remove old php and laravel support

* Update README.md

Docs update

* php reqs
  • Loading branch information
bmartus authored May 20, 2024
1 parent 81757e0 commit 22119bc
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 52 deletions.
32 changes: 10 additions & 22 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,11 @@ jobs:

strategy:
matrix:
php: [ '7.4', '8.0', '8.1' ]
laravel: [ '8', '9', '10' ]
php: [ '8.1', '8.2', '8.3' ]
laravel: [ '10', '11' ]
exclude:
- php: '7.4'
laravel: '9'
- php: '7.4'
laravel: '10'
- php: '8.0'
laravel: '10'
- php: '8.1'
laravel: '11'

steps:
- name: Checkout Code
Expand All @@ -35,29 +31,21 @@ jobs:
- name: Setup Problem Matchers
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

- name: Select Laravel 8
- name: Select Laravel 10
uses: nick-invision/retry@v1
with:
timeout_minutes: 5
max_attempts: 5
command: composer require "laravel/framework:8.*" --no-update --no-interaction
if: "matrix.laravel == '8'"
command: composer require "laravel/framework:10.*" --no-update --no-interaction
if: "matrix.laravel == '10'"

- name: Select Laravel 9
uses: nick-invision/retry@v1
with:
timeout_minutes: 5
max_attempts: 5
command: composer require "laravel/framework:9.*" --no-update --no-interaction
if: "matrix.laravel == '9'"

- name: Select Laravel 10
- name: Select Laravel 11
uses: nick-invision/retry@v1
with:
timeout_minutes: 5
max_attempts: 5
command: composer require "laravel/framework:10.*" --no-update --no-interaction
if: "matrix.laravel == '10'"
command: composer require "laravel/framework:11.*" --no-update --no-interaction
if: "matrix.laravel == '11'"

- name: Install PHP Dependencies
uses: nick-invision/retry@v1
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Laravel UPS Api
=================

## For Laravel 8, 9 and 10
## For Laravel 10 and 11

<p align="center">
<a href="https://github.com/ptondereau/Laravel-UPS-Api/actions?query=workflow%3ATests"><img src="https://img.shields.io/github/workflow/status/ptondereau/Laravel-UPS-Api/Tests?label=Tests&style=flat-square" alt="Build Status"/></a>
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"description": "A small Laravel's wrapper for the PHP UPS API library",
"keywords": ["laravel", "framework", "UPS", "Laravel UPS Api", "Laravel-Ups-Api", "Pierre Tondereau", "Ptondereau"],
"require": {
"php": "^7.4.15 || ^8.0",
"illuminate/contracts": "^8.0 || ^9.0 || ^10.0",
"illuminate/support": "^8.0 || ^9.0 || ^10.0",
"php": "^8.1 || ^8.2 || ^8.3",
"illuminate/contracts": "^8.0 || ^9.0 || ^10.0 || ^11.0",
"illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0",
"gabrielbull/ups-api": "^1.2.2 || ^2.0"
},
"require-dev": {
"graham-campbell/analyzer": "^4.0",
"graham-campbell/testbench": "^6.0",
"phpunit/phpunit": "^9.3.7"
"graham-campbell/analyzer": "^4.1",
"graham-campbell/testbench": "^6.1",
"phpunit/phpunit": "^10.5.20"
},
"autoload": {
"psr-4": {
Expand Down
29 changes: 6 additions & 23 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,30 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
backupGlobals="false"
backupStaticAttributes="false"
beStrictAboutTestsThatDoNotTestAnything="true"
beStrictAboutOutputDuringTests="true"
bootstrap="vendor/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
failOnRisky="true"
failOnWarning="true"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
verbose="true"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
<coverage processUncoveredFiles="true">
<include>
<directory suffix=".php">./src</directory>
</include>
</coverage>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutOutputDuringTests="true" bootstrap="vendor/autoload.php" colors="true" failOnRisky="true" failOnWarning="true" processIsolation="false" stopOnError="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
<testsuites>
<testsuite name="Laravel UPS Api Test Suite">
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
<source>
<include>
<directory suffix=".php">./src</directory>
</include>
</source>
</phpunit>

0 comments on commit 22119bc

Please sign in to comment.