Merge pull request #604 from mikemand/feature/laravel-57-upgrade
Upgrade to Laravel 5.7 and Laravel Modules 4.0
Showing
| ... | ... | @@ -12,11 +12,11 @@ |
| "type": "project", | ||
| "require": { | ||
| "php": "^7.1.3", | ||
| "fideloper/proxy": "~4.0", | ||
| "laravel/framework": "5.6.*", | ||
| "laravel/tinker": "~1.0", | ||
| "nwidart/laravel-modules": "~3.0", | ||
| "cartalyst/sentinel": "~2.0", | ||
| "fideloper/proxy": "^4.0", | ||
| "laravel/framework": "5.7.*", | ||
| "laravel/tinker": "^1.0", | ||
| "nwidart/laravel-modules": "^4.0", | ||
| "cartalyst/sentinel": "^2.0", | ||
| "idavoll/core-module": "4.0.x-dev", | ||
| "idavoll/dashboard-module": "4.0.x-dev", | ||
| "idavoll/user-module": "4.0.x-dev", | ||
| ... | ... | @@ -31,22 +31,22 @@ |
| "idavoll/adminlte-theme": "4.0.x-dev" | ||
| }, | ||
| "require-dev": { | ||
| "fzaninotto/faker": "~1.4", | ||
| "mockery/mockery": "0.9.*", | ||
| "phpunit/phpunit": "~7.0", | ||
| "filp/whoops": "~2.0", | ||
| "symfony/css-selector": "3.1.*", | ||
| "symfony/dom-crawler": "3.1.*", | ||
| "barryvdh/laravel-debugbar": "~3.1", | ||
| "orchestra/testbench": "3.6.*", | ||
| "beyondcode/laravel-dump-server": "^1.0", | ||
| "filp/whoops": "^2.0", | ||
| "fzaninotto/faker": "^1.4", | ||
| "mockery/mockery": "^1.0", | ||
| "barryvdh/laravel-debugbar": "^3.1", | ||
| "orchestra/testbench": "3.7.*", | ||
| "league/flysystem-aws-s3-v3": "^1.0", | ||
| "league/commonmark": "^0.15.4", | ||
| "predis/predis": "^1.1", | ||
| "nunomaduro/collision": "^2.0" | ||
| "nunomaduro/collision": "^2.0", | ||
| "phpunit/phpunit": "^7.0" | ||
| }, | ||
| "autoload": { | ||
| "classmap": [ | ||
| "database" | ||
| "database/seeds", | ||
| "database/factories" | ||
| ], | ||
| "psr-4": { | ||
| "App\\": "app/", | ||
| ... | ... | @@ -54,9 +54,18 @@ |
| } | ||
| }, | ||
| "autoload-dev": { | ||
| "classmap": [ | ||
| "tests/TestCase.php" | ||
| ] | ||
| "psr-4": { | ||
| "Tests\\": "tests/" | ||
| } | ||
| }, | ||
| "extra": { | ||
| "branch-alias": { | ||
| "dev-master": "4.0.x-dev" | ||
| }, | ||
| "laravel": { | ||
| "dont-discover": [ | ||
| ] | ||
| } | ||
| }, | ||
| "scripts": { | ||
| "post-install-cmd": [ | ||
| ... | ... | @@ -65,19 +74,13 @@ |
| "pre-update-cmd": [], | ||
| "post-autoload-dump": [ | ||
| "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", | ||
| "@php artisan package:discover" | ||
| "@php artisan package:discover --ansi" | ||
| ] | ||
| }, | ||
| "config": { | ||
| "preferred-install": "dist" | ||
| }, | ||
| "extra": { | ||
| "branch-alias": { | ||
| "dev-master": "4.0.x-dev" | ||
| }, | ||
| "laravel": { | ||
| "dont-discover": [] | ||
| } | ||
| "preferred-install": "dist", | ||
| "sort-packages": true, | ||
| "optimize-autoloader": true | ||
| }, | ||
| "minimum-stability": "dev", | ||
| "prefer-stable": true | ||
| ... | ... |
| ... | ... | @@ -3,11 +3,11 @@ |
| "scripts": { | ||
| "dev": "npm run development", | ||
| "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", | ||
| "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", | ||
| "watch": "npm run development -- --watch", | ||
| "watch-poll": "npm run watch -- --watch-poll", | ||
| "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", | ||
| "prod": "npm run production", | ||
| "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" | ||
| "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" | ||
| }, | ||
| "devDependencies": { | ||
| "babel-polyfill": "^6.26.0", | ||
| ... | ... |
public/svg/403.svg
0 → 100755
public/svg/404.svg
0 → 100755
public/svg/500.svg
0 → 100755
This diff is collapsed.
public/svg/503.svg
0 → 100755
routes/channels.php
0 → 100755
storage/framework/cache/.gitignore
100644 → 100755
Please register or sign in to comment