From ce8994917f5dd498ef458e0d336378a6c33bb750 Mon Sep 17 00:00:00 2001 From: Nicolas Widart Date: Sat, 2 Sep 2017 11:35:29 +0200 Subject: [PATCH] Updating dependencies for laravel 5.5 --- Modules/Core/composer.json | 12 ++++++------ Modules/Media/composer.json | 6 +++--- Modules/Menu/composer.json | 8 ++++---- Modules/Page/composer.json | 6 +++--- Modules/Setting/composer.json | 6 +++--- Modules/Tag/composer.json | 8 ++++---- Modules/Translation/composer.json | 6 +++--- Modules/User/composer.json | 6 +++--- .../Workshop/Scaffold/Module/ModuleScaffold.php | 8 ++++---- Modules/Workshop/composer.json | 6 +++--- composer.json | 14 ++++++++------ 11 files changed, 44 insertions(+), 42 deletions(-) diff --git a/Modules/Core/composer.json b/Modules/Core/composer.json index 341586182..3cfeee44c 100644 --- a/Modules/Core/composer.json +++ b/Modules/Core/composer.json @@ -20,19 +20,19 @@ "source": "https://github.com/AsgardCms/Core" }, "require": { - "php": ">=5.6", + "php": ">=7.0.0", "composer/installers": "~1.0", - "nwidart/laravel-modules": "~1.0", - "laravelcollective/html": "~5.4.0", + "nwidart/laravel-modules": "~2.0", + "laravelcollective/html": "~5.5.0", "laracasts/presenter": "~0.2", - "dimsav/laravel-translatable": "~7.0", + "dimsav/laravel-translatable": "~8.0", "mcamara/laravel-localization": "~1.1", "floatingpoint/stylist": "~0.5", "maatwebsite/laravel-sidebar": "~2.1" }, "require-dev": { - "phpunit/phpunit": "~5.7", - "orchestra/testbench": "3.4.*", + "phpunit/phpunit": "~6.0", + "orchestra/testbench": "3.5.*", "mockery/mockery": "^0.9.4", "phpro/grumphp": "^0.9.1", "friendsofphp/php-cs-fixer": "^1.11" diff --git a/Modules/Media/composer.json b/Modules/Media/composer.json index 9a9226355..e3ca62ea3 100644 --- a/Modules/Media/composer.json +++ b/Modules/Media/composer.json @@ -24,15 +24,15 @@ "source": "https://github.com/AsgardCms/Media" }, "require": { - "php": ">=5.5", + "php": ">=7.0.0", "composer/installers": "~1.0", "intervention/image": "^2.3", "idavoll/tag-module": "~3.0", "guzzlehttp/psr7": "^1.3" }, "require-dev": { - "phpunit/phpunit": "~5.7", - "orchestra/testbench": "3.4.*", + "phpunit/phpunit": "~6.0", + "orchestra/testbench": "3.5.*", "league/flysystem-aws-s3-v3": "~1.0", "mockery/mockery": "^0.9.5", "phpro/grumphp": "^0.9.1", diff --git a/Modules/Menu/composer.json b/Modules/Menu/composer.json index 349b10a69..556112c9b 100644 --- a/Modules/Menu/composer.json +++ b/Modules/Menu/composer.json @@ -22,14 +22,14 @@ "source": "https://github.com/AsgardCms/Menu" }, "require": { - "php": ">=5.6", + "php": ">=7.0.0", "composer/installers": "~1.0", - "nwidart/laravel-menus": "~0.2", + "nwidart/laravel-menus": "~1.0", "typicms/nestablecollection": "1.1.1" }, "require-dev": { - "phpunit/phpunit": "~5.7", - "orchestra/testbench": "3.4.*", + "phpunit/phpunit": "~6.0", + "orchestra/testbench": "3.5.*", "fzaninotto/faker": "1.4.0", "doctrine/dbal": "~2.5", "idavoll/page-module": "~2.0" diff --git a/Modules/Page/composer.json b/Modules/Page/composer.json index d4e922c73..cdf0eb4f5 100644 --- a/Modules/Page/composer.json +++ b/Modules/Page/composer.json @@ -20,13 +20,13 @@ "source": "https://github.com/AsgardCms/Page" }, "require": { - "php": ">=5.6", + "php": ">=7.0.0", "composer/installers": "~1.0", "idavoll/tag-module": "~3.0" }, "require-dev": { - "phpunit/phpunit": "~5.7", - "orchestra/testbench": "3.4.*", + "phpunit/phpunit": "~6.0", + "orchestra/testbench": "3.5.*", "phpro/grumphp": "^0.9.1", "friendsofphp/php-cs-fixer": "^1.11" }, diff --git a/Modules/Setting/composer.json b/Modules/Setting/composer.json index b31b61ac4..430d913ec 100644 --- a/Modules/Setting/composer.json +++ b/Modules/Setting/composer.json @@ -20,13 +20,13 @@ "source": "https://github.com/AsgardCms/Setting" }, "require": { - "php": ">=5.6", + "php": ">=7.0.0", "composer/installers": "~1.0", "doctrine/dbal": "~2.5" }, "require-dev": { - "phpunit/phpunit": "~5.7", - "orchestra/testbench": "3.4.*", + "phpunit/phpunit": "~6.0", + "orchestra/testbench": "3.5.*", "phpro/grumphp": "^0.9.1", "friendsofphp/php-cs-fixer": "^1.11" }, diff --git a/Modules/Tag/composer.json b/Modules/Tag/composer.json index 1c3f09e1d..897256a57 100644 --- a/Modules/Tag/composer.json +++ b/Modules/Tag/composer.json @@ -15,13 +15,13 @@ } ], "require": { - "php": ">=5.6", + "php": ">=7.0.0", "composer/installers": "~1.0" }, "require-dev": { - "phpunit/phpunit": "~5.7", - "orchestra/testbench": "3.4.*", - "idavoll/page-module": "~2.0", + "phpunit/phpunit": "~6.0", + "orchestra/testbench": "3.5.*", + "idavoll/page-module": "~3.0", "phpro/grumphp": "^0.9.1", "friendsofphp/php-cs-fixer": "^1.11" }, diff --git a/Modules/Translation/composer.json b/Modules/Translation/composer.json index 997348d17..eb13ac232 100644 --- a/Modules/Translation/composer.json +++ b/Modules/Translation/composer.json @@ -4,14 +4,14 @@ "type": "asgard-module", "license": "MIT", "require": { - "php": ">=5.6.4", + "php": ">=7.0.0", "composer/installers": "~1.0", "league/csv": "~7.2.0", "venturecraft/revisionable": "~1.0" }, "require-dev": { - "phpunit/phpunit": "~5.7", - "orchestra/testbench": "3.4.*", + "phpunit/phpunit": "~6.0", + "orchestra/testbench": "3.5.*", "phpro/grumphp": "^0.9.1", "friendsofphp/php-cs-fixer": "^1.11" }, diff --git a/Modules/User/composer.json b/Modules/User/composer.json index 9ed401de6..660cbcf7c 100644 --- a/Modules/User/composer.json +++ b/Modules/User/composer.json @@ -22,13 +22,13 @@ "source": "https://github.com/AsgardCms/User" }, "require": { - "php": ">=5.6", + "php": ">=7.0.0", "composer/installers": "~1.0", "ramsey/uuid": "^3.4" }, "require-dev": { - "phpunit/phpunit": "~5.7", - "orchestra/testbench": "3.4.*", + "phpunit/phpunit": "~6.0", + "orchestra/testbench": "3.5.*", "scrutinizer/ocular": "~1.1", "fzaninotto/faker": "~1.5", "mockery/mockery": "^0.9.4", diff --git a/Modules/Workshop/Scaffold/Module/ModuleScaffold.php b/Modules/Workshop/Scaffold/Module/ModuleScaffold.php index 05becf506..518c06d50 100644 --- a/Modules/Workshop/Scaffold/Module/ModuleScaffold.php +++ b/Modules/Workshop/Scaffold/Module/ModuleScaffold.php @@ -303,13 +303,13 @@ private function addDataToComposerFile() "type": "asgard-module", "license": "MIT", "require": { - "php": ">=5.6", + "php": ">=7.0.0", "composer/installers": "~1.0", - "idavoll/core-module": "~2.0" + "idavoll/core-module": "~3.0" }, "require-dev": { - "phpunit/phpunit": "~5.7", - "orchestra/testbench": "3.4.*" + "phpunit/phpunit": "~6.0", + "orchestra/testbench": "3.5.*" }, "autoload-dev": { "psr-4": { diff --git a/Modules/Workshop/composer.json b/Modules/Workshop/composer.json index f4f7be9d1..8650769e2 100644 --- a/Modules/Workshop/composer.json +++ b/Modules/Workshop/composer.json @@ -21,13 +21,13 @@ "source": "https://github.com/AsgardCms/Workshop" }, "require": { - "php": ">=5.6", + "php": ">=7.0.0", "composer/installers": "~1.0", "symfony/yaml": "^3.0" }, "require-dev": { - "phpunit/phpunit": "~5.7", - "orchestra/testbench": "3.4.*", + "phpunit/phpunit": "~6.0", + "orchestra/testbench": "3.5.*", "phpro/grumphp": "^0.9.1", "friendsofphp/php-cs-fixer": "^1.11" }, diff --git a/composer.json b/composer.json index 29ba586d1..124b67571 100644 --- a/composer.json +++ b/composer.json @@ -11,9 +11,10 @@ "license": "MIT", "type": "project", "require": { - "php": ">=5.6.4", - "laravel/framework": "5.4.*", - "nwidart/laravel-modules": "~1.0", + "php": ">=7.0.0", + "fideloper/proxy": "~3.3", + "laravel/framework": "5.5.*", + "nwidart/laravel-modules": "~2.0", "cartalyst/sentinel": "~2.0", "idavoll/core-module": "~3.0", "idavoll/dashboard-module": "~3.0", @@ -32,11 +33,12 @@ "require-dev": { "fzaninotto/faker": "~1.4", "mockery/mockery": "0.9.*", - "phpunit/phpunit": "~5.7", + "phpunit/phpunit": "~6.0", + "filp/whoops": "~2.0", "symfony/css-selector": "3.1.*", "symfony/dom-crawler": "3.1.*", - "barryvdh/laravel-debugbar": "~2.3", - "orchestra/testbench": "^3.4", + "barryvdh/laravel-debugbar": "~3.0", + "orchestra/testbench": "^3.5", "league/flysystem-aws-s3-v3": "^1.0", "league/commonmark": "^0.15.4" },