From e1146f2e30808f06a85d4253daceb6807a126a29 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 18 Mar 2019 14:41:16 +0100 Subject: [PATCH] Update nunomaduro/collision (v2.1.1 => v3.0.1) --- Changelog | 1 + composer.json | 2 +- composer.lock | 18 +++++++++--------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Changelog b/Changelog index 9999b217f..318ec0c4c 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-03-18 DariusIII + * Chg: Update nunomaduro/collision (v2.1.1 => v3.0.1) * Chg: Update package.json * Chg: Remove casting $this->_release into array on line 2204 of PPA class * Chg: Don't send activation emails if site email is not set diff --git a/composer.json b/composer.json index 02428bb20..7a66c8862 100755 --- a/composer.json +++ b/composer.json @@ -165,7 +165,7 @@ "laracasts/generators": "dev-master", "mockery/mockery": "^1.0", "moontoast/math": "^1.1", - "nunomaduro/collision": "^2.0", + "nunomaduro/collision": "^3.0", "nunomaduro/larastan": "^0.3.4", "php-coveralls/php-coveralls": "^2.0", "phpunit/phpunit": "^7.0" diff --git a/composer.lock b/composer.lock index 447209810..63f73ed19 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": "4ff940957b38ce5d13e2680b2314f142", + "content-hash": "4ebc0ef8b07f787ce1f46a1ac3989204", "packages": [ { "name": "aharen/omdbapi", @@ -9839,16 +9839,16 @@ }, { "name": "nunomaduro/collision", - "version": "v2.1.1", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "b5feb0c0d92978ec7169232ce5d70d6da6b29f63" + "reference": "af42d339fe2742295a54f6fdd42aaa6f8c4aca68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/b5feb0c0d92978ec7169232ce5d70d6da6b29f63", - "reference": "b5feb0c0d92978ec7169232ce5d70d6da6b29f63", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/af42d339fe2742295a54f6fdd42aaa6f8c4aca68", + "reference": "af42d339fe2742295a54f6fdd42aaa6f8c4aca68", "shasum": "" }, "require": { @@ -9858,10 +9858,10 @@ "symfony/console": "~2.8|~3.3|~4.0" }, "require-dev": { - "laravel/framework": "5.7.*", + "laravel/framework": "5.8.*", "nunomaduro/larastan": "^0.3.0", - "phpstan/phpstan": "^0.10", - "phpunit/phpunit": "~7.3" + "phpstan/phpstan": "^0.11", + "phpunit/phpunit": "~8.0" }, "type": "library", "extra": { @@ -9899,7 +9899,7 @@ "php", "symfony" ], - "time": "2018-11-21T21:40:54+00:00" + "time": "2019-03-07T21:35:13+00:00" }, { "name": "nunomaduro/larastan",