From ddfe84e86dd86b6841536e43e374ef3571cc924f Mon Sep 17 00:00:00 2001 From: Lucas Michot Date: Sun, 12 Apr 2020 23:46:51 +0200 Subject: [PATCH 1/2] Slim down composer dependencies. --- composer.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 89b1d89609..5a88b23d90 100644 --- a/composer.json +++ b/composer.json @@ -25,28 +25,28 @@ "require": { "php": ">= 7.1", "ext-json": "*", - "illuminate/contracts": "5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0", - "illuminate/http": "5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0", - "illuminate/pagination": "5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0", - "illuminate/routing": "5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0", - "illuminate/support": "5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0", - "illuminate/validation": "5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0", + "illuminate/contracts": "^5.5|^5.6|^5.7|^5.8|^6.0|^7.0", + "illuminate/http": "^5.5|^5.6|^5.7|^5.8|^6.0|^7.0", + "illuminate/pagination": "^5.5|^5.6|^5.7|^5.8|^6.0|^7.0", + "illuminate/routing": "^5.5|^5.6|^5.7|^5.8|^6.0|^7.0", + "illuminate/support": "^5.5|^5.6|^5.7|^5.8|^6.0|^7.0", + "illuminate/validation": "^5.5|^5.6|^5.7|^5.8|^6.0|^7.0", "webonyx/graphql-php": "^0.13.2" }, "require-dev": { "bensampo/laravel-enum": "^1.28.3", "ergebnis/composer-normalize": "^2.2.2", "haydenpierce/class-finder": "^0.4", - "laravel/framework": "5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0", - "laravel/lumen-framework": "5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0", - "laravel/scout": "^4.0 || ^5.0 || ^6.0 || ^7.0", + "laravel/framework": "^5.5|^5.6|^5.7|^5.8|^6.0|^7.0", + "laravel/lumen-framework": "^5.5|^5.6|^5.7|^5.8|^6.0|^7.0", + "laravel/scout": "^4.0|^5.0|^6.0|^7.0", "mll-lab/graphql-php-scalars": "^2.1", "mockery/mockery": "^1.0", - "nunomaduro/larastan": "^0.4.3 || ^0.5.2", - "orchestra/database": "3.5.* || 3.6.* || 3.7.* || 3.8.* || 3.9.* || ^4.0 || ^5.0", - "orchestra/testbench": "3.5.* || 3.6.* || 3.7.* || 3.8.* || 3.9.* || ^4.0 || ^5.0", + "nunomaduro/larastan": "^0.4.3|^0.5.2", + "orchestra/database": "^3.5|^3.6|^3.7|^3.8|^3.9|^4.0|^5.0", + "orchestra/testbench": "^3.5|^3.6|^3.7|^3.8|^3.9|^4.0|^5.0", "phpbench/phpbench": "@dev", - "phpunit/phpunit": "^6.5 || ^7.5 || ^8.4", + "phpunit/phpunit": "^6.5|^7.5|^8.4", "pusher/pusher-php-server": "^3.2" }, "suggest": { @@ -63,8 +63,8 @@ "laravel": { "providers": [ "Nuwave\\Lighthouse\\LighthouseServiceProvider", - "Nuwave\\Lighthouse\\SoftDeletes\\SoftDeletesServiceProvider", - "Nuwave\\Lighthouse\\OrderBy\\OrderByServiceProvider" + "Nuwave\\Lighthouse\\OrderBy\\OrderByServiceProvider", + "Nuwave\\Lighthouse\\SoftDeletes\\SoftDeletesServiceProvider" ], "aliases": { "graphql": "Nuwave\\Lighthouse\\GraphQL" From 248c522e4ee651d6eede6b49f017b20686dbdc08 Mon Sep 17 00:00:00 2001 From: Lucas Michot Date: Sun, 12 Apr 2020 23:55:32 +0200 Subject: [PATCH 2/2] Fix composer normalizer. --- composer.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 5a88b23d90..43b66b2895 100644 --- a/composer.json +++ b/composer.json @@ -25,28 +25,28 @@ "require": { "php": ">= 7.1", "ext-json": "*", - "illuminate/contracts": "^5.5|^5.6|^5.7|^5.8|^6.0|^7.0", - "illuminate/http": "^5.5|^5.6|^5.7|^5.8|^6.0|^7.0", - "illuminate/pagination": "^5.5|^5.6|^5.7|^5.8|^6.0|^7.0", - "illuminate/routing": "^5.5|^5.6|^5.7|^5.8|^6.0|^7.0", - "illuminate/support": "^5.5|^5.6|^5.7|^5.8|^6.0|^7.0", - "illuminate/validation": "^5.5|^5.6|^5.7|^5.8|^6.0|^7.0", + "illuminate/contracts": "^5.5 || ^5.6 || ^5.7 || ^5.8 || ^6.0 || ^7.0", + "illuminate/http": "^5.5 || ^5.6 || ^5.7 || ^5.8 || ^6.0 || ^7.0", + "illuminate/pagination": "^5.5 || ^5.6 || ^5.7 || ^5.8 || ^6.0 || ^7.0", + "illuminate/routing": "^5.5 || ^5.6 || ^5.7 || ^5.8 || ^6.0 || ^7.0", + "illuminate/support": "^5.5 || ^5.6 || ^5.7 || ^5.8 || ^6.0 || ^7.0", + "illuminate/validation": "^5.5 || ^5.6 || ^5.7 || ^5.8 || ^6.0 || ^7.0", "webonyx/graphql-php": "^0.13.2" }, "require-dev": { "bensampo/laravel-enum": "^1.28.3", "ergebnis/composer-normalize": "^2.2.2", "haydenpierce/class-finder": "^0.4", - "laravel/framework": "^5.5|^5.6|^5.7|^5.8|^6.0|^7.0", - "laravel/lumen-framework": "^5.5|^5.6|^5.7|^5.8|^6.0|^7.0", - "laravel/scout": "^4.0|^5.0|^6.0|^7.0", + "laravel/framework": "^5.5 || ^5.6 || ^5.7 || ^5.8 || ^6.0 || ^7.0", + "laravel/lumen-framework": "^5.5 || ^5.6 || ^5.7 || ^5.8 || ^6.0 || ^7.0", + "laravel/scout": "^4.0 || ^5.0 || ^6.0 || ^7.0", "mll-lab/graphql-php-scalars": "^2.1", "mockery/mockery": "^1.0", - "nunomaduro/larastan": "^0.4.3|^0.5.2", - "orchestra/database": "^3.5|^3.6|^3.7|^3.8|^3.9|^4.0|^5.0", - "orchestra/testbench": "^3.5|^3.6|^3.7|^3.8|^3.9|^4.0|^5.0", + "nunomaduro/larastan": "^0.4.3 || ^0.5.2", + "orchestra/database": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^3.9 || ^4.0 || ^5.0", + "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^3.9 || ^4.0 || ^5.0", "phpbench/phpbench": "@dev", - "phpunit/phpunit": "^6.5|^7.5|^8.4", + "phpunit/phpunit": "^6.5 || ^7.5 || ^8.4", "pusher/pusher-php-server": "^3.2" }, "suggest": {