Skip to content
This repository has been archived by the owner on May 25, 2020. It is now read-only.

Commit

Permalink
Laravel 5.8 compatibility (#16)
Browse files Browse the repository at this point in the history
  • Loading branch information
tarampampam authored May 15, 2019
1 parent eba442b commit 9430739
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 24 deletions.
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,9 @@ after_success:

matrix:
include:
- php: 7.0
- php: 7.0
env: setup=lowest

- php: 7.1
- php: 7.1
- php: 7.1.3
- php: 7.1.3
env: setup=lowest

- php: 7.2
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver].

## v2.0.0

### Added

- Laravel **v5.8** supports

### Changed

- Minimal `php` version now is `7.1.3`
- Minimal `illuminate/*` and `laravel/*` package versions now is `>=5.8`

## v1.4.0

### Changed
Expand Down
22 changes: 10 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,17 @@
],
"type": "library",
"license": "MIT",
"authors": [
{
"name": "avto-dev",
"homepage": "https://github.com/avto-dev"
}
],
"authors": [{
"name": "avto-dev",
"homepage": "https://github.com/avto-dev"
}],
"require": {
"php": ">=7.0",
"php": "^7.1.3",
"ext-mbstring": "*",
"illuminate/contracts": ">=5.5.0 <5.8.0",
"illuminate/support": ">=5.5.0 <5.8.0",
"illuminate/http": ">=5.5.0 <5.8.0",
"illuminate/routing": ">=5.5.0 <5.8.0",
"illuminate/contracts": ">=5.8.0 <5.9.0",
"illuminate/support": ">=5.8.0 <5.9.0",
"illuminate/http": ">=5.8.0 <5.9.0",
"illuminate/routing": ">=5.8.0 <5.9.0",
"spiral/roadrunner": "^1.4",
"symfony/psr-http-message-bridge": "^1.1"
},
Expand All @@ -30,7 +28,7 @@
"ext-sqlite3": "*",
"avto-dev/dev-tools": "^1.9",
"jeremeamia/superclosure": "^2.4",
"laravel/laravel": ">=5.5.0 <5.8.0",
"laravel/laravel": ">=5.8.0 <5.9.0",
"mockery/mockery": "0.9.* || ~1.0",
"phpstan/phpstan": "~0.9 || ^0.10",
"phpunit/phpunit": "^6.4 || ~7.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/Middleware/ForceHttpsMiddlewareTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ForceHttpsMiddlewareTest extends AbstractTestCase
/**
* {@inheritdoc}
*/
protected function setUp()
protected function setUp(): void
{
parent::setUp();

Expand Down
2 changes: 1 addition & 1 deletion tests/Support/Stacks/BasicStackTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class BasicStackTest extends AbstractTestCase
/**
* {@inheritdoc}
*/
protected function setUp()
protected function setUp(): void
{
parent::setUp();

Expand Down
2 changes: 1 addition & 1 deletion tests/Worker/Callbacks/CallbacksTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class CallbacksTest extends AbstractTestCase
/**
* {@inheritdoc}
*/
protected function setUp()
protected function setUp(): void
{
parent::setUp();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class CallbacksInitializerTest extends AbstractTestCase
/**
* {@inheritdoc}
*/
protected function setUp()
protected function setUp(): void
{
parent::setUp();

Expand All @@ -46,7 +46,7 @@ protected function setUp()
/**
* {@inheritdoc}
*/
protected function tearDown()
protected function tearDown(): void
{
unset($_ENV['APP_FORCE_HTTPS']);

Expand Down
2 changes: 1 addition & 1 deletion tests/Worker/StartOptions/StartOptionsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class StartOptionsTest extends AbstractTestCase
/**
* {@inheritdoc}
*/
protected function setUp()
protected function setUp(): void
{
parent::setUp();

Expand Down
2 changes: 1 addition & 1 deletion tests/Worker/WorkerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class WorkerTest extends AbstractTestCase
/**
* {@inheritdoc}
*/
protected function tearDown()
protected function tearDown(): void
{
unset($_ENV['APP_BOOTSTRAP_PATH'], $_ENV['APP_BASE_PATH']);

Expand Down

0 comments on commit 9430739

Please sign in to comment.