From 7b4d6299ef03fbc5263a0832ce68c92a80ec82e1 Mon Sep 17 00:00:00 2001 From: Anwar Date: Wed, 31 Oct 2018 01:08:00 +0600 Subject: [PATCH 1/3] updated laravel v5.5, v5.6 and v5.7 --- app/Authentication/Commands/InstallCommand.php | 5 +++++ app/Library/Form/FormModel.php | 1 + composer.json | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Authentication/Commands/InstallCommand.php b/app/Authentication/Commands/InstallCommand.php index 2bd70aa..7ccb22e 100755 --- a/app/Authentication/Commands/InstallCommand.php +++ b/app/Authentication/Commands/InstallCommand.php @@ -47,4 +47,9 @@ public function fire() $this->info('## Laravel Authentication ACL Installed successfully ##'); } + + public function handle() + { + $this->fire(); + } } diff --git a/app/Library/Form/FormModel.php b/app/Library/Form/FormModel.php index 11c0623..7966149 100755 --- a/app/Library/Form/FormModel.php +++ b/app/Library/Form/FormModel.php @@ -13,6 +13,7 @@ use LaravelAcl\Library\Exceptions\NotFoundException; use LaravelAcl\Authentication\Exceptions\PermissionException; use Event; +use LaravelAcl\Library\Form\formInterface as FormInterface; class FormModel implements FormInterface{ diff --git a/composer.json b/composer.json index 485f440..abf1d37 100755 --- a/composer.json +++ b/composer.json @@ -19,8 +19,8 @@ "license": "MIT", "type": "project", "require": { - "laravel/framework": "5.4.*", - "laravelcollective/html" : "5.4.*", + "laravel/framework": ">=5.5.0", + "laravelcollective/html": ">=5.5.0", "intervention/image": "2.*", "jacopo/authentication-sentry": "3.0.7", "gregwar/captcha": "1.1.1" From 75d635b14a1a138bedf466daa4caa3ea077e3ac5 Mon Sep 17 00:00:00 2001 From: Anwar Date: Tue, 13 Nov 2018 00:12:36 +0600 Subject: [PATCH 2/3] bug fixing --- .travis.yml | 3 +-- composer.json | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 10026f2..0a85756 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php -php: - - 5.6 +php: - 7.0 - 7.1 diff --git a/composer.json b/composer.json index abf1d37..59cb6e5 100755 --- a/composer.json +++ b/composer.json @@ -19,14 +19,14 @@ "license": "MIT", "type": "project", "require": { - "laravel/framework": ">=5.5.0", - "laravelcollective/html": ">=5.5.0", + "laravel/framework": "5.5.0", + "laravelcollective/html": "5.5.0", "intervention/image": "2.*", "jacopo/authentication-sentry": "3.0.7", "gregwar/captcha": "1.1.1" }, "require-dev": { - "phpunit/phpunit": "~5.7", + "phpunit/phpunit": "~7.0", "mockery/mockery": "0.9.*", "fzaninotto/faker": "~1.4", "sebastian/exporter": "^2.0" From e9a7f5ac6d97e05c9afe5d159c4d037d30ac75a0 Mon Sep 17 00:00:00 2001 From: Anwar Date: Tue, 13 Nov 2018 00:20:30 +0600 Subject: [PATCH 3/3] composer js updated --- composer.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 59cb6e5..54d3fe1 100755 --- a/composer.json +++ b/composer.json @@ -26,10 +26,11 @@ "gregwar/captcha": "1.1.1" }, "require-dev": { - "phpunit/phpunit": "~7.0", - "mockery/mockery": "0.9.*", + "filp/whoops": "~2.0", "fzaninotto/faker": "~1.4", - "sebastian/exporter": "^2.0" + "mockery/mockery": "~1.0", + "phpunit/phpunit": "~6.0", + "symfony/thanks": "^1.0" }, "autoload": { "classmap": [