diff --git a/.travis.yml b/.travis.yml index 169af4c..a84e7d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,11 @@ matrix: - LARAVEL_VERSION=5.8.* - SYMFONY_VERSION=^4.0 - PHPUNIT_VERSION=^8.0 + - env: + - PHP_VERSION=7.2 + - LARAVEL_VERSION=^6.0 + - SYMFONY_VERSION=^4.0 + - PHPUNIT_VERSION=^8.0 - env: - PHP_VERSION=7.3 - LARAVEL_VERSION=5.5.* @@ -62,6 +67,11 @@ matrix: - LARAVEL_VERSION=5.8.* - SYMFONY_VERSION=^4.0 - PHPUNIT_VERSION=^8.0 + - env: + - PHP_VERSION=7.3 + - LARAVEL_VERSION=^6.0 + - SYMFONY_VERSION=^4.0 + - PHPUNIT_VERSION=^8.0 before_install: diff --git a/README.md b/README.md index ad45d20..e294411 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Laravel UPS Api ================= -## For Laravel 5.5+ +## For Laravel 5.5+ or 6 [![Build Status](https://travis-ci.org/ptondereau/Laravel-UPS-Api.svg?branch=master)](https://travis-ci.org/ptondereau/Laravel-UPS-Api) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/ptondereau/Laravel-UPS-Api/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/ptondereau/Laravel-UPS-Api/?branch=master) @@ -38,14 +38,15 @@ Once Laravel UPS Api is installed, you need to register the service provider. Op You can register the all or some Ups facade in the `aliases` key of your `config/app.php` file if you like. -* `'UPSAddressValidator' => 'Ptondereau\LaravelUpsApi\Facades\UpsAddressValidator'` -* `'UPSLocator' => 'Ptondereau\LaravelUpsApi\Facades\UpsLocator'` -* `'UPSQuantumView' => 'Ptondereau\LaravelUpsApi\Facades\UpsQuantumView'` -* `'UPSRate' => 'Ptondereau\LaravelUpsApi\Facades\UpsRate'` -* `'UPSTimeInTransit' => 'Ptondereau\LaravelUpsApi\Facades\UpsTimeInTransit'` -* `'UPSTracking' => 'Ptondereau\LaravelUpsApi\Facades\UpsTracking'` -* `'UPSTradeability' => 'Ptondereau\LaravelUpsApi\Facades\UpsTradeability'` -* `'UPSShipping' => 'Ptondereau\LaravelUpsApi\Facades\UpsShipping'` +* `'UpsAddressValidator' => 'Ptondereau\LaravelUpsApi\Facades\UpsAddressValidator'` +* `'UpsLocator' => 'Ptondereau\LaravelUpsApi\Facades\UpsLocator'` +* `'UpsQuantumView' => 'Ptondereau\LaravelUpsApi\Facades\UpsQuantumView'` +* `'UpsRate' => 'Ptondereau\LaravelUpsApi\Facades\UpsRate'` +* `'UpsTimeInTransit' => 'Ptondereau\LaravelUpsApi\Facades\UpsTimeInTransit'` +* `'UpsTracking' => 'Ptondereau\LaravelUpsApi\Facades\UpsTracking'` +* `'UpsTradeability' => 'Ptondereau\LaravelUpsApi\Facades\UpsTradeability'` +* `'UpsShipping' => 'Ptondereau\LaravelUpsApi\Facades\UpsShipping'` +* `'UpsRateInTransit' => 'Ptondereau\LaravelUpsApi\Facades\UpsRateInTransit'` diff --git a/composer.json b/composer.json index 6498d98..7c64ec4 100644 --- a/composer.json +++ b/composer.json @@ -4,8 +4,8 @@ "keywords": ["laravel", "framework", "UPS", "Laravel UPS Api", "Laravel-Ups-Api", "Pierre Tondereau", "Ptondereau"], "require": { "php": "^7.1.3", - "illuminate/contracts": "5.5.*|5.6.*|5.7.*|5.8.*", - "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*", + "illuminate/contracts": "^5.5|^6.0", + "illuminate/support": "^5.5|^6.0", "gabrielbull/ups-api": "^0.8" }, "require-dev": {