From c84d18f91dbdf8185b35faab93226ce6eb415823 Mon Sep 17 00:00:00 2001 From: Fridzema Date: Tue, 10 Sep 2019 10:20:15 +0200 Subject: [PATCH 1/2] laravel 6 support --- composer.json | 66 +++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/composer.json b/composer.json index 15bf1e3..b8c0a14 100644 --- a/composer.json +++ b/composer.json @@ -1,36 +1,34 @@ { - "name": "liam-wiltshire/laravel-jit-loader", - "description": "Just In Time relationship loader for Laravel", - "license": "MIT", - "authors": [ - { - "name": "Liam Wiltshire", - "email": "liam@w.iltshi.re" - } - ], - "require": { - "php": ">=7.1.0", - "illuminate/database": "^5.5.0" - }, - "require-dev": { - "phpunit/phpunit": "^7.0.0", - "squizlabs/php_codesniffer" : "^3.0.0", - "phpunit/php-code-coverage": "^6.0.0", - "illuminate/log": "^5.5.0" - }, - "autoload": { - "psr-4": { - "LiamWiltshire\\LaravelJitLoader\\": "src/" - } - }, - "autoload-dev": { - "psr-4": { - "LiamWiltshire\\LaravelJitLoader\\Tests\\": "tests/" - } - }, - "scripts": { - "test": "phpunit", - "cs": "php-cs-fixer fix src/ --level=psr2" - }, - "minimum-stability": "stable" + "name": "liam-wiltshire/laravel-jit-loader", + "description": "Just In Time relationship loader for Laravel", + "license": "MIT", + "authors": [{ + "name": "Liam Wiltshire", + "email": "liam@w.iltshi.re" + }], + "require": { + "php": ">=7.1.0", + "illuminate/database": "^5.5.0" + }, + "require-dev": { + "phpunit/phpunit": "^7.0.0", + "squizlabs/php_codesniffer": "^3.0.0", + "phpunit/php-code-coverage": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0", + "illuminate/log": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0" + }, + "autoload": { + "psr-4": { + "LiamWiltshire\\LaravelJitLoader\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "LiamWiltshire\\LaravelJitLoader\\Tests\\": "tests/" + } + }, + "scripts": { + "test": "phpunit", + "cs": "php-cs-fixer fix src/ --level=psr2" + }, + "minimum-stability": "stable" } From 3f80346b07b60557c8773bc9f4388b77d185597b Mon Sep 17 00:00:00 2001 From: Fridzema Date: Tue, 10 Sep 2019 10:26:55 +0200 Subject: [PATCH 2/2] Laravel 6 support --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index b8c0a14..9c1bab7 100644 --- a/composer.json +++ b/composer.json @@ -8,12 +8,12 @@ }], "require": { "php": ">=7.1.0", - "illuminate/database": "^5.5.0" + "illuminate/database": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0" }, "require-dev": { "phpunit/phpunit": "^7.0.0", "squizlabs/php_codesniffer": "^3.0.0", - "phpunit/php-code-coverage": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0", + "phpunit/php-code-coverage": "^6.0.0", "illuminate/log": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0" }, "autoload": {