Merge branch 'release/1.3.0'

.travis.yml

@@ -1,15 +1,30 @@
 language: php
 
-php:
-  - 7.0.12
-  - 7.1
-  - 7.2
-
 services:
   - sqlite
 
+env:
+  - ILLUMINATE_VERSION=6.0.* PHPUNIT_VERSION=^8.3 TESTBENCH_VERSION=4.0.*
+
+matrix:
+  fast_finish: true
+  include:
+    - php: 7.2
+      env: ILLUMINATE_VERSION=6.0.* PHPUNIT_VERSION=^8.3 TESTBENCH_VERSION=4.0.*
+
 sudo: false
 
-install: travis_retry composer install --no-interaction --prefer-dist --no-suggest
+before_install:
+  - echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  - cp ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ~/xdebug.ini
+  - phpenv config-rm xdebug.ini
+  - composer global require hirak/prestissimo --update-no-dev
+  - composer require "illuminate/support:${ILLUMINATE_VERSION}" --no-update --prefer-dist
+  - composer require "orchestra/testbench:${TESTBENCH_VERSION}" --no-update --prefer-dist
+  - composer require "phpunit/phpunit:${PHPUNIT_VERSION}" --no-update --prefer-dist
+
+install: travis_retry composer update --no-interaction --prefer-dist --no-suggest
+
+before_script: phpenv config-add ~/xdebug.ini
 
 script: vendor/bin/phpunit --verbose

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.3.0] - 2019-10-27
+
+### Added
+- Support for Laravel 6 (issue #11)
+
 ## [1.2.4] - 2018-09-05
 
 ### Fixed
@@ -61,7 +66,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Fixed
 - Package keywords at composer.json
 
-[Unreleased]: https://github.com/brezzhnev/atlassian-connect-core/compare/v1.2.4...HEAD
+[Unreleased]: https://github.com/brezzhnev/atlassian-connect-core/compare/v1.3.0...HEAD
+[1.3.0]: https://github.com/brezzhnev/atlassian-connect-core/compare/v1.2.4...v1.3.0
 [1.2.4]: https://github.com/brezzhnev/atlassian-connect-core/compare/v1.2.3...v1.2.4
 [1.2.3]: https://github.com/brezzhnev/atlassian-connect-core/compare/v1.2.2...v1.2.3
 [1.2.2]: https://github.com/brezzhnev/atlassian-connect-core/compare/v1.2.1...v1.2.2

README.md

@@ -8,10 +8,12 @@
 
 The easiest way to create an add-on for JIRA and Confluence.
 
-## Requirements
+## Version Compatibility
 
-* Laravel 5.5+
-* PHP ~7.0
+ Laravel  | Package
+:---------|:----------
+ 5.5.x    | 1.2.x
+ 6.x      | 1.3.x
 
 ## Getting Started
 
@@ -20,7 +22,7 @@ The easiest way to create an add-on for JIRA and Confluence.
 Install dependency via Composer
 
 ``` bash
-$ composer require brezzhnev/atlassian-connect-core
+$ composer require "brezzhnev/atlassian-connect-core"
 ```
 
 Register **route middleware** `jwt` by adding to `app\Http\Kernel.php` the following line:

composer.json

@@ -22,15 +22,15 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
+        "php": "^7.2",
         "firebase/php-jwt": "^5.0",
         "guzzlehttp/guzzle": "^6.3",
-        "illuminate/support": "~5.5"
+        "illuminate/support": "^6.0"
     },
     "require-dev": {
-        "mockery/mockery": "^0.9.9",
-        "orchestra/testbench": "~3.0",
-        "phpunit/phpunit": "~6.0",
+        "mockery/mockery": "^1.2",
+        "orchestra/testbench": "^4.0",
+        "phpunit/phpunit": "^8.4",
         "squizlabs/php_codesniffer": "^2.3"
     },
     "autoload": {