Update for Laravel 5.8. (#19)

* Update for Laravel 5.8. * Update docs. * Update minimun PHP version.
ptondereau · Aug 19, 2019 · eedc667 · eedc667
1 parent e9162b2
commit eedc667
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 74 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .idea
 vendor
-composer.lock
+composer.lock
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -1,74 +1,80 @@
-language: php
-
-sudo: false
+dist: xenial
 
 matrix:
   include:
-    - php: 5.5.9
-      env: LARAVEL_VERSION=5.1.*
-    - php: 5.5.9
-      env: LARAVEL_VERSION=5.2.*
-    - php: 5.5
-      env: LARAVEL_VERSION=5.1.*
-    - php: 5.5
-      env: LARAVEL_VERSION=5.2.*
-    - php: 5.6
-      env: LARAVEL_VERSION=5.1.*
-    - php: 5.6
-      env: LARAVEL_VERSION=5.2.*
-    - php: 5.6
-      env: LARAVEL_VERSION=5.3.*
-    - php: 5.6
-      env: LARAVEL_VERSION=5.4.*
-    - php: 7.0
-      env: LARAVEL_VERSION=5.1.*
-    - php: 7.0
-      env: LARAVEL_VERSION=5.2.*
-    - php: 7.0
-      env: LARAVEL_VERSION=5.3.*
-    - php: 7.0
-      env: LARAVEL_VERSION=5.4.*
-    - php: 7.0
-      env: LARAVEL_VERSION=5.5.*
-    - php: 7.1
-      env: LARAVEL_VERSION=5.1.*
-    - php: 7.1
-      env: LARAVEL_VERSION=5.2.*
-    - php: 7.1
-      env: LARAVEL_VERSION=5.3.*
-    - php: 7.1
-      env: LARAVEL_VERSION=5.4.*
-    - php: 7.1
-      env: LARAVEL_VERSION=5.5.*
-    - php: 7.1
-      env: LARAVEL_VERSION=5.6.*
-    - php: 7.1
-      env: LARAVEL_VERSION=5.7.*
-    - php: 7.2
-      env: LARAVEL_VERSION=5.6.*
-    - php: 7.2
-      env: LARAVEL_VERSION=5.7.*
-    - php: hhvm
-      env: LARAVEL_VERSION=5.1.*
-    - php: hhvm
-      env: LARAVEL_VERSION=5.2.*
-    - php: hhvm
-      env: LARAVEL_VERSION=5.3.*
-    - php: hhvm
-      env: LARAVEL_VERSION=5.4.*
+    - env:
+      - PHP_VERSION=7.1
+      - LARAVEL_VERSION=5.5.*
+      - SYMFONY_VERSION=^3.0
+      - PHPUNIT_VERSION=^6.5
+    - env:
+      - PHP_VERSION=7.1
+      - LARAVEL_VERSION=5.6.*
+      - SYMFONY_VERSION=^4.0
+      - PHPUNIT_VERSION=^7.5
+    - env:
+      - PHP_VERSION=7.1
+      - LARAVEL_VERSION=5.7.*
+      - SYMFONY_VERSION=^4.0
+      - PHPUNIT_VERSION=^7.5
+    - env:
+      - PHP_VERSION=7.1
+      - LARAVEL_VERSION=5.8.*
+      - SYMFONY_VERSION=^4.0
+      - PHPUNIT_VERSION=^7.5
+    - env:
+      - PHP_VERSION=7.2
+      - LARAVEL_VERSION=5.5.*
+      - SYMFONY_VERSION=^3.0
+      - PHPUNIT_VERSION=^6.5
+    - env:
+      - PHP_VERSION=7.2
+      - LARAVEL_VERSION=5.6.*
+      - SYMFONY_VERSION=^4.0
+      - PHPUNIT_VERSION=^7.5
+    - env:
+      - PHP_VERSION=7.2
+      - LARAVEL_VERSION=5.7.*
+      - SYMFONY_VERSION=^4.0
+      - PHPUNIT_VERSION=^7.5
+    - env:
+      - PHP_VERSION=7.2
+      - LARAVEL_VERSION=5.8.*
+      - SYMFONY_VERSION=^4.0
+      - PHPUNIT_VERSION=^8.0
+    - env:
+      - PHP_VERSION=7.3
+      - LARAVEL_VERSION=5.5.*
+      - SYMFONY_VERSION=^3.0
+      - PHPUNIT_VERSION=^6.5
+    - env:
+      - PHP_VERSION=7.3
+      - LARAVEL_VERSION=5.6.*
+      - SYMFONY_VERSION=^4.0
+      - PHPUNIT_VERSION=^7.5
+    - env:
+      - PHP_VERSION=7.3
+      - LARAVEL_VERSION=5.7.*
+      - SYMFONY_VERSION=^4.0
+      - PHPUNIT_VERSION=^7.5
+    - env:
+      - PHP_VERSION=7.3
+      - LARAVEL_VERSION=5.8.*
+      - SYMFONY_VERSION=^4.0
+      - PHPUNIT_VERSION=^8.0
+
 
 before_install:
-  - if [[ $TRAVIS_PHP_VERSION =~ ^hhvm ]]; then echo 'hhvm.jit = false' >> /etc/hhvm/php.ini ; fi
-  - composer self-update --stable -n
-  - composer require "laravel/framework:${LARAVEL_VERSION}" --no-update -n
+  - travis_retry docker pull registry.gitlab.com/grahamcampbell/php:$PHP_VERSION
+  - docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:$PHP_VERSION require "laravel/framework:${LARAVEL_VERSION}" --no-update -n
+  - docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:$PHP_VERSION require "symfony/lts:${SYMFONY_VERSION}" --no-update -n
+  - docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:$PHP_VERSION require "phpunit/phpunit:${PHPUNIT_VERSION}" --dev --no-update -n
 
 install:
-  - travis_retry composer install --no-suggest --prefer-dist -n -o
+  - travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:$PHP_VERSION install --no-suggest --prefer-dist -n -o
 
 script:
-  - if [ "$TRAVIS_PHP_VERSION" != "5.6" ]; then vendor/bin/phpunit; fi
-  - if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi
+  - docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:$PHP_VERSION --coverage-clover build/logs/clover.xml
 
 after_script:
-  - if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi
+  - travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint ocular registry.gitlab.com/grahamcampbell/php:$PHP_VERSION code-coverage:upload --format=php-clover build/logs/clover.xml
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Laravel UPS Api
 =================
 
-## For Laravel 5.1+
+## For Laravel 5.5+
 
 [![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)
@@ -16,8 +16,6 @@ Laravel UPS Api was created by, and is maintained by [Pierre Tondereau](https://
 
 ## Installation
 
-Either [PHP](https://php.net) 5.5+ or [HHVM](http://hhvm.com) 3.6+ are required.
-
 To get the latest version of Laravel UPS Api, simply require the project using [Composer](https://getcomposer.org):
 
 ```bash

diff --git a/composer.json b/composer.json
@@ -3,15 +3,14 @@
   "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": ">=5.5.9",
-    "illuminate/contracts": "~5.1.0|~5.2.0|~5.3.0|~5.4.0|~5.5.0|~5.6.0|~5.7.0",
-    "illuminate/support": "~5.1.0|~5.2.0|~5.3.0|~5.4.0|~5.5.0|~5.6.0|~5.7.0",
+    "php": "^7.1.3",
+    "illuminate/contracts": "5.5.*|5.6.*|5.7.*|5.8.*",
+    "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*",
     "gabrielbull/ups-api": "^0.7.6"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0",
-    "graham-campbell/testbench": "^3.0|^4.0|^5.0",
-    "codeclimate/php-test-reporter": "^0.3.0"
+    "graham-campbell/analyzer": "^2.1",
+    "graham-campbell/testbench": "^5.2"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/UpsApiServiceProvider.php b/src/UpsApiServiceProvider.php
@@ -166,7 +166,6 @@ protected function registerRate()
                 $config['user_id'],
                 $config['password'],
                 $config['sandbox'],
-                null,
                 $app->make('log')
             );
         });