From cd2483e1b866503a7aeeb26a7ba38ec9b0112d70 Mon Sep 17 00:00:00 2001 From: Nenad Ticaric Date: Wed, 29 Apr 2020 15:25:02 +0200 Subject: [PATCH] update to laravel 6 --- composer.json | 53 +++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index f63566d3..12ac0df0 100644 --- a/composer.json +++ b/composer.json @@ -1,36 +1,31 @@ { "name": "zizaco/entrust", "description": "This package provides a flexible way to add Role-based Permissions to Laravel", - "keywords": ["laravel","illuminate","auth","roles","acl","permission"], + "keywords": ["laravel", "illuminate", "auth", "roles", "acl", "permission"], "license": "MIT", - "authors": [ - { - "name": "Zizaco Zizuini", - "email": "zizaco@gmail.com" - }, - { - "name": "Andrew Elkins", - "homepage": "http://andrewelkins.com" - }, - { - "name": "Ben Batschelet", - "homepage": "http://github.com/bbatsche" - }, - { - "name": "Michele Angioni", - "email": "michele.angioni@gmail.com" - } - ], + "authors": [{ + "name": "Zizaco Zizuini", + "email": "zizaco@gmail.com" + }, { + "name": "Andrew Elkins", + "homepage": "http://andrewelkins.com" + }, { + "name": "Ben Batschelet", + "homepage": "http://github.com/bbatsche" + }, { + "name": "Michele Angioni", + "email": "michele.angioni@gmail.com" + }], "require": { "php": ">=5.5.0", - "illuminate/console": "~5.0", - "illuminate/support": "~5.0", - "illuminate/cache": "~5.0" + "illuminate/console": "~6.0", + "illuminate/support": "~6.0", + "illuminate/cache": "~6.0" }, "require-dev": { - "phpunit/phpunit": "~4.1", + "phpunit/phpunit": "~9.0", "mockery/mockery": "dev-master", - "illuminate/database": "~5.0", + "illuminate/database": "~6.0", "sami/sami": "dev-master" }, "autoload": { @@ -41,12 +36,12 @@ "Zizaco\\Entrust\\": "src/Entrust/" } }, - "extra":{ - "laravel":{ - "providers":[ + "extra": { + "laravel": { + "providers": [ "Zizaco\\Entrust\\EntrustServiceProvider" ], - "aliases":{ + "aliases": { "Entrust": "Zizaco\\Entrust\\EntrustFacade" } } @@ -57,4 +52,4 @@ ] }, "minimum-stability": "dev" -} +} \ No newline at end of file