diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index b0ef05b8f..f12de6436 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -2,15 +2,11 @@ name: phpunit
on:
push:
- branches:
- - master
- - release
- - gh_actions_update
+ branches-ignore:
+ - l10n_master
pull_request:
- branches:
- - '*'
- - '*/*'
- - '!l10n_master'
+ branches-ignore:
+ - l10n_master
jobs:
build:
diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml
index 34aaf9c3f..c24a01984 100644
--- a/.github/workflows/test-migrations.yml
+++ b/.github/workflows/test-migrations.yml
@@ -2,15 +2,11 @@ name: test-migrations
on:
push:
- branches:
- - master
- - release
- - gh_actions_update
+ branches-ignore:
+ - l10n_master
pull_request:
- branches:
- - '*'
- - '*/*'
- - '!l10n_master'
+ branches-ignore:
+ - l10n_master
jobs:
build:
diff --git a/composer.lock b/composer.lock
index 29ec67fed..a9ba1b0a4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
"packages": [
{
"name": "aws/aws-sdk-php",
- "version": "3.185.6",
+ "version": "3.187.2",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "35310302912fdc3b4a0e829b84424c41e3fd9727"
+ "reference": "0ec4ae120cfae758efa3c283dc56eb20602f094c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/35310302912fdc3b4a0e829b84424c41e3fd9727",
- "reference": "35310302912fdc3b4a0e829b84424c41e3fd9727",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0ec4ae120cfae758efa3c283dc56eb20602f094c",
+ "reference": "0ec4ae120cfae758efa3c283dc56eb20602f094c",
"shasum": ""
},
"require": {
@@ -92,9 +92,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.185.6"
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.187.2"
},
- "time": "2021-07-02T18:13:18+00:00"
+ "time": "2021-08-04T18:12:21+00:00"
},
{
"name": "barryvdh/laravel-dompdf",
@@ -229,24 +229,23 @@
},
{
"name": "doctrine/cache",
- "version": "2.0.3",
+ "version": "2.1.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
- "reference": "c9622c6820d3ede1e2315a6a377ea1076e421d88"
+ "reference": "331b4d5dbaeab3827976273e9356b3b453c300ce"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/c9622c6820d3ede1e2315a6a377ea1076e421d88",
- "reference": "c9622c6820d3ede1e2315a6a377ea1076e421d88",
+ "url": "https://api.github.com/repos/doctrine/cache/zipball/331b4d5dbaeab3827976273e9356b3b453c300ce",
+ "reference": "331b4d5dbaeab3827976273e9356b3b453c300ce",
"shasum": ""
},
"require": {
"php": "~7.1 || ^8.0"
},
"conflict": {
- "doctrine/common": ">2.2,<2.4",
- "psr/cache": ">=3"
+ "doctrine/common": ">2.2,<2.4"
},
"require-dev": {
"alcaeus/mongo-php-adapter": "^1.1",
@@ -255,8 +254,9 @@
"mongodb/mongodb": "^1.1",
"phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
"predis/predis": "~1.0",
- "psr/cache": "^1.0 || ^2.0",
- "symfony/cache": "^4.4 || ^5.2"
+ "psr/cache": "^1.0 || ^2.0 || ^3.0",
+ "symfony/cache": "^4.4 || ^5.2 || ^6.0@dev",
+ "symfony/var-exporter": "^4.4 || ^5.2 || ^6.0@dev"
},
"suggest": {
"alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
@@ -308,7 +308,7 @@
],
"support": {
"issues": "https://github.com/doctrine/cache/issues",
- "source": "https://github.com/doctrine/cache/tree/2.0.3"
+ "source": "https://github.com/doctrine/cache/tree/2.1.1"
},
"funding": [
{
@@ -324,7 +324,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-25T09:43:04+00:00"
+ "time": "2021-07-17T14:49:29+00:00"
},
{
"name": "doctrine/dbal",
@@ -1017,16 +1017,16 @@
},
{
"name": "facade/ignition",
- "version": "1.17.0",
+ "version": "1.18.0",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition.git",
- "reference": "dc49305538aeb77e4c89eba57cee4ceff9e42f33"
+ "reference": "fca0cbe5f900f94773d821b481c16d4ea3503491"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/ignition/zipball/dc49305538aeb77e4c89eba57cee4ceff9e42f33",
- "reference": "dc49305538aeb77e4c89eba57cee4ceff9e42f33",
+ "url": "https://api.github.com/repos/facade/ignition/zipball/fca0cbe5f900f94773d821b481c16d4ea3503491",
+ "reference": "fca0cbe5f900f94773d821b481c16d4ea3503491",
"shasum": ""
},
"require": {
@@ -1089,7 +1089,7 @@
"issues": "https://github.com/facade/ignition/issues",
"source": "https://github.com/facade/ignition"
},
- "time": "2021-05-25T07:15:52+00:00"
+ "time": "2021-08-02T07:45:03+00:00"
},
{
"name": "facade/ignition-contracts",
@@ -1204,16 +1204,16 @@
},
{
"name": "filp/whoops",
- "version": "2.13.0",
+ "version": "2.14.0",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
- "reference": "2edbc73a4687d9085c8f20f398eebade844e8424"
+ "reference": "fdf92f03e150ed84d5967a833ae93abffac0315b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/filp/whoops/zipball/2edbc73a4687d9085c8f20f398eebade844e8424",
- "reference": "2edbc73a4687d9085c8f20f398eebade844e8424",
+ "url": "https://api.github.com/repos/filp/whoops/zipball/fdf92f03e150ed84d5967a833ae93abffac0315b",
+ "reference": "fdf92f03e150ed84d5967a833ae93abffac0315b",
"shasum": ""
},
"require": {
@@ -1263,7 +1263,7 @@
],
"support": {
"issues": "https://github.com/filp/whoops/issues",
- "source": "https://github.com/filp/whoops/tree/2.13.0"
+ "source": "https://github.com/filp/whoops/tree/2.14.0"
},
"funding": [
{
@@ -1271,7 +1271,7 @@
"type": "github"
}
],
- "time": "2021-06-04T12:00:00+00:00"
+ "time": "2021-07-13T12:00:00+00:00"
},
{
"name": "guzzlehttp/guzzle",
@@ -1508,26 +1508,26 @@
},
{
"name": "intervention/image",
- "version": "2.5.1",
+ "version": "2.6.1",
"source": {
"type": "git",
"url": "https://github.com/Intervention/image.git",
- "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e"
+ "reference": "0925f10b259679b5d8ca58f3a2add9255ffcda45"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Intervention/image/zipball/abbf18d5ab8367f96b3205ca3c89fb2fa598c69e",
- "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e",
+ "url": "https://api.github.com/repos/Intervention/image/zipball/0925f10b259679b5d8ca58f3a2add9255ffcda45",
+ "reference": "0925f10b259679b5d8ca58f3a2add9255ffcda45",
"shasum": ""
},
"require": {
"ext-fileinfo": "*",
- "guzzlehttp/psr7": "~1.1",
+ "guzzlehttp/psr7": "~1.1 || ^2.0",
"php": ">=5.4.0"
},
"require-dev": {
"mockery/mockery": "~0.9.2",
- "phpunit/phpunit": "^4.8 || ^5.7"
+ "phpunit/phpunit": "^4.8 || ^5.7 || ^7.5.15"
},
"suggest": {
"ext-gd": "to use GD library based image processing.",
@@ -1576,9 +1576,19 @@
],
"support": {
"issues": "https://github.com/Intervention/image/issues",
- "source": "https://github.com/Intervention/image/tree/master"
+ "source": "https://github.com/Intervention/image/tree/2.6.1"
},
- "time": "2019-11-02T09:15:47+00:00"
+ "funding": [
+ {
+ "url": "https://www.paypal.me/interventionphp",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/Intervention",
+ "type": "github"
+ }
+ ],
+ "time": "2021-07-22T14:31:53+00:00"
},
{
"name": "knplabs/knp-snappy",
@@ -1652,16 +1662,16 @@
},
{
"name": "laravel/framework",
- "version": "v6.20.29",
+ "version": "v6.20.31",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "00fa9c04aed10d68481f5757b89da0e6798f53b3"
+ "reference": "15cd96b48fb4f652ba996041cdb9a2a3b03e00f5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/00fa9c04aed10d68481f5757b89da0e6798f53b3",
- "reference": "00fa9c04aed10d68481f5757b89da0e6798f53b3",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/15cd96b48fb4f652ba996041cdb9a2a3b03e00f5",
+ "reference": "15cd96b48fb4f652ba996041cdb9a2a3b03e00f5",
"shasum": ""
},
"require": {
@@ -1801,7 +1811,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2021-06-22T13:41:06+00:00"
+ "time": "2021-08-03T14:36:18+00:00"
},
{
"name": "laravel/socialite",
@@ -1874,16 +1884,16 @@
},
{
"name": "league/commonmark",
- "version": "1.6.5",
+ "version": "1.6.6",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
- "reference": "44ffd8d3c4a9133e4bd0548622b09c55af39db5f"
+ "reference": "c4228d11e30d7493c6836d20872f9582d8ba6dcf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/44ffd8d3c4a9133e4bd0548622b09c55af39db5f",
- "reference": "44ffd8d3c4a9133e4bd0548622b09c55af39db5f",
+ "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c4228d11e30d7493c6836d20872f9582d8ba6dcf",
+ "reference": "c4228d11e30d7493c6836d20872f9582d8ba6dcf",
"shasum": ""
},
"require": {
@@ -1971,7 +1981,7 @@
"type": "tidelift"
}
],
- "time": "2021-06-26T11:57:13+00:00"
+ "time": "2021-07-17T17:13:23+00:00"
},
{
"name": "league/flysystem",
@@ -2265,22 +2275,23 @@
},
{
"name": "league/oauth1-client",
- "version": "v1.9.0",
+ "version": "1.9.2",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/oauth1-client.git",
- "reference": "1e7e6be2dc543bf466236fb171e5b20e1b06aee6"
+ "reference": "6247ffbf6b74fcc7f21313315b79e9b2560e68b0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/1e7e6be2dc543bf466236fb171e5b20e1b06aee6",
- "reference": "1e7e6be2dc543bf466236fb171e5b20e1b06aee6",
+ "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/6247ffbf6b74fcc7f21313315b79e9b2560e68b0",
+ "reference": "6247ffbf6b74fcc7f21313315b79e9b2560e68b0",
"shasum": ""
},
"require": {
"ext-json": "*",
"ext-openssl": "*",
"guzzlehttp/guzzle": "^6.0|^7.0",
+ "guzzlehttp/psr7": "^1.7|^2.0",
"php": ">=7.1||>=8.0"
},
"require-dev": {
@@ -2334,22 +2345,22 @@
],
"support": {
"issues": "https://github.com/thephpleague/oauth1-client/issues",
- "source": "https://github.com/thephpleague/oauth1-client/tree/v1.9.0"
+ "source": "https://github.com/thephpleague/oauth1-client/tree/1.9.2"
},
- "time": "2021-01-20T01:40:53+00:00"
+ "time": "2021-08-03T23:29:01+00:00"
},
{
"name": "monolog/monolog",
- "version": "2.2.0",
+ "version": "2.3.2",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084"
+ "reference": "71312564759a7db5b789296369c1a264efc43aad"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1cb1cde8e8dd0f70cc0fe51354a59acad9302084",
- "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/71312564759a7db5b789296369c1a264efc43aad",
+ "reference": "71312564759a7db5b789296369c1a264efc43aad",
"shasum": ""
},
"require": {
@@ -2368,7 +2379,7 @@
"php-amqplib/php-amqplib": "~2.4",
"php-console/php-console": "^3.1.3",
"phpspec/prophecy": "^1.6.1",
- "phpstan/phpstan": "^0.12.59",
+ "phpstan/phpstan": "^0.12.91",
"phpunit/phpunit": "^8.5",
"predis/predis": "^1.1",
"rollbar/rollbar": "^1.3",
@@ -2420,7 +2431,7 @@
],
"support": {
"issues": "https://github.com/Seldaek/monolog/issues",
- "source": "https://github.com/Seldaek/monolog/tree/2.2.0"
+ "source": "https://github.com/Seldaek/monolog/tree/2.3.2"
},
"funding": [
{
@@ -2432,7 +2443,7 @@
"type": "tidelift"
}
],
- "time": "2020-12-14T13:15:25+00:00"
+ "time": "2021-07-23T07:42:52+00:00"
},
{
"name": "mtdowling/jmespath.php",
@@ -2497,22 +2508,23 @@
},
{
"name": "nesbot/carbon",
- "version": "2.50.0",
+ "version": "2.51.1",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "f47f17d17602b2243414a44ad53d9f8b9ada5fdb"
+ "reference": "8619c299d1e0d4b344e1f98ca07a1ce2cfbf1922"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f47f17d17602b2243414a44ad53d9f8b9ada5fdb",
- "reference": "f47f17d17602b2243414a44ad53d9f8b9ada5fdb",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8619c299d1e0d4b344e1f98ca07a1ce2cfbf1922",
+ "reference": "8619c299d1e0d4b344e1f98ca07a1ce2cfbf1922",
"shasum": ""
},
"require": {
"ext-json": "*",
"php": "^7.1.8 || ^8.0",
"symfony/polyfill-mbstring": "^1.0",
+ "symfony/polyfill-php80": "^1.16",
"symfony/translation": "^3.4 || ^4.0 || ^5.0"
},
"require-dev": {
@@ -2531,8 +2543,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.x-dev",
- "dev-3.x": "3.x-dev"
+ "dev-3.x": "3.x-dev",
+ "dev-master": "2.x-dev"
},
"laravel": {
"providers": [
@@ -2586,7 +2598,7 @@
"type": "tidelift"
}
],
- "time": "2021-06-28T22:38:45+00:00"
+ "time": "2021-07-28T13:16:28+00:00"
},
{
"name": "nunomaduro/collision",
@@ -3645,16 +3657,16 @@
},
{
"name": "scrivo/highlight.php",
- "version": "v9.18.1.6",
+ "version": "v9.18.1.7",
"source": {
"type": "git",
"url": "https://github.com/scrivo/highlight.php.git",
- "reference": "44a3d4136edb5ad8551590bf90f437db80b2d466"
+ "reference": "05996fcc61e97978d76ca7d1ac14b65e7cd26f91"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/44a3d4136edb5ad8551590bf90f437db80b2d466",
- "reference": "44a3d4136edb5ad8551590bf90f437db80b2d466",
+ "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/05996fcc61e97978d76ca7d1ac14b65e7cd26f91",
+ "reference": "05996fcc61e97978d76ca7d1ac14b65e7cd26f91",
"shasum": ""
},
"require": {
@@ -3717,7 +3729,7 @@
"type": "github"
}
],
- "time": "2020-12-22T19:20:29+00:00"
+ "time": "2021-07-09T00:30:39+00:00"
},
{
"name": "socialiteproviders/discord",
@@ -4161,36 +4173,37 @@
},
{
"name": "symfony/console",
- "version": "v4.4.26",
+ "version": "v4.4.29",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "9aa1eb46c1b12fada74dc0c529e93d1ccef22576"
+ "reference": "8baf0bbcfddfde7d7225ae8e04705cfd1081cd7b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/9aa1eb46c1b12fada74dc0c529e93d1ccef22576",
- "reference": "9aa1eb46c1b12fada74dc0c529e93d1ccef22576",
+ "url": "https://api.github.com/repos/symfony/console/zipball/8baf0bbcfddfde7d7225ae8e04705cfd1081cd7b",
+ "reference": "8baf0bbcfddfde7d7225ae8e04705cfd1081cd7b",
"shasum": ""
},
"require": {
"php": ">=7.1.3",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php73": "^1.8",
- "symfony/polyfill-php80": "^1.15",
+ "symfony/polyfill-php80": "^1.16",
"symfony/service-contracts": "^1.1|^2"
},
"conflict": {
+ "psr/log": ">=3",
"symfony/dependency-injection": "<3.4",
"symfony/event-dispatcher": "<4.3|>=5",
"symfony/lock": "<4.4",
"symfony/process": "<3.3"
},
"provide": {
- "psr/log-implementation": "1.0"
+ "psr/log-implementation": "1.0|2.0"
},
"require-dev": {
- "psr/log": "~1.0",
+ "psr/log": "^1|^2",
"symfony/config": "^3.4|^4.0|^5.0",
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
"symfony/event-dispatcher": "^4.3",
@@ -4230,7 +4243,7 @@
"description": "Eases the creation of beautiful and testable command line interfaces",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/console/tree/v4.4.26"
+ "source": "https://github.com/symfony/console/tree/v4.4.29"
},
"funding": [
{
@@ -4246,24 +4259,25 @@
"type": "tidelift"
}
],
- "time": "2021-06-06T09:12:27+00:00"
+ "time": "2021-07-27T19:04:53+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v4.4.25",
+ "version": "v4.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "c1e29de6dc893b130b45d20d8051efbb040560a9"
+ "reference": "5194f18bd80d106f11efa8f7cd0fbdcc3af96ce6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/c1e29de6dc893b130b45d20d8051efbb040560a9",
- "reference": "c1e29de6dc893b130b45d20d8051efbb040560a9",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/5194f18bd80d106f11efa8f7cd0fbdcc3af96ce6",
+ "reference": "5194f18bd80d106f11efa8f7cd0fbdcc3af96ce6",
"shasum": ""
},
"require": {
- "php": ">=7.1.3"
+ "php": ">=7.1.3",
+ "symfony/polyfill-php80": "^1.16"
},
"type": "library",
"autoload": {
@@ -4295,7 +4309,7 @@
"description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/css-selector/tree/v4.4.25"
+ "source": "https://github.com/symfony/css-selector/tree/v4.4.27"
},
"funding": [
{
@@ -4311,26 +4325,25 @@
"type": "tidelift"
}
],
- "time": "2021-05-26T17:39:37+00:00"
+ "time": "2021-07-21T12:19:41+00:00"
},
{
"name": "symfony/debug",
- "version": "v4.4.25",
+ "version": "v4.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "a8d2d5c94438548bff9f998ca874e202bb29d07f"
+ "reference": "2f9160e92eb64c95da7368c867b663a8e34e980c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/a8d2d5c94438548bff9f998ca874e202bb29d07f",
- "reference": "a8d2d5c94438548bff9f998ca874e202bb29d07f",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/2f9160e92eb64c95da7368c867b663a8e34e980c",
+ "reference": "2f9160e92eb64c95da7368c867b663a8e34e980c",
"shasum": ""
},
"require": {
"php": ">=7.1.3",
- "psr/log": "~1.0",
- "symfony/polyfill-php80": "^1.15"
+ "psr/log": "^1|^2|^3"
},
"conflict": {
"symfony/http-kernel": "<3.4"
@@ -4364,7 +4377,7 @@
"description": "Provides tools to ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/debug/tree/v4.4.25"
+ "source": "https://github.com/symfony/debug/tree/v4.4.27"
},
"funding": [
{
@@ -4380,7 +4393,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-26T17:39:37+00:00"
+ "time": "2021-07-22T07:21:39+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -4451,23 +4464,22 @@
},
{
"name": "symfony/error-handler",
- "version": "v4.4.26",
+ "version": "v4.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
- "reference": "4001f01153d0eb5496fe11d8c76d1e56b47fdb88"
+ "reference": "16ac2be1c0f49d6d9eb9d3ce9324bde268717905"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/error-handler/zipball/4001f01153d0eb5496fe11d8c76d1e56b47fdb88",
- "reference": "4001f01153d0eb5496fe11d8c76d1e56b47fdb88",
+ "url": "https://api.github.com/repos/symfony/error-handler/zipball/16ac2be1c0f49d6d9eb9d3ce9324bde268717905",
+ "reference": "16ac2be1c0f49d6d9eb9d3ce9324bde268717905",
"shasum": ""
},
"require": {
"php": ">=7.1.3",
- "psr/log": "~1.0",
+ "psr/log": "^1|^2|^3",
"symfony/debug": "^4.4.5",
- "symfony/polyfill-php80": "^1.15",
"symfony/var-dumper": "^4.4|^5.0"
},
"require-dev": {
@@ -4500,7 +4512,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/error-handler/tree/v4.4.26"
+ "source": "https://github.com/symfony/error-handler/tree/v4.4.27"
},
"funding": [
{
@@ -4516,25 +4528,26 @@
"type": "tidelift"
}
],
- "time": "2021-06-24T07:57:22+00:00"
+ "time": "2021-07-23T15:41:52+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v4.4.25",
+ "version": "v4.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "047773e7016e4fd45102cedf4bd2558ae0d0c32f"
+ "reference": "958a128b184fcf0ba45ec90c0e88554c9327c2e9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/047773e7016e4fd45102cedf4bd2558ae0d0c32f",
- "reference": "047773e7016e4fd45102cedf4bd2558ae0d0c32f",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/958a128b184fcf0ba45ec90c0e88554c9327c2e9",
+ "reference": "958a128b184fcf0ba45ec90c0e88554c9327c2e9",
"shasum": ""
},
"require": {
"php": ">=7.1.3",
- "symfony/event-dispatcher-contracts": "^1.1"
+ "symfony/event-dispatcher-contracts": "^1.1",
+ "symfony/polyfill-php80": "^1.16"
},
"conflict": {
"symfony/dependency-injection": "<3.4"
@@ -4544,7 +4557,7 @@
"symfony/event-dispatcher-implementation": "1.1"
},
"require-dev": {
- "psr/log": "~1.0",
+ "psr/log": "^1|^2|^3",
"symfony/config": "^3.4|^4.0|^5.0",
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
"symfony/error-handler": "~3.4|~4.4",
@@ -4583,7 +4596,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.25"
+ "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.27"
},
"funding": [
{
@@ -4599,7 +4612,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-26T17:39:37+00:00"
+ "time": "2021-07-23T15:41:52+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@@ -4682,20 +4695,21 @@
},
{
"name": "symfony/finder",
- "version": "v4.4.25",
+ "version": "v4.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "ed33314396d968a8936c95f5bd1b88bd3b3e94a3"
+ "reference": "42414d7ac96fc2880a783b872185789dea0d4262"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/ed33314396d968a8936c95f5bd1b88bd3b3e94a3",
- "reference": "ed33314396d968a8936c95f5bd1b88bd3b3e94a3",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/42414d7ac96fc2880a783b872185789dea0d4262",
+ "reference": "42414d7ac96fc2880a783b872185789dea0d4262",
"shasum": ""
},
"require": {
- "php": ">=7.1.3"
+ "php": ">=7.1.3",
+ "symfony/polyfill-php80": "^1.16"
},
"type": "library",
"autoload": {
@@ -4723,7 +4737,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v4.4.25"
+ "source": "https://github.com/symfony/finder/tree/v4.4.27"
},
"funding": [
{
@@ -4739,7 +4753,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-26T11:20:16+00:00"
+ "time": "2021-07-23T15:41:52+00:00"
},
{
"name": "symfony/http-client-contracts",
@@ -4821,23 +4835,23 @@
},
{
"name": "symfony/http-foundation",
- "version": "v4.4.26",
+ "version": "v4.4.29",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "8759ed5c27c2a8a47cb60f367f4be6727f08d58b"
+ "reference": "7016057b01f0ed3ec3ba1f31a580b6661667c2e1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8759ed5c27c2a8a47cb60f367f4be6727f08d58b",
- "reference": "8759ed5c27c2a8a47cb60f367f4be6727f08d58b",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7016057b01f0ed3ec3ba1f31a580b6661667c2e1",
+ "reference": "7016057b01f0ed3ec3ba1f31a580b6661667c2e1",
"shasum": ""
},
"require": {
"php": ">=7.1.3",
"symfony/mime": "^4.3|^5.0",
"symfony/polyfill-mbstring": "~1.1",
- "symfony/polyfill-php80": "^1.15"
+ "symfony/polyfill-php80": "^1.16"
},
"require-dev": {
"predis/predis": "~1.0",
@@ -4869,7 +4883,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-foundation/tree/v4.4.26"
+ "source": "https://github.com/symfony/http-foundation/tree/v4.4.29"
},
"funding": [
{
@@ -4885,32 +4899,32 @@
"type": "tidelift"
}
],
- "time": "2021-06-26T21:56:04+00:00"
+ "time": "2021-07-27T14:32:23+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v4.4.26",
+ "version": "v4.4.29",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "e08b2fb8a6eedd81c70522e514bad9b2c1fff881"
+ "reference": "752b170e1ba0dd4104e7fa17c1cef1ec8a7fc506"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e08b2fb8a6eedd81c70522e514bad9b2c1fff881",
- "reference": "e08b2fb8a6eedd81c70522e514bad9b2c1fff881",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/752b170e1ba0dd4104e7fa17c1cef1ec8a7fc506",
+ "reference": "752b170e1ba0dd4104e7fa17c1cef1ec8a7fc506",
"shasum": ""
},
"require": {
"php": ">=7.1.3",
- "psr/log": "~1.0",
+ "psr/log": "^1|^2",
"symfony/error-handler": "^4.4",
"symfony/event-dispatcher": "^4.4",
"symfony/http-client-contracts": "^1.1|^2",
"symfony/http-foundation": "^4.4|^5.0",
"symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-php73": "^1.9",
- "symfony/polyfill-php80": "^1.15"
+ "symfony/polyfill-php80": "^1.16"
},
"conflict": {
"symfony/browser-kit": "<4.3",
@@ -4921,7 +4935,7 @@
"twig/twig": "<1.43|<2.13,>=2"
},
"provide": {
- "psr/log-implementation": "1.0"
+ "psr/log-implementation": "1.0|2.0"
},
"require-dev": {
"psr/cache": "^1.0|^2.0|^3.0",
@@ -4973,7 +4987,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-kernel/tree/v4.4.26"
+ "source": "https://github.com/symfony/http-kernel/tree/v4.4.29"
},
"funding": [
{
@@ -4989,20 +5003,20 @@
"type": "tidelift"
}
],
- "time": "2021-06-30T08:18:06+00:00"
+ "time": "2021-07-29T06:45:05+00:00"
},
{
"name": "symfony/mime",
- "version": "v5.3.2",
+ "version": "v5.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
- "reference": "47dd7912152b82d0d4c8d9040dbc93d6232d472a"
+ "reference": "633e4e8afe9e529e5599d71238849a4218dd497b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mime/zipball/47dd7912152b82d0d4c8d9040dbc93d6232d472a",
- "reference": "47dd7912152b82d0d4c8d9040dbc93d6232d472a",
+ "url": "https://api.github.com/repos/symfony/mime/zipball/633e4e8afe9e529e5599d71238849a4218dd497b",
+ "reference": "633e4e8afe9e529e5599d71238849a4218dd497b",
"shasum": ""
},
"require": {
@@ -5010,7 +5024,7 @@
"symfony/deprecation-contracts": "^2.1",
"symfony/polyfill-intl-idn": "^1.10",
"symfony/polyfill-mbstring": "^1.0",
- "symfony/polyfill-php80": "^1.15"
+ "symfony/polyfill-php80": "^1.16"
},
"conflict": {
"egulias/email-validator": "~3.0.0",
@@ -5056,7 +5070,7 @@
"mime-type"
],
"support": {
- "source": "https://github.com/symfony/mime/tree/v5.3.2"
+ "source": "https://github.com/symfony/mime/tree/v5.3.4"
},
"funding": [
{
@@ -5072,7 +5086,7 @@
"type": "tidelift"
}
],
- "time": "2021-06-09T10:58:01+00:00"
+ "time": "2021-07-21T12:40:44+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -5406,16 +5420,16 @@
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.23.0",
+ "version": "v1.23.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1"
+ "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
- "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6",
+ "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6",
"shasum": ""
},
"require": {
@@ -5466,7 +5480,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1"
},
"funding": [
{
@@ -5482,7 +5496,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-27T09:27:20+00:00"
+ "time": "2021-05-27T12:26:48+00:00"
},
{
"name": "symfony/polyfill-php72",
@@ -5641,16 +5655,16 @@
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.23.0",
+ "version": "v1.23.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0"
+ "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0",
- "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be",
+ "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be",
"shasum": ""
},
"require": {
@@ -5704,7 +5718,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1"
},
"funding": [
{
@@ -5720,24 +5734,25 @@
"type": "tidelift"
}
],
- "time": "2021-02-19T12:13:01+00:00"
+ "time": "2021-07-28T13:41:28+00:00"
},
{
"name": "symfony/process",
- "version": "v4.4.26",
+ "version": "v4.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "7e812c84c3f2dba173d311de6e510edf701685a8"
+ "reference": "0b7dc5599ac4aa6d7b936c8f7d10abae64f6cf7f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/7e812c84c3f2dba173d311de6e510edf701685a8",
- "reference": "7e812c84c3f2dba173d311de6e510edf701685a8",
+ "url": "https://api.github.com/repos/symfony/process/zipball/0b7dc5599ac4aa6d7b936c8f7d10abae64f6cf7f",
+ "reference": "0b7dc5599ac4aa6d7b936c8f7d10abae64f6cf7f",
"shasum": ""
},
"require": {
- "php": ">=7.1.3"
+ "php": ">=7.1.3",
+ "symfony/polyfill-php80": "^1.16"
},
"type": "library",
"autoload": {
@@ -5765,7 +5780,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v4.4.26"
+ "source": "https://github.com/symfony/process/tree/v4.4.27"
},
"funding": [
{
@@ -5781,24 +5796,25 @@
"type": "tidelift"
}
],
- "time": "2021-06-09T14:57:04+00:00"
+ "time": "2021-07-23T15:41:52+00:00"
},
{
"name": "symfony/routing",
- "version": "v4.4.25",
+ "version": "v4.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "3a3c2f197ad0846ac6413225fc78868ba1c61434"
+ "reference": "244609821beece97167fa7ba4eef49d2a31862db"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/3a3c2f197ad0846ac6413225fc78868ba1c61434",
- "reference": "3a3c2f197ad0846ac6413225fc78868ba1c61434",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/244609821beece97167fa7ba4eef49d2a31862db",
+ "reference": "244609821beece97167fa7ba4eef49d2a31862db",
"shasum": ""
},
"require": {
- "php": ">=7.1.3"
+ "php": ">=7.1.3",
+ "symfony/polyfill-php80": "^1.16"
},
"conflict": {
"symfony/config": "<4.2",
@@ -5807,7 +5823,7 @@
},
"require-dev": {
"doctrine/annotations": "^1.10.4",
- "psr/log": "~1.0",
+ "psr/log": "^1|^2|^3",
"symfony/config": "^4.2|^5.0",
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
"symfony/expression-language": "^3.4|^4.0|^5.0",
@@ -5853,7 +5869,7 @@
"url"
],
"support": {
- "source": "https://github.com/symfony/routing/tree/v4.4.25"
+ "source": "https://github.com/symfony/routing/tree/v4.4.27"
},
"funding": [
{
@@ -5869,7 +5885,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-26T17:39:37+00:00"
+ "time": "2021-07-23T15:41:52+00:00"
},
{
"name": "symfony/service-contracts",
@@ -5952,21 +5968,22 @@
},
{
"name": "symfony/translation",
- "version": "v4.4.26",
+ "version": "v4.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "2f7fa60b8d10ca71c30dc46b0870143183a8f131"
+ "reference": "2e3c0f2bf704d635ba862e7198d72331a62d82ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/2f7fa60b8d10ca71c30dc46b0870143183a8f131",
- "reference": "2f7fa60b8d10ca71c30dc46b0870143183a8f131",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/2e3c0f2bf704d635ba862e7198d72331a62d82ba",
+ "reference": "2e3c0f2bf704d635ba862e7198d72331a62d82ba",
"shasum": ""
},
"require": {
"php": ">=7.1.3",
"symfony/polyfill-mbstring": "~1.0",
+ "symfony/polyfill-php80": "^1.16",
"symfony/translation-contracts": "^1.1.6|^2"
},
"conflict": {
@@ -5979,7 +5996,7 @@
"symfony/translation-implementation": "1.0|2.0"
},
"require-dev": {
- "psr/log": "~1.0",
+ "psr/log": "^1|^2|^3",
"symfony/config": "^3.4|^4.0|^5.0",
"symfony/console": "^3.4|^4.0|^5.0",
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
@@ -6020,7 +6037,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/translation/tree/v4.4.26"
+ "source": "https://github.com/symfony/translation/tree/v4.4.27"
},
"funding": [
{
@@ -6036,7 +6053,7 @@
"type": "tidelift"
}
],
- "time": "2021-06-06T08:51:46+00:00"
+ "time": "2021-07-21T13:12:00+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -6118,23 +6135,23 @@
},
{
"name": "symfony/var-dumper",
- "version": "v4.4.26",
+ "version": "v4.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "a586efdf2aa832d05b9249e9115d24f6a2691160"
+ "reference": "391d6d0e7a06ab54eb7c38fab29b8d174471b3ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a586efdf2aa832d05b9249e9115d24f6a2691160",
- "reference": "a586efdf2aa832d05b9249e9115d24f6a2691160",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/391d6d0e7a06ab54eb7c38fab29b8d174471b3ba",
+ "reference": "391d6d0e7a06ab54eb7c38fab29b8d174471b3ba",
"shasum": ""
},
"require": {
"php": ">=7.1.3",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php72": "~1.5",
- "symfony/polyfill-php80": "^1.15"
+ "symfony/polyfill-php80": "^1.16"
},
"conflict": {
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
@@ -6187,7 +6204,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v4.4.26"
+ "source": "https://github.com/symfony/var-dumper/tree/v4.4.27"
},
"funding": [
{
@@ -6203,7 +6220,7 @@
"type": "tidelift"
}
],
- "time": "2021-06-17T06:35:48+00:00"
+ "time": "2021-07-23T15:41:52+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -6638,16 +6655,16 @@
},
{
"name": "composer/composer",
- "version": "2.1.3",
+ "version": "2.1.5",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
- "reference": "fc5c4573aafce3a018eb7f1f8f91cea423970f2e"
+ "reference": "ac679902e9f66b85a8f9d8c1c88180f609a8745d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/fc5c4573aafce3a018eb7f1f8f91cea423970f2e",
- "reference": "fc5c4573aafce3a018eb7f1f8f91cea423970f2e",
+ "url": "https://api.github.com/repos/composer/composer/zipball/ac679902e9f66b85a8f9d8c1c88180f609a8745d",
+ "reference": "ac679902e9f66b85a8f9d8c1c88180f609a8745d",
"shasum": ""
},
"require": {
@@ -6656,7 +6673,7 @@
"composer/semver": "^3.0",
"composer/spdx-licenses": "^1.2",
"composer/xdebug-handler": "^2.0",
- "justinrainbow/json-schema": "^5.2.10",
+ "justinrainbow/json-schema": "^5.2.11",
"php": "^5.3.2 || ^7.0 || ^8.0",
"psr/log": "^1.0",
"react/promise": "^1.2 || ^2.7",
@@ -6716,7 +6733,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/composer/issues",
- "source": "https://github.com/composer/composer/tree/2.1.3"
+ "source": "https://github.com/composer/composer/tree/2.1.5"
},
"funding": [
{
@@ -6732,7 +6749,7 @@
"type": "tidelift"
}
],
- "time": "2021-06-09T14:31:20+00:00"
+ "time": "2021-07-23T08:35:47+00:00"
},
{
"name": "composer/metadata-minifier",
@@ -6965,21 +6982,21 @@
},
{
"name": "composer/xdebug-handler",
- "version": "2.0.1",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
- "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496"
+ "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/964adcdd3a28bf9ed5d9ac6450064e0d71ed7496",
- "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/84674dd3a7575ba617f5a76d7e9e29a7d3891339",
+ "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339",
"shasum": ""
},
"require": {
"php": "^5.3.2 || ^7.0 || ^8.0",
- "psr/log": "^1.0"
+ "psr/log": "^1 || ^2 || ^3"
},
"require-dev": {
"phpstan/phpstan": "^0.12.55",
@@ -7009,7 +7026,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/xdebug-handler/issues",
- "source": "https://github.com/composer/xdebug-handler/tree/2.0.1"
+ "source": "https://github.com/composer/xdebug-handler/tree/2.0.2"
},
"funding": [
{
@@ -7025,7 +7042,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-05T19:37:51+00:00"
+ "time": "2021-07-31T17:03:58+00:00"
},
{
"name": "doctrine/instantiator",
@@ -7098,16 +7115,16 @@
},
{
"name": "fakerphp/faker",
- "version": "v1.14.1",
+ "version": "v1.15.0",
"source": {
"type": "git",
"url": "https://github.com/FakerPHP/Faker.git",
- "reference": "ed22aee8d17c7b396f74a58b1e7fefa4f90d5ef1"
+ "reference": "89c6201c74db25fa759ff16e78a4d8f32547770e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/ed22aee8d17c7b396f74a58b1e7fefa4f90d5ef1",
- "reference": "ed22aee8d17c7b396f74a58b1e7fefa4f90d5ef1",
+ "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/89c6201c74db25fa759ff16e78a4d8f32547770e",
+ "reference": "89c6201c74db25fa759ff16e78a4d8f32547770e",
"shasum": ""
},
"require": {
@@ -7157,9 +7174,9 @@
],
"support": {
"issues": "https://github.com/FakerPHP/Faker/issues",
- "source": "https://github.com/FakerPHP/Faker/tree/v.1.14.1"
+ "source": "https://github.com/FakerPHP/Faker/tree/v1.15.0"
},
- "time": "2021-03-30T06:27:33+00:00"
+ "time": "2021-07-06T20:39:40+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -7214,16 +7231,16 @@
},
{
"name": "justinrainbow/json-schema",
- "version": "5.2.10",
+ "version": "5.2.11",
"source": {
"type": "git",
"url": "https://github.com/justinrainbow/json-schema.git",
- "reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b"
+ "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b",
- "reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b",
+ "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ab6744b7296ded80f8cc4f9509abbff393399aa",
+ "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa",
"shasum": ""
},
"require": {
@@ -7278,9 +7295,9 @@
],
"support": {
"issues": "https://github.com/justinrainbow/json-schema/issues",
- "source": "https://github.com/justinrainbow/json-schema/tree/5.2.10"
+ "source": "https://github.com/justinrainbow/json-schema/tree/5.2.11"
},
- "time": "2020-05-27T16:41:55+00:00"
+ "time": "2021-07-22T09:24:00+00:00"
},
{
"name": "laravel/browser-kit-testing",
@@ -7349,16 +7366,16 @@
},
{
"name": "maximebf/debugbar",
- "version": "v1.16.5",
+ "version": "v1.17.1",
"source": {
"type": "git",
"url": "https://github.com/maximebf/php-debugbar.git",
- "reference": "6d51ee9e94cff14412783785e79a4e7ef97b9d62"
+ "reference": "0a3532556be0145603f8a9de23e76dc28eed7054"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/6d51ee9e94cff14412783785e79a4e7ef97b9d62",
- "reference": "6d51ee9e94cff14412783785e79a4e7ef97b9d62",
+ "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0a3532556be0145603f8a9de23e76dc28eed7054",
+ "reference": "0a3532556be0145603f8a9de23e76dc28eed7054",
"shasum": ""
},
"require": {
@@ -7377,7 +7394,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.16-dev"
+ "dev-master": "1.17-dev"
}
},
"autoload": {
@@ -7408,9 +7425,9 @@
],
"support": {
"issues": "https://github.com/maximebf/php-debugbar/issues",
- "source": "https://github.com/maximebf/php-debugbar/tree/v1.16.5"
+ "source": "https://github.com/maximebf/php-debugbar/tree/v1.17.1"
},
- "time": "2020-12-07T11:07:24+00:00"
+ "time": "2021-08-01T09:19:02+00:00"
},
{
"name": "mockery/mockery",
@@ -7544,16 +7561,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v4.10.5",
+ "version": "v4.12.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f"
+ "reference": "6608f01670c3cc5079e18c1dab1104e002579143"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f",
- "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143",
+ "reference": "6608f01670c3cc5079e18c1dab1104e002579143",
"shasum": ""
},
"require": {
@@ -7594,22 +7611,22 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0"
},
- "time": "2021-05-03T19:11:20+00:00"
+ "time": "2021-07-21T10:44:31+00:00"
},
{
"name": "phar-io/manifest",
- "version": "2.0.1",
+ "version": "2.0.3",
"source": {
"type": "git",
"url": "https://github.com/phar-io/manifest.git",
- "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133"
+ "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
- "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
+ "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+ "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
"shasum": ""
},
"require": {
@@ -7654,9 +7671,9 @@
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
"support": {
"issues": "https://github.com/phar-io/manifest/issues",
- "source": "https://github.com/phar-io/manifest/tree/master"
+ "source": "https://github.com/phar-io/manifest/tree/2.0.3"
},
- "time": "2020-06-27T14:33:11+00:00"
+ "time": "2021-07-20T11:28:43+00:00"
},
{
"name": "phar-io/version",
@@ -8254,16 +8271,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.5.6",
+ "version": "9.5.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb"
+ "reference": "191768ccd5c85513b4068bdbe99bb6390c7d54fb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
- "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/191768ccd5c85513b4068bdbe99bb6390c7d54fb",
+ "reference": "191768ccd5c85513b4068bdbe99bb6390c7d54fb",
"shasum": ""
},
"require": {
@@ -8275,7 +8292,7 @@
"ext-xml": "*",
"ext-xmlwriter": "*",
"myclabs/deep-copy": "^1.10.1",
- "phar-io/manifest": "^2.0.1",
+ "phar-io/manifest": "^2.0.3",
"phar-io/version": "^3.0.2",
"php": ">=7.3",
"phpspec/prophecy": "^1.12.1",
@@ -8341,7 +8358,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.6"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.8"
},
"funding": [
{
@@ -8353,7 +8370,7 @@
"type": "github"
}
],
- "time": "2021-06-23T05:14:38+00:00"
+ "time": "2021-07-31T15:17:34+00:00"
},
{
"name": "react/promise",
@@ -9482,22 +9499,23 @@
},
{
"name": "symfony/dom-crawler",
- "version": "v4.4.25",
+ "version": "v4.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "41d15bb6d6b95d2be763c514bb2494215d9c5eef"
+ "reference": "86aa075c9e0b13ac7db8d73d1f9d8b656143881a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/41d15bb6d6b95d2be763c514bb2494215d9c5eef",
- "reference": "41d15bb6d6b95d2be763c514bb2494215d9c5eef",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/86aa075c9e0b13ac7db8d73d1f9d8b656143881a",
+ "reference": "86aa075c9e0b13ac7db8d73d1f9d8b656143881a",
"shasum": ""
},
"require": {
"php": ">=7.1.3",
"symfony/polyfill-ctype": "~1.8",
- "symfony/polyfill-mbstring": "~1.0"
+ "symfony/polyfill-mbstring": "~1.0",
+ "symfony/polyfill-php80": "^1.16"
},
"conflict": {
"masterminds/html5": "<2.6"
@@ -9535,7 +9553,7 @@
"description": "Eases DOM navigation for HTML and XML documents",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/dom-crawler/tree/v4.4.25"
+ "source": "https://github.com/symfony/dom-crawler/tree/v4.4.27"
},
"funding": [
{
@@ -9551,25 +9569,26 @@
"type": "tidelift"
}
],
- "time": "2021-05-26T11:20:16+00:00"
+ "time": "2021-07-23T15:41:52+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v5.3.3",
+ "version": "v5.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "19b71c8f313b411172dd5f470fd61f24466d79a9"
+ "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/19b71c8f313b411172dd5f470fd61f24466d79a9",
- "reference": "19b71c8f313b411172dd5f470fd61f24466d79a9",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/343f4fe324383ca46792cae728a3b6e2f708fb32",
+ "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
- "symfony/polyfill-ctype": "~1.8"
+ "symfony/polyfill-ctype": "~1.8",
+ "symfony/polyfill-php80": "^1.16"
},
"type": "library",
"autoload": {
@@ -9597,7 +9616,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v5.3.3"
+ "source": "https://github.com/symfony/filesystem/tree/v5.3.4"
},
"funding": [
{
@@ -9613,20 +9632,20 @@
"type": "tidelift"
}
],
- "time": "2021-06-30T07:27:52+00:00"
+ "time": "2021-07-21T12:40:44+00:00"
},
{
"name": "theseer/tokenizer",
- "version": "1.2.0",
+ "version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/theseer/tokenizer.git",
- "reference": "75a63c33a8577608444246075ea0af0d052e452a"
+ "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
- "reference": "75a63c33a8577608444246075ea0af0d052e452a",
+ "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
+ "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
"shasum": ""
},
"require": {
@@ -9655,7 +9674,7 @@
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
"support": {
"issues": "https://github.com/theseer/tokenizer/issues",
- "source": "https://github.com/theseer/tokenizer/tree/master"
+ "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
},
"funding": [
{
@@ -9663,7 +9682,7 @@
"type": "github"
}
],
- "time": "2020-07-12T23:59:07+00:00"
+ "time": "2021-07-28T10:34:58+00:00"
},
{
"name": "webmozart/assert",
diff --git a/resources/js/components/dropdown-search.js b/resources/js/components/dropdown-search.js
index 8c81aae3c..e2d55f969 100644
--- a/resources/js/components/dropdown-search.js
+++ b/resources/js/components/dropdown-search.js
@@ -27,6 +27,7 @@ class DropdownSearch {
this.runLocalSearch(input);
} else {
this.toggleLoading(true);
+ this.listContainerElem.innerHTML = '';
this.runAjaxSearch(input);
}
}
diff --git a/resources/js/components/submit-on-change.js b/resources/js/components/submit-on-change.js
index 979967242..aeacae232 100644
--- a/resources/js/components/submit-on-change.js
+++ b/resources/js/components/submit-on-change.js
@@ -6,7 +6,14 @@
class SubmitOnChange {
setup() {
- this.$el.addEventListener('change', () => {
+ this.filter = this.$opts.filter;
+
+ this.$el.addEventListener('change', (event) => {
+
+ if (this.filter && !event.target.matches(this.filter)) {
+ return;
+ }
+
const form = this.$el.closest('form');
if (form) {
form.submit();
diff --git a/resources/js/components/user-select.js b/resources/js/components/user-select.js
index c2c1f97c3..aba43e0a9 100644
--- a/resources/js/components/user-select.js
+++ b/resources/js/components/user-select.js
@@ -3,7 +3,6 @@ import {onChildEvent} from "../services/dom";
class UserSelect {
setup() {
-
this.input = this.$refs.input;
this.userInfoContainer = this.$refs.userInfo;
diff --git a/resources/js/services/code.js b/resources/js/services/code.js
index 5727cd2b7..361ccc3f1 100644
--- a/resources/js/services/code.js
+++ b/resources/js/services/code.js
@@ -26,6 +26,7 @@ import 'codemirror/mode/rust/rust';
import 'codemirror/mode/shell/shell';
import 'codemirror/mode/sql/sql';
import 'codemirror/mode/toml/toml';
+import 'codemirror/mode/vb/vb';
import 'codemirror/mode/vbscript/vbscript';
import 'codemirror/mode/xml/xml';
import 'codemirror/mode/yaml/yaml';
@@ -87,6 +88,8 @@ const modeMap = {
sql: 'text/x-sql',
vbs: 'vbscript',
vbscript: 'vbscript',
+ 'vb.net': 'text/x-vb',
+ vbnet: 'text/x-vb',
xml: 'xml',
yaml: 'yaml',
yml: 'yaml',
diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index ab562006f..95ba81520 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -629,7 +629,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
}
.code-editor .lang-options {
- max-width: 480px;
+ max-width: 540px;
margin-bottom: $-s;
a {
margin-inline-end: $-xs;
diff --git a/resources/views/components/code-editor.blade.php b/resources/views/components/code-editor.blade.php
index 011840465..c593d0e23 100644
--- a/resources/views/components/code-editor.blade.php
+++ b/resources/views/components/code-editor.blade.php
@@ -35,6 +35,7 @@
<a refs="code-editor@languageLink" data-lang="shell">Shell/Bash</a>
<a refs="code-editor@languageLink" data-lang="SQL">SQL</a>
<a refs="code-editor@languageLink" data-lang="VBScript">VBScript</a>
+ <a refs="code-editor@languageLink" data-lang="VB.NET">VB.NET</a>
<a refs="code-editor@languageLink" data-lang="XML">XML</a>
<a refs="code-editor@languageLink" data-lang="YAML">YAML</a>
</small>
diff --git a/resources/views/settings/audit.blade.php b/resources/views/settings/audit.blade.php
index 9fda39a31..27bf87064 100644
--- a/resources/views/settings/audit.blade.php
+++ b/resources/views/settings/audit.blade.php
@@ -41,7 +41,9 @@
</div>
@endforeach
- <div class="form-group ml-auto" component="submit-on-change">
+ <div class="form-group ml-auto"
+ component="submit-on-change"
+ option:submit-on-change:filter='[name="user"]'>
<label for="owner">{{ trans('settings.audit_table_user') }}</label>
@include('components.user-select', ['user' => $listDetails['user'] ? \BookStack\Auth\User::query()->find($listDetails['user']) : null, 'name' => 'user', 'compact' => true])
</div>
diff --git a/resources/views/users/profile.blade.php b/resources/views/users/profile.blade.php
index 4028b5c1d..5a76a222a 100644
--- a/resources/views/users/profile.blade.php
+++ b/resources/views/users/profile.blade.php
@@ -60,7 +60,7 @@
<h2 id="recent-pages" class="list-heading">
{{ trans('entities.recently_created_pages') }}
@if (count($recentlyCreated['pages']) > 0)
- <a href="{{ url('/search?term=' . urlencode('{created_by:'.$user->id.'} {type:page}') ) }}" class="text-small ml-s">{{ trans('common.view_all') }}</a>
+ <a href="{{ url('/search?term=' . urlencode('{created_by:'.$user->slug.'} {type:page}') ) }}" class="text-small ml-s">{{ trans('common.view_all') }}</a>
@endif
</h2>
@if (count($recentlyCreated['pages']) > 0)
@@ -74,7 +74,7 @@
<h2 id="recent-chapters" class="list-heading">
{{ trans('entities.recently_created_chapters') }}
@if (count($recentlyCreated['chapters']) > 0)
- <a href="{{ url('/search?term=' . urlencode('{created_by:'.$user->id.'} {type:chapter}') ) }}" class="text-small ml-s">{{ trans('common.view_all') }}</a>
+ <a href="{{ url('/search?term=' . urlencode('{created_by:'.$user->slug.'} {type:chapter}') ) }}" class="text-small ml-s">{{ trans('common.view_all') }}</a>
@endif
</h2>
@if (count($recentlyCreated['chapters']) > 0)
@@ -88,7 +88,7 @@
<h2 id="recent-books" class="list-heading">
{{ trans('entities.recently_created_books') }}
@if (count($recentlyCreated['books']) > 0)
- <a href="{{ url('/search?term=' . urlencode('{created_by:'.$user->id.'} {type:book}') ) }}" class="text-small ml-s">{{ trans('common.view_all') }}</a>
+ <a href="{{ url('/search?term=' . urlencode('{created_by:'.$user->slug.'} {type:book}') ) }}" class="text-small ml-s">{{ trans('common.view_all') }}</a>
@endif
</h2>
@if (count($recentlyCreated['books']) > 0)
@@ -102,7 +102,7 @@
<h2 id="recent-shelves" class="list-heading">
{{ trans('entities.recently_created_shelves') }}
@if (count($recentlyCreated['shelves']) > 0)
- <a href="{{ url('/search?term=' . urlencode('{created_by:'.$user->id.'} {type:bookshelf}') ) }}" class="text-small ml-s">{{ trans('common.view_all') }}</a>
+ <a href="{{ url('/search?term=' . urlencode('{created_by:'.$user->slug.'} {type:bookshelf}') ) }}" class="text-small ml-s">{{ trans('common.view_all') }}</a>
@endif
</h2>
@if (count($recentlyCreated['shelves']) > 0)
diff --git a/tests/User/UserProfileTest.php b/tests/User/UserProfileTest.php
index e2bd59a47..859a036e0 100644
--- a/tests/User/UserProfileTest.php
+++ b/tests/User/UserProfileTest.php
@@ -85,6 +85,23 @@ class UserProfileTest extends BrowserKitTest
->see($newUser->name);
}
+ public function test_profile_has_search_links_in_created_entity_lists()
+ {
+ $user = $this->getEditor();
+ $resp = $this->actingAs($this->getAdmin())->visit('/user/' . $user->slug);
+
+ $expectedLinks = [
+ '/search?term=%7Bcreated_by%3A' . $user->slug . '%7D+%7Btype%3Apage%7D',
+ '/search?term=%7Bcreated_by%3A' . $user->slug . '%7D+%7Btype%3Achapter%7D',
+ '/search?term=%7Bcreated_by%3A' . $user->slug . '%7D+%7Btype%3Abook%7D',
+ '/search?term=%7Bcreated_by%3A' . $user->slug . '%7D+%7Btype%3Abookshelf%7D',
+ ];
+
+ foreach ($expectedLinks as $link) {
+ $resp->seeInElement('[href$="' . $link . '"]', 'View All');
+ }
+ }
+
public function test_guest_profile_shows_limited_form()
{
$this->asAdmin()