From 447768f06868eec824b06d143189d08c729d3427 Mon Sep 17 00:00:00 2001 From: kablanfatih Date: Wed, 6 Nov 2019 14:10:21 +0300 Subject: [PATCH 1/4] composer.json update for laravel6 --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 006d047..fed36e2 100644 --- a/composer.json +++ b/composer.json @@ -18,14 +18,14 @@ ], "require": { "php": ">=5.4.0", - "illuminate/database": "~4.2|^5", - "illuminate/config": "~4.2|^5", - "nesbot/carbon": "~1.0|~2", - "elasticsearch/elasticsearch": "~6.1" + "illuminate/database": ">=4.2 <5.0.0|>=5.0 <6.0.0", + "illuminate/config": ">=4.2 <5.0.0|>=5 <6.0.0", + "nesbot/carbon": ">=1.0 <2.0.0|>=2.0 <3.0.0", + "elasticsearch/elasticsearch": ">=6.1 <7.0.0" }, "require-dev": { - "phpunit/phpunit": "~4.2|~5.0", - "mockery/mockery": "^0.9.4" + "phpunit/phpunit": ">=4.2 <5.0.0|>=5.0 <6.0.0", + "mockery/mockery": ">=0.9.4 <0.10.0" }, "autoload": { "psr-4": { From 5c8a81b4732b6e36715a34f8070006b0ea664bc8 Mon Sep 17 00:00:00 2001 From: kablanfatih Date: Wed, 6 Nov 2019 14:27:08 +0300 Subject: [PATCH 2/4] composer.json update for laravel6 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index fed36e2..7aae287 100644 --- a/composer.json +++ b/composer.json @@ -18,10 +18,10 @@ ], "require": { "php": ">=5.4.0", - "illuminate/database": ">=4.2 <5.0.0|>=5.0 <6.0.0", - "illuminate/config": ">=4.2 <5.0.0|>=5 <6.0.0", - "nesbot/carbon": ">=1.0 <2.0.0|>=2.0 <3.0.0", - "elasticsearch/elasticsearch": ">=6.1 <7.0.0" + "illuminate/database": "6.5.*", + "illuminate/config": "6.5.*", + "nesbot/carbon": "2.26.*", + "elasticsearch/elasticsearch": "7.3.*" }, "require-dev": { "phpunit/phpunit": ">=4.2 <5.0.0|>=5.0 <6.0.0", From 0e45c46ffd188f4d4103a771f950876983fadd8a Mon Sep 17 00:00:00 2001 From: kablanfatih Date: Wed, 6 Nov 2019 14:40:41 +0300 Subject: [PATCH 3/4] composer.json update for laravel 6 and merge --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 7aae287..d57ffb4 100644 --- a/composer.json +++ b/composer.json @@ -18,14 +18,14 @@ ], "require": { "php": ">=5.4.0", - "illuminate/database": "6.5.*", - "illuminate/config": "6.5.*", - "nesbot/carbon": "2.26.*", - "elasticsearch/elasticsearch": "7.3.*" + "illuminate/database": "~4.2|^6.5.0", + "illuminate/config": "~4.2|^6.5.0", + "nesbot/carbon": "~1.0|~2", + "elasticsearch/elasticsearch": "~4.2|^7.3.0" }, "require-dev": { - "phpunit/phpunit": ">=4.2 <5.0.0|>=5.0 <6.0.0", - "mockery/mockery": ">=0.9.4 <0.10.0" + "phpunit/phpunit": "~4.2|^8.4.3", + "mockery/mockery": "^0.9.4|^1.2.4" }, "autoload": { "psr-4": { From 2c3ff646534035d75436ebd4fb00d4c913f56386 Mon Sep 17 00:00:00 2001 From: kablanfatih Date: Fri, 27 Mar 2020 16:21:59 +0300 Subject: [PATCH 4/4] composer.json update for laravel 7 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index d57ffb4..42a865d 100644 --- a/composer.json +++ b/composer.json @@ -18,10 +18,10 @@ ], "require": { "php": ">=5.4.0", - "illuminate/database": "~4.2|^6.5.0", - "illuminate/config": "~4.2|^6.5.0", - "nesbot/carbon": "~1.0|~2", - "elasticsearch/elasticsearch": "~4.2|^7.3.0" + "illuminate/database": "7.3.0", + "illuminate/config": "7.3.0", + "nesbot/carbon": "2.32.0", + "elasticsearch/elasticsearch": "~4.2|^7.6.0" }, "require-dev": { "phpunit/phpunit": "~4.2|^8.4.3",