From 1cf82f8ae3b3aa3b8435b0eb0fbee329a4ce85d3 Mon Sep 17 00:00:00 2001 From: Kent Allan Jay Ando Date: Tue, 21 Apr 2020 14:45:43 +0800 Subject: [PATCH 1/3] laravel 6 support --- composer.json | 8 ++++---- tests/TestCase.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index ea2d642..fa6fffc 100644 --- a/composer.json +++ b/composer.json @@ -11,14 +11,14 @@ ], "require": { "php": "^7.1", - "illuminate/database": "~5.5.0|~5.6.0|~5.7.0", - "illuminate/support": "~5.5.0|~5.6.0|~5.7.0" + "illuminate/database": "~5.5.0|~5.6.0|~5.7.0|^6.0", + "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|^6.0" }, "require-dev": { "ext-pdo_sqlite": "*", "mockery/mockery": "^1.0.0", - "orchestra/testbench": "~3.5.0|~3.6.0", - "phpunit/phpunit" : "^7.0" + "orchestra/testbench": "~3.5.0|~3.6.0|^4.0|^5.0", + "phpunit/phpunit" : "^7.0|^8.0|^9.0" }, "autoload": { "psr-4": { diff --git a/tests/TestCase.php b/tests/TestCase.php index 33fd4e8..896ca21 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -7,7 +7,7 @@ class TestCase extends Orchestra { - public function setUp() + protected function setUp() : void { parent::setUp(); From 6abef61afb6afcb11d6ccf6480eebe280acbbec8 Mon Sep 17 00:00:00 2001 From: Kent Allan Jay Ando Date: Tue, 21 Apr 2020 15:02:55 +0800 Subject: [PATCH 2/3] laravel 5.8 support --- README.md | 2 +- composer.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 66d037c..5f04e1c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Adds optimistic locking feature to Eloquent models. composer require reshadman/laravel-optimistic-locking ``` -> This package supports Laravel 5.5.*, 5.6.* and 5.7.* . +> This package supports Laravel 5.5.*, 5.6.*, 5.7.*, 5.8.*, and 6.* . ## Usage diff --git a/composer.json b/composer.json index fa6fffc..26005f4 100644 --- a/composer.json +++ b/composer.json @@ -11,13 +11,13 @@ ], "require": { "php": "^7.1", - "illuminate/database": "~5.5.0|~5.6.0|~5.7.0|^6.0", - "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|^6.0" + "illuminate/database": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0", + "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0" }, "require-dev": { "ext-pdo_sqlite": "*", "mockery/mockery": "^1.0.0", - "orchestra/testbench": "~3.5.0|~3.6.0|^4.0|^5.0", + "orchestra/testbench": "~3.5.0|~3.6.0|~3.8.0|^4.0|^5.0", "phpunit/phpunit" : "^7.0|^8.0|^9.0" }, "autoload": { From 0a34d7438bc560256050a06f79f006173ab6ebfc Mon Sep 17 00:00:00 2001 From: Patrick Klostermeier Date: Wed, 8 Jul 2020 10:54:58 +0700 Subject: [PATCH 3/3] Added support for Laravel 6.x and 7.x --- README.md | 2 +- composer.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5f04e1c..b2d7d52 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Adds optimistic locking feature to Eloquent models. composer require reshadman/laravel-optimistic-locking ``` -> This package supports Laravel 5.5.*, 5.6.*, 5.7.*, 5.8.*, and 6.* . +> This package supports Laravel 5.5.*, 5.6.*, 5.7.*, 5.8.*, 6.* and 7.*. ## Usage diff --git a/composer.json b/composer.json index 26005f4..6de210c 100644 --- a/composer.json +++ b/composer.json @@ -11,8 +11,8 @@ ], "require": { "php": "^7.1", - "illuminate/database": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0", - "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0" + "illuminate/database": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", + "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0" }, "require-dev": { "ext-pdo_sqlite": "*",