From 9c680efaad1e116be926968f6f329e97d00b4c47 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 4 Nov 2021 22:29:36 +0000
Subject: [PATCH] Updated php packages, Added php8.1 to GH actions
---
.github/workflows/phpunit.yml | 4 +-
.github/workflows/test-migrations.yml | 4 +-
composer.json | 12 ++---
composer.lock | 73 ++++++++++++++-------------
4 files changed, 47 insertions(+), 46 deletions(-)
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index f12de6436..7cb1307a1 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -13,12 +13,12 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
- php: ['7.3', '7.4', '8.0']
+ php: ['7.3', '7.4', '8.0', '8.1']
steps:
- uses: actions/checkout@v1
- name: Setup PHP
- uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
+ uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: gd, mbstring, json, curl, xml, mysql, ldap
diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml
index c24a01984..846992e7b 100644
--- a/.github/workflows/test-migrations.yml
+++ b/.github/workflows/test-migrations.yml
@@ -13,12 +13,12 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
- php: ['7.3', '7.4', '8.0']
+ php: ['7.3', '7.4', '8.0', '8.1']
steps:
- uses: actions/checkout@v1
- name: Setup PHP
- uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
+ uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: gd, mbstring, json, curl, xml, mysql, ldap
diff --git a/composer.json b/composer.json
index c4d9cd904..23ce97cd4 100644
--- a/composer.json
+++ b/composer.json
@@ -25,9 +25,9 @@
"intervention/image": "^2.7",
"laravel/framework": "^8.68",
"laravel/socialite": "^5.2",
- "laravel/tinker": "^2.5",
+ "laravel/tinker": "^2.6",
"laravel/ui": "^3.3",
- "league/commonmark": "^1.5",
+ "league/commonmark": "^1.6",
"league/flysystem-aws-s3-v3": "^1.0.29",
"league/html-to-markdown": "^5.0.0",
"league/oauth2-client": "^2.6",
@@ -44,12 +44,12 @@
"ssddanbrown/htmldiff": "^1.0.1"
},
"require-dev": {
- "fakerphp/faker": "^1.13.0",
+ "fakerphp/faker": "^1.16",
"itsgoingd/clockwork": "^5.1",
- "mockery/mockery": "^1.4.2",
- "phpunit/phpunit": "^9.5.3",
+ "mockery/mockery": "^1.4",
+ "phpunit/phpunit": "^9.5",
"symfony/dom-crawler": "^5.3",
- "nunomaduro/collision": "^5.0"
+ "nunomaduro/collision": "^5.10"
},
"autoload": {
"psr-4": {
diff --git a/composer.lock b/composer.lock
index 7231c82c4..005f30fa3 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": "0dfe612653577a14906a0bb031c67a97",
+ "content-hash": "48be80b0326176faa9775dca18a00fa2",
"packages": [
{
"name": "aws/aws-crt-php",
@@ -58,16 +58,16 @@
},
{
"name": "aws/aws-sdk-php",
- "version": "3.199.7",
+ "version": "3.200.0",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "fda176884d2952cffc7e67209470bff49609339c"
+ "reference": "9b3f45c51fe1d07845446675109bb0a8a98c806e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fda176884d2952cffc7e67209470bff49609339c",
- "reference": "fda176884d2952cffc7e67209470bff49609339c",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/9b3f45c51fe1d07845446675109bb0a8a98c806e",
+ "reference": "9b3f45c51fe1d07845446675109bb0a8a98c806e",
"shasum": ""
},
"require": {
@@ -143,9 +143,9 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
- "source": "https://github.com/aws/aws-sdk-php/tree/3.199.7"
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.200.0"
},
- "time": "2021-10-29T18:25:02+00:00"
+ "time": "2021-11-04T18:42:25+00:00"
},
{
"name": "bacon/bacon-qr-code",
@@ -1843,16 +1843,16 @@
},
{
"name": "laravel/framework",
- "version": "v8.68.1",
+ "version": "v8.69.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "abe985ff1fb82dd04aab03bc1dc56e83fe61a59f"
+ "reference": "545181da688db64fed6d8427e55f630a90ca0d32"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/abe985ff1fb82dd04aab03bc1dc56e83fe61a59f",
- "reference": "abe985ff1fb82dd04aab03bc1dc56e83fe61a59f",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/545181da688db64fed6d8427e55f630a90ca0d32",
+ "reference": "545181da688db64fed6d8427e55f630a90ca0d32",
"shasum": ""
},
"require": {
@@ -2011,7 +2011,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2021-10-27T12:31:46+00:00"
+ "time": "2021-11-02T13:53:22+00:00"
},
{
"name": "laravel/serializable-closure",
@@ -2211,16 +2211,16 @@
},
{
"name": "laravel/ui",
- "version": "v3.3.0",
+ "version": "v3.3.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/ui.git",
- "reference": "07d725813350c695c779382cbd6dac0ab8665537"
+ "reference": "a449e3364d9780a80a49894a3af9795c85af806f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/ui/zipball/07d725813350c695c779382cbd6dac0ab8665537",
- "reference": "07d725813350c695c779382cbd6dac0ab8665537",
+ "url": "https://api.github.com/repos/laravel/ui/zipball/a449e3364d9780a80a49894a3af9795c85af806f",
+ "reference": "a449e3364d9780a80a49894a3af9795c85af806f",
"shasum": ""
},
"require": {
@@ -2263,9 +2263,9 @@
"ui"
],
"support": {
- "source": "https://github.com/laravel/ui/tree/v3.3.0"
+ "source": "https://github.com/laravel/ui/tree/v3.3.1"
},
- "time": "2021-05-25T16:45:33+00:00"
+ "time": "2021-11-02T17:04:20+00:00"
},
{
"name": "league/commonmark",
@@ -2966,16 +2966,16 @@
},
{
"name": "nesbot/carbon",
- "version": "2.53.1",
+ "version": "2.54.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "f4655858a784988f880c1b8c7feabbf02dfdf045"
+ "reference": "eed83939f1aed3eee517d03a33f5ec587ac529b5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f4655858a784988f880c1b8c7feabbf02dfdf045",
- "reference": "f4655858a784988f880c1b8c7feabbf02dfdf045",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/eed83939f1aed3eee517d03a33f5ec587ac529b5",
+ "reference": "eed83939f1aed3eee517d03a33f5ec587ac529b5",
"shasum": ""
},
"require": {
@@ -2986,6 +2986,7 @@
"symfony/translation": "^3.4 || ^4.0 || ^5.0"
},
"require-dev": {
+ "doctrine/dbal": "^2.0 || ^3.0",
"doctrine/orm": "^2.7",
"friendsofphp/php-cs-fixer": "^3.0",
"kylekatarnls/multi-tester": "^2.0",
@@ -3056,20 +3057,20 @@
"type": "tidelift"
}
],
- "time": "2021-09-06T09:29:23+00:00"
+ "time": "2021-11-01T21:22:20+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v4.13.0",
+ "version": "v4.13.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "50953a2691a922aa1769461637869a0a2faa3f53"
+ "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/50953a2691a922aa1769461637869a0a2faa3f53",
- "reference": "50953a2691a922aa1769461637869a0a2faa3f53",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/63a79e8daa781cac14e5195e63ed8ae231dd10fd",
+ "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd",
"shasum": ""
},
"require": {
@@ -3110,9 +3111,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.0"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.1"
},
- "time": "2021-09-20T12:20:58+00:00"
+ "time": "2021-11-03T20:52:16+00:00"
},
{
"name": "onelogin/php-saml",
@@ -7681,22 +7682,22 @@
},
{
"name": "itsgoingd/clockwork",
- "version": "v5.1.0",
+ "version": "v5.1.1",
"source": {
"type": "git",
"url": "https://github.com/itsgoingd/clockwork.git",
- "reference": "b963dee47429a49c9669981cfa9a8362ce209278"
+ "reference": "2daf30fa6dfc5a1ccfdb2142df59243a72c473d8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/b963dee47429a49c9669981cfa9a8362ce209278",
- "reference": "b963dee47429a49c9669981cfa9a8362ce209278",
+ "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/2daf30fa6dfc5a1ccfdb2142df59243a72c473d8",
+ "reference": "2daf30fa6dfc5a1ccfdb2142df59243a72c473d8",
"shasum": ""
},
"require": {
"ext-json": "*",
"php": ">=5.6",
- "psr/log": "1.*"
+ "psr/log": "1.* || ^2.0"
},
"type": "library",
"extra": {
@@ -7738,7 +7739,7 @@
],
"support": {
"issues": "https://github.com/itsgoingd/clockwork/issues",
- "source": "https://github.com/itsgoingd/clockwork/tree/v5.1.0"
+ "source": "https://github.com/itsgoingd/clockwork/tree/v5.1.1"
},
"funding": [
{
@@ -7746,7 +7747,7 @@
"type": "github"
}
],
- "time": "2021-08-07T23:04:17+00:00"
+ "time": "2021-11-01T17:38:35+00:00"
},
{
"name": "mockery/mockery",