diff --git a/.gitignore b/.gitignore index 4b2d5f8c..93765886 100755 --- a/.gitignore +++ b/.gitignore @@ -6,10 +6,10 @@ /public/uploads /public/themes/* /.idea +/framework Homestead.json Homestead.yaml -/framework composer.develop.json composer.develop.lock composer.lock diff --git a/composer.json b/composer.json index ca628809..5f01c70d 100755 --- a/composer.json +++ b/composer.json @@ -6,15 +6,13 @@ "type": "cms", "require": { "php": ">=5.6.4", - "laravel/framework": "5.3.*", - "lavalite/framework": "2.0.*" + "laravel/framework": "5.4.*", + "lavalite/framework": "2.1.*" }, "require-dev": { "fzaninotto/faker": "~1.4", "mockery/mockery": "0.9.*", - "phpunit/phpunit": "~5.0", - "symfony/css-selector": "3.1.*", - "symfony/dom-crawler": "3.1.*" + "phpunit/phpunit": "~5.0" }, "autoload": { "classmap": [ diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore old mode 100644 new mode 100755