From d0eb14446cbdf48a46956299eb45a500048087ee Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Wed, 20 Jan 2021 21:25:09 -0800 Subject: [PATCH] Bump query builder to support PHP 8 --- composer.json | 2 +- composer.lock | 28 +++++++++++++++------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index ed463811..11eff9a4 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "psy/psysh": "^0.10", "s1lentium/iptools": "^1.1", "spatie/laravel-fractal": "^5.8", - "spatie/laravel-query-builder": "^2.8", + "spatie/laravel-query-builder": "^3.3", "staudenmeir/belongs-to-through": "^2.11", "symfony/yaml": "^4.4", "webmozart/assert": "^1.9" diff --git a/composer.lock b/composer.lock index de51b8e0..b82b2865 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "47ce788551352ef0f38290c53bce29dd", + "content-hash": "3a6d2d4bb3b6143069fb2211839bdd78", "packages": [ { "name": "appstract/laravel-blade-directives", @@ -3919,28 +3919,30 @@ }, { "name": "spatie/laravel-query-builder", - "version": "2.8.4", + "version": "3.3.4", "source": { "type": "git", "url": "https://github.com/spatie/laravel-query-builder.git", - "reference": "377cdd397a0d424146c39b92a36a851f95587842" + "reference": "2e131b0c8ae600b6e3aabb5a1501c721862a0b8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-query-builder/zipball/377cdd397a0d424146c39b92a36a851f95587842", - "reference": "377cdd397a0d424146c39b92a36a851f95587842", + "url": "https://api.github.com/repos/spatie/laravel-query-builder/zipball/2e131b0c8ae600b6e3aabb5a1501c721862a0b8f", + "reference": "2e131b0c8ae600b6e3aabb5a1501c721862a0b8f", "shasum": "" }, "require": { - "illuminate/database": "~5.6.34|~5.7.0|~5.8.0|^6.0|^7.0|^8.0", - "illuminate/http": "~5.6.34|~5.7.0|~5.8.0|^6.0|^7.0|^8.0", - "illuminate/support": "~5.6.34|~5.7.0|~5.8.0|^6.0|^7.0|^8.0", - "php": "^7.1" + "illuminate/database": "^6.0|^7.0|^8.0", + "illuminate/http": "^6.0|^7.0|^8.0", + "illuminate/support": "^6.0|^7.0|^8.0", + "php": "^7.3|^8.0" }, "require-dev": { "ext-json": "*", - "orchestra/testbench": "~3.6.0|~3.7.0|~3.8.0|^4.0|^5.0|^6.0", - "phpunit/phpunit": "^7.0|^8.0|^9.0" + "laravel/legacy-factories": "^1.0.4", + "mockery/mockery": "^1.4", + "orchestra/testbench": "^4.9|^5.8|^6.3", + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { @@ -3983,7 +3985,7 @@ "type": "custom" } ], - "time": "2020-09-08T22:41:35+00:00" + "time": "2020-11-26T14:51:30+00:00" }, { "name": "staudenmeir/belongs-to-through", @@ -11134,7 +11136,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^7.3|^8.0", + "php": "^7.4 | ^8.0", "ext-json": "*", "ext-mbstring": "*", "ext-pdo_mysql": "*",