From e25eb08cb24500997c87a86f491fd00b020a1480 Mon Sep 17 00:00:00 2001 From: Trollfalgar Date: Wed, 9 Sep 2020 15:20:44 -0300 Subject: [PATCH 1/3] Laravel 8 Support --- composer.json | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 69e02fd..13a40ca 100755 --- a/composer.json +++ b/composer.json @@ -10,23 +10,21 @@ ], "homepage": "https://github.com/kyslik/laravel-filterable", "license": "MIT", - "authors": [ - { - "name": "Martin Kiesel", - "email": "martin.kiesel@gmail.com", - "role": "Developer" - } - ], + "authors": [{ + "name": "Martin Kiesel", + "email": "martin.kiesel@gmail.com", + "role": "Developer" + }], "require": { "php": ">=7.1", - "illuminate/support": "^7.0", - "illuminate/database": "^7.0", - "illuminate/http": "^7.0" + "illuminate/support": "^7.0|^8.0", + "illuminate/database": "^7.0|^8.0", + "illuminate/http": "^7.0|^8.0" }, "require-dev": { - "laravel/framework": "^7.0", - "orchestra/testbench": "^5.0", - "phpunit/phpunit": "^8.0" + "laravel/framework": "^7.0|^8.0", + "orchestra/testbench": "^5.0|^6.0", + "phpunit/phpunit": "^8.0|^9.0" }, "autoload": { "psr-4": { @@ -56,4 +54,4 @@ ] } } -} +} \ No newline at end of file From b232fedd4d01280f3dbaad2d407624401826abe4 Mon Sep 17 00:00:00 2001 From: Tiago Oliveira Date: Sun, 13 Sep 2020 10:20:08 -0300 Subject: [PATCH 2/3] Update composer.json Support multiple version Co-authored-by: Martin Kiesel <2067589+Kyslik@users.noreply.github.com> --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 13a40ca..91fd8ff 100755 --- a/composer.json +++ b/composer.json @@ -22,9 +22,9 @@ "illuminate/http": "^7.0|^8.0" }, "require-dev": { - "laravel/framework": "^7.0|^8.0", - "orchestra/testbench": "^5.0|^6.0", - "phpunit/phpunit": "^8.0|^9.0" + "laravel/framework": ">=7.0", + "orchestra/testbench": ">=5.0", + "phpunit/phpunit": ">=8.0" }, "autoload": { "psr-4": { @@ -54,4 +54,4 @@ ] } } -} \ No newline at end of file +} From 14824764cbc9e48aee3dfa60966d3a346e5f95cf Mon Sep 17 00:00:00 2001 From: Tiago Oliveira Date: Sun, 13 Sep 2020 10:20:34 -0300 Subject: [PATCH 3/3] Update composer.json Support multiple versions Co-authored-by: Martin Kiesel <2067589+Kyslik@users.noreply.github.com> --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 91fd8ff..c280662 100755 --- a/composer.json +++ b/composer.json @@ -17,9 +17,9 @@ }], "require": { "php": ">=7.1", - "illuminate/support": "^7.0|^8.0", - "illuminate/database": "^7.0|^8.0", - "illuminate/http": "^7.0|^8.0" + "illuminate/support": ">=7.0", + "illuminate/database": ">=7.0", + "illuminate/http": ">=7.0" }, "require-dev": { "laravel/framework": ">=7.0",