diff --git a/composer.json b/composer.json
index 116bb6d8..22e36479 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
"shish/microcrud" : "^2.0",
"shish/microhtml" : "^2.0",
"shish/gqla" : "dev-main",
- "enshrined/svg-sanitize" : "^0.15",
+ "enshrined/svg-sanitize" : "^0.16",
"bower-asset/jquery" : "^1.12",
"bower-asset/jquery-timeago" : "^1.5",
diff --git a/composer.lock b/composer.lock
index dca45b1d..2276eea2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,14 +4,14 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "605e247102c97c1320a4d1984a747c50",
+ "content-hash": "e4d47676467ba492d3be2d43d3950b9d",
"packages": [
{
"name": "bower-asset/jquery",
"version": "1.12.4",
"source": {
"type": "git",
- "url": "git@github.com:jquery/jquery-dist.git",
+ "url": "https://github.com/jquery/jquery-dist.git",
"reference": "5e89585e0121e72ff47de177c5ef604f3089a53d"
},
"dist": {
@@ -50,7 +50,7 @@
"version": "v2.2.1",
"source": {
"type": "git",
- "url": "git@github.com:js-cookie/js-cookie.git",
+ "url": "https://github.com/js-cookie/js-cookie.git",
"reference": "54962f884e9ae33f93e13ac903ffaf1d5a523598"
},
"dist": {
@@ -65,25 +65,26 @@
},
{
"name": "enshrined/svg-sanitize",
- "version": "0.15.4",
+ "version": "0.16.0",
"source": {
"type": "git",
"url": "https://github.com/darylldoyle/svg-sanitizer.git",
- "reference": "e50b83a2f1f296ca61394fe88fbfe3e896a84cf4"
+ "reference": "239e257605e2141265b429e40987b2ee51bba4b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/e50b83a2f1f296ca61394fe88fbfe3e896a84cf4",
- "reference": "e50b83a2f1f296ca61394fe88fbfe3e896a84cf4",
+ "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/239e257605e2141265b429e40987b2ee51bba4b4",
+ "reference": "239e257605e2141265b429e40987b2ee51bba4b4",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
- "php": "^7.0 || ^8.0"
+ "ezyang/htmlpurifier": "^4.16",
+ "php": "^5.6 || ^7.0 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^6.5 || ^8.5"
+ "phpunit/phpunit": "^5.7 || ^6.5 || ^8.5"
},
"type": "library",
"autoload": {
@@ -104,9 +105,70 @@
"description": "An SVG sanitizer for PHP",
"support": {
"issues": "https://github.com/darylldoyle/svg-sanitizer/issues",
- "source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.15.4"
+ "source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.16.0"
},
- "time": "2022-02-21T09:13:59+00:00"
+ "time": "2023-03-20T10:51:12+00:00"
+ },
+ {
+ "name": "ezyang/htmlpurifier",
+ "version": "v4.16.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ezyang/htmlpurifier.git",
+ "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8",
+ "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8",
+ "shasum": ""
+ },
+ "require": {
+ "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0"
+ },
+ "require-dev": {
+ "cerdic/css-tidy": "^1.7 || ^2.0",
+ "simpletest/simpletest": "dev-master"
+ },
+ "suggest": {
+ "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.",
+ "ext-bcmath": "Used for unit conversion and imagecrash protection",
+ "ext-iconv": "Converts text to and from non-UTF-8 encodings",
+ "ext-tidy": "Used for pretty-printing HTML"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "library/HTMLPurifier.composer.php"
+ ],
+ "psr-0": {
+ "HTMLPurifier": "library/"
+ },
+ "exclude-from-classmap": [
+ "/library/HTMLPurifier/Language/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "LGPL-2.1-or-later"
+ ],
+ "authors": [
+ {
+ "name": "Edward Z. Yang",
+ "email": "admin@htmlpurifier.org",
+ "homepage": "http://ezyang.com"
+ }
+ ],
+ "description": "Standards compliant HTML filter written in PHP",
+ "homepage": "http://htmlpurifier.org/",
+ "keywords": [
+ "html"
+ ],
+ "support": {
+ "issues": "https://github.com/ezyang/htmlpurifier/issues",
+ "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0"
+ },
+ "time": "2022-09-18T07:06:19+00:00"
},
{
"name": "flexihash/flexihash",
@@ -171,27 +233,27 @@
"source": {
"type": "git",
"url": "https://github.com/google/recaptcha.git",
- "reference": "ed5645e799e43afa9eb181f214dc52f22982682d"
+ "reference": "6ffa193021aa0e369a3c5b3909de2b4ed97ac359"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/google/recaptcha/zipball/ed5645e799e43afa9eb181f214dc52f22982682d",
- "reference": "ed5645e799e43afa9eb181f214dc52f22982682d",
+ "url": "https://api.github.com/repos/google/recaptcha/zipball/6ffa193021aa0e369a3c5b3909de2b4ed97ac359",
+ "reference": "6ffa193021aa0e369a3c5b3909de2b4ed97ac359",
"shasum": ""
},
"require": {
- "php": ">=5.5"
+ "php": ">=8"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^2.2.20|^2.15",
- "php-coveralls/php-coveralls": "^2.1",
- "phpunit/phpunit": "^4.8.36|^5.7.27|^6.59|^7.5.11"
+ "friendsofphp/php-cs-fixer": "^3.14",
+ "php-coveralls/php-coveralls": "^2.5",
+ "phpunit/phpunit": "^10"
},
"default-branch": true,
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "1.3.x-dev"
}
},
"autoload": {
@@ -216,7 +278,7 @@
"issues": "https://github.com/google/recaptcha/issues",
"source": "https://github.com/google/recaptcha"
},
- "time": "2021-10-04T09:40:45+00:00"
+ "time": "2023-02-20T17:27:30+00:00"
},
{
"name": "ifixit/php-akismet",
@@ -563,12 +625,12 @@
"source": {
"type": "git",
"url": "https://github.com/shish/gqla.git",
- "reference": "f3c02ec9bcb6b43cc4963c6d0529bf3334f4684a"
+ "reference": "26bf0405445f4e32e68cd7f1ea2256e81c6c42cb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/shish/gqla/zipball/f3c02ec9bcb6b43cc4963c6d0529bf3334f4684a",
- "reference": "f3c02ec9bcb6b43cc4963c6d0529bf3334f4684a",
+ "url": "https://api.github.com/repos/shish/gqla/zipball/26bf0405445f4e32e68cd7f1ea2256e81c6c42cb",
+ "reference": "26bf0405445f4e32e68cd7f1ea2256e81c6c42cb",
"shasum": ""
},
"require": {
@@ -608,7 +670,7 @@
"issues": "https://github.com/shish/gqla/issues",
"source": "https://github.com/shish/gqla/tree/main"
},
- "time": "2023-02-16T01:02:40+00:00"
+ "time": "2023-03-03T00:12:44+00:00"
},
{
"name": "shish/microcrud",
@@ -719,16 +781,16 @@
},
{
"name": "webonyx/graphql-php",
- "version": "v15.1.0",
+ "version": "v15.4.0",
"source": {
"type": "git",
"url": "https://github.com/webonyx/graphql-php.git",
- "reference": "c58c08f3e2d6c43a8e0bb4bcc61ecb2a3e4f85df"
+ "reference": "99290f7945a5b39ad823f7600fa196de62597e9d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/c58c08f3e2d6c43a8e0bb4bcc61ecb2a3e4f85df",
- "reference": "c58c08f3e2d6c43a8e0bb4bcc61ecb2a3e4f85df",
+ "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/99290f7945a5b39ad823f7600fa196de62597e9d",
+ "reference": "99290f7945a5b39ad823f7600fa196de62597e9d",
"shasum": ""
},
"require": {
@@ -738,24 +800,27 @@
},
"require-dev": {
"amphp/amp": "^2.6",
+ "amphp/http-server": "^2.1",
"dms/phpunit-arraysubset-asserts": "^0.4",
"ergebnis/composer-normalize": "^2.28",
- "mll-lab/php-cs-fixer-config": "^4.4",
+ "mll-lab/php-cs-fixer-config": "^5.0",
"nyholm/psr7": "^1.5",
"phpbench/phpbench": "^1.2",
"phpstan/extension-installer": "^1.1",
- "phpstan/phpstan": "1.9.14",
- "phpstan/phpstan-phpunit": "1.3.3",
- "phpstan/phpstan-strict-rules": "1.4.5",
+ "phpstan/phpstan": "1.10.15",
+ "phpstan/phpstan-phpunit": "1.3.11",
+ "phpstan/phpstan-strict-rules": "1.5.1",
"phpunit/phpunit": "^9.5",
- "psr/http-message": "^1",
+ "psr/http-message": "^1 || ^2",
"react/http": "^1.6",
"react/promise": "^2.9",
+ "rector/rector": "^0.16.0",
"symfony/polyfill-php81": "^1.23",
"symfony/var-exporter": "^5 || ^6",
"thecodingmachine/safe": "^1.3 || ^2"
},
"suggest": {
+ "amphp/http-server": "To leverage async resolving with webserver on AMPHP platform",
"psr/http-message": "To use standard GraphQL server",
"react/promise": "To leverage async resolving on React PHP platform"
},
@@ -777,7 +842,7 @@
],
"support": {
"issues": "https://github.com/webonyx/graphql-php/issues",
- "source": "https://github.com/webonyx/graphql-php/tree/v15.1.0"
+ "source": "https://github.com/webonyx/graphql-php/tree/v15.4.0"
},
"funding": [
{
@@ -785,7 +850,7 @@
"type": "open_collective"
}
],
- "time": "2023-02-04T15:00:26+00:00"
+ "time": "2023-05-11T10:26:08+00:00"
}
],
"packages-dev": [
@@ -1015,12 +1080,12 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
- "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f"
+ "reference": "4b68cf86b766ec429f4f68af648817cdfb360582"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f",
- "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/4b68cf86b766ec429f4f68af648817cdfb360582",
+ "reference": "4b68cf86b766ec429f4f68af648817cdfb360582",
"shasum": ""
},
"require": {
@@ -1082,9 +1147,9 @@
],
"support": {
"issues": "https://github.com/doctrine/annotations/issues",
- "source": "https://github.com/doctrine/annotations/tree/2.0.1"
+ "source": "https://github.com/doctrine/annotations/tree/2.0.x"
},
- "time": "2023-02-02T22:02:53+00:00"
+ "time": "2023-03-27T17:43:32+00:00"
},
{
"name": "doctrine/deprecations",
@@ -1156,7 +1221,6 @@
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"vimeo/psalm": "^4.30 || ^5.4"
},
- "default-branch": true,
"type": "library",
"autoload": {
"psr-4": {
@@ -1281,16 +1345,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v3.14.4",
+ "version": "v3.17.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
- "reference": "1b3d9dba63d93b8a202c31e824748218781eae6b"
+ "reference": "3f0ed862f22386c55a767461ef5083bddceeed79"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/1b3d9dba63d93b8a202c31e824748218781eae6b",
- "reference": "1b3d9dba63d93b8a202c31e824748218781eae6b",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/3f0ed862f22386c55a767461ef5083bddceeed79",
+ "reference": "3f0ed862f22386c55a767461ef5083bddceeed79",
"shasum": ""
},
"require": {
@@ -1357,9 +1421,15 @@
}
],
"description": "A tool to automatically fix PHP code style",
+ "keywords": [
+ "Static code analysis",
+ "fixer",
+ "standards",
+ "static analysis"
+ ],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
- "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.14.4"
+ "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.17.0"
},
"funding": [
{
@@ -1367,26 +1437,26 @@
"type": "github"
}
],
- "time": "2023-02-09T21:49:13+00:00"
+ "time": "2023-05-22T19:59:32+00:00"
},
{
"name": "guzzlehttp/guzzle",
- "version": "dev-master",
+ "version": "7.7.x-dev",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "8459341c16f96b9610dcdfe22bd3060d60c0da04"
+ "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/8459341c16f96b9610dcdfe22bd3060d60c0da04",
- "reference": "8459341c16f96b9610dcdfe22bd3060d60c0da04",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5",
+ "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5",
"shasum": ""
},
"require": {
"ext-json": "*",
- "guzzlehttp/promises": "^1.5",
- "guzzlehttp/psr7": "^1.9 || ^2.4",
+ "guzzlehttp/promises": "^1.5.3 || ^2.0",
+ "guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -1397,7 +1467,8 @@
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.1",
"ext-curl": "*",
- "php-http/client-integration-tests": "^3.0",
+ "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+ "php-http/message-factory": "^1.1",
"phpunit/phpunit": "^8.5.29 || ^9.5.23",
"psr/log": "^1.1 || ^2.0 || ^3.0"
},
@@ -1412,9 +1483,6 @@
"bamarni-bin": {
"bin-links": true,
"forward-command": false
- },
- "branch-alias": {
- "dev-master": "7.5-dev"
}
},
"autoload": {
@@ -1480,7 +1548,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
- "source": "https://github.com/guzzle/guzzle/tree/master"
+ "source": "https://github.com/guzzle/guzzle/tree/7.7.0"
},
"funding": [
{
@@ -1496,39 +1564,38 @@
"type": "tidelift"
}
],
- "time": "2022-08-29T11:03:19+00:00"
+ "time": "2023-05-21T14:04:53+00:00"
},
{
"name": "guzzlehttp/promises",
- "version": "dev-master",
+ "version": "2.0.x-dev",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "b94b2807d85443f9719887892882d0329d1e2598"
+ "reference": "4a94655427efd6906ed3eb628c79693291264713"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
- "reference": "b94b2807d85443f9719887892882d0329d1e2598",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/4a94655427efd6906ed3eb628c79693291264713",
+ "reference": "4a94655427efd6906ed3eb628c79693291264713",
"shasum": ""
},
"require": {
- "php": ">=5.5"
+ "php": "^7.2.5 || ^8.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "^4.4 || ^5.1"
+ "bamarni/composer-bin-plugin": "^1.8.1",
+ "phpunit/phpunit": "^8.5.29 || ^9.5.23"
},
"default-branch": true,
"type": "library",
"extra": {
- "branch-alias": {
- "dev-master": "1.5-dev"
+ "bamarni-bin": {
+ "bin-links": true,
+ "forward-command": false
}
},
"autoload": {
- "files": [
- "src/functions_include.php"
- ],
"psr-4": {
"GuzzleHttp\\Promise\\": "src/"
}
@@ -1565,7 +1632,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
- "source": "https://github.com/guzzle/promises/tree/1.5.2"
+ "source": "https://github.com/guzzle/promises/tree/2.0"
},
"funding": [
{
@@ -1581,26 +1648,26 @@
"type": "tidelift"
}
],
- "time": "2022-08-28T14:55:35+00:00"
+ "time": "2023-05-21T19:15:14+00:00"
},
{
"name": "guzzlehttp/psr7",
- "version": "dev-master",
+ "version": "2.6.x-dev",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "58d0734481de3fbc62f3d13da4d991e051521282"
+ "reference": "b635f279edd83fc275f822a1188157ffea568ff6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/58d0734481de3fbc62f3d13da4d991e051521282",
- "reference": "58d0734481de3fbc62f3d13da4d991e051521282",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6",
+ "reference": "b635f279edd83fc275f822a1188157ffea568ff6",
"shasum": ""
},
"require": {
"php": "^7.2.5 || ^8.0",
"psr/http-factory": "^1.0",
- "psr/http-message": "^1.0",
+ "psr/http-message": "^1.1 || ^2.0",
"ralouphie/getallheaders": "^3.0"
},
"provide": {
@@ -1615,15 +1682,11 @@
"suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
},
- "default-branch": true,
"type": "library",
"extra": {
"bamarni-bin": {
"bin-links": true,
"forward-command": false
- },
- "branch-alias": {
- "dev-master": "2.4-dev"
}
},
"autoload": {
@@ -1685,7 +1748,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/master"
+ "source": "https://github.com/guzzle/psr7/tree/2.5.0"
},
"funding": [
{
@@ -1701,7 +1764,7 @@
"type": "tidelift"
}
],
- "time": "2023-02-15T13:59:53+00:00"
+ "time": "2023-04-17T16:11:26+00:00"
},
{
"name": "jms/metadata",
@@ -1774,12 +1837,12 @@
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/serializer.git",
- "reference": "402a12629e3ad6d6897273769808a28c32745309"
+ "reference": "d5cc4674015e362370cbd370948e2ae03496a7cc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/402a12629e3ad6d6897273769808a28c32745309",
- "reference": "402a12629e3ad6d6897273769808a28c32745309",
+ "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/d5cc4674015e362370cbd370948e2ae03496a7cc",
+ "reference": "d5cc4674015e362370cbd370948e2ae03496a7cc",
"shasum": ""
},
"require": {
@@ -1800,8 +1863,8 @@
"ocramius/proxy-manager": "^1.0|^2.0",
"phpbench/phpbench": "^1.0",
"phpstan/phpstan": "^1.0.2",
- "phpunit/phpunit": "^8.5.21||^9.0",
- "psr/container": "^1.0",
+ "phpunit/phpunit": "^8.5.21||^9.0||^10.0",
+ "psr/container": "^1.0|^2.0",
"symfony/dependency-injection": "^3.0|^4.0|^5.0|^6.0",
"symfony/expression-language": "^3.2|^4.0|^5.0|^6.0",
"symfony/filesystem": "^3.0|^4.0|^5.0|^6.0",
@@ -1863,7 +1926,7 @@
"type": "github"
}
],
- "time": "2023-02-03T05:06:38+00:00"
+ "time": "2023-05-18T04:58:29+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -1871,12 +1934,12 @@
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
+ "reference": "928a96f585b86224ebc78f8f09d0482cf15b04f5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
- "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/928a96f585b86224ebc78f8f09d0482cf15b04f5",
+ "reference": "928a96f585b86224ebc78f8f09d0482cf15b04f5",
"shasum": ""
},
"require": {
@@ -1884,11 +1947,12 @@
},
"conflict": {
"doctrine/collections": "<1.6.8",
- "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+ "doctrine/common": "<2.13.3 || >=3 <3.2.2"
},
"require-dev": {
"doctrine/collections": "^1.6.8",
"doctrine/common": "^2.13.3 || ^3.2.2",
+ "phpspec/prophecy": "^1.10",
"phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
},
"default-branch": true,
@@ -1915,7 +1979,7 @@
],
"support": {
"issues": "https://github.com/myclabs/DeepCopy/issues",
- "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
+ "source": "https://github.com/myclabs/DeepCopy/tree/1.x"
},
"funding": [
{
@@ -1923,7 +1987,7 @@
"type": "tidelift"
}
],
- "time": "2022-03-03T13:19:32+00:00"
+ "time": "2023-03-08T17:24:01+00:00"
},
{
"name": "nikic/php-parser",
@@ -1931,12 +1995,12 @@
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039"
+ "reference": "c9e5a13d68486e9fd75f9be1b4639644e54e7f4f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039",
- "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c9e5a13d68486e9fd75f9be1b4639644e54e7f4f",
+ "reference": "c9e5a13d68486e9fd75f9be1b4639644e54e7f4f",
"shasum": ""
},
"require": {
@@ -1978,9 +2042,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3"
+ "source": "https://github.com/nikic/PHP-Parser/tree/4.x"
},
- "time": "2023-01-16T22:05:37+00:00"
+ "time": "2023-05-21T19:22:47+00:00"
},
{
"name": "phar-io/manifest",
@@ -2107,20 +2171,20 @@
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/php-option.git",
- "reference": "00430c0532ae544fb1c81e45705b3d356bfc25d0"
+ "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/00430c0532ae544fb1c81e45705b3d356bfc25d0",
- "reference": "00430c0532ae544fb1c81e45705b3d356bfc25d0",
+ "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dd3a383e599f49777d8b628dadbb90cae435b87e",
+ "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e",
"shasum": ""
},
"require": {
"php": "^7.2.5 || ^8.0"
},
"require-dev": {
- "bamarni/composer-bin-plugin": "^1.8.1",
- "phpunit/phpunit": "^8.5.30 || ^9.5.25"
+ "bamarni/composer-bin-plugin": "^1.8.2",
+ "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12"
},
"default-branch": true,
"type": "library",
@@ -2163,7 +2227,7 @@
],
"support": {
"issues": "https://github.com/schmittjoh/php-option/issues",
- "source": "https://github.com/schmittjoh/php-option/tree/master"
+ "source": "https://github.com/schmittjoh/php-option/tree/1.9.1"
},
"funding": [
{
@@ -2175,26 +2239,27 @@
"type": "tidelift"
}
],
- "time": "2022-10-15T20:52:05+00:00"
+ "time": "2023-02-25T19:38:58+00:00"
},
{
"name": "phpstan/phpdoc-parser",
- "version": "1.16.1",
+ "version": "1.21.x-dev",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
- "reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571"
+ "reference": "7f78fd1ff463a7884a331fdb84a25f724dbfd9ea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/e27e92d939e2e3636f0a1f0afaba59692c0bf571",
- "reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/7f78fd1ff463a7884a331fdb84a25f724dbfd9ea",
+ "reference": "7f78fd1ff463a7884a331fdb84a25f724dbfd9ea",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0"
},
"require-dev": {
+ "nikic/php-parser": "^4.15",
"php-parallel-lint/php-parallel-lint": "^1.2",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^1.5",
@@ -2203,6 +2268,7 @@
"phpunit/phpunit": "^9.5",
"symfony/process": "^5.2"
},
+ "default-branch": true,
"type": "library",
"autoload": {
"psr-4": {
@@ -2218,9 +2284,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
- "source": "https://github.com/phpstan/phpdoc-parser/tree/1.16.1"
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/1.21.x"
},
- "time": "2023-02-07T18:11:17+00:00"
+ "time": "2023-05-17T16:44:57+00:00"
},
{
"name": "phpstan/phpstan",
@@ -2228,12 +2294,12 @@
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "e4e424021a9a9ec9f4c06572c55feb09737d1f8e"
+ "reference": "42afb02dce13d12623865f068f32ad340ee8ed6f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e4e424021a9a9ec9f4c06572c55feb09737d1f8e",
- "reference": "e4e424021a9a9ec9f4c06572c55feb09737d1f8e",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/42afb02dce13d12623865f068f32ad340ee8ed6f",
+ "reference": "42afb02dce13d12623865f068f32ad340ee8ed6f",
"shasum": ""
},
"require": {
@@ -2242,7 +2308,6 @@
"conflict": {
"phpstan/phpstan-shim": "*"
},
- "default-branch": true,
"bin": [
"phpstan",
"phpstan.phar"
@@ -2263,8 +2328,11 @@
"static analysis"
],
"support": {
+ "docs": "https://phpstan.org/user-guide/getting-started",
+ "forum": "https://github.com/phpstan/phpstan/discussions",
"issues": "https://github.com/phpstan/phpstan/issues",
- "source": "https://github.com/phpstan/phpstan/tree/1.10.x"
+ "security": "https://github.com/phpstan/phpstan/security/policy",
+ "source": "https://github.com/phpstan/phpstan-src"
},
"funding": [
{
@@ -2280,7 +2348,7 @@
"type": "tidelift"
}
],
- "time": "2023-02-15T20:23:03+00:00"
+ "time": "2023-05-25T11:20:07+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -2288,19 +2356,19 @@
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "8083be52c6f5ba5a48eafa154e0aeefd96bda098"
+ "reference": "100663232669bdacd3ac18f4cc12c38beec9aff1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/8083be52c6f5ba5a48eafa154e0aeefd96bda098",
- "reference": "8083be52c6f5ba5a48eafa154e0aeefd96bda098",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/100663232669bdacd3ac18f4cc12c38beec9aff1",
+ "reference": "100663232669bdacd3ac18f4cc12c38beec9aff1",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"ext-xmlwriter": "*",
- "nikic/php-parser": "^4.14",
+ "nikic/php-parser": "^4.15",
"php": ">=7.3",
"phpunit/php-file-iterator": "^3.0.3",
"phpunit/php-text-template": "^2.0.2",
@@ -2315,8 +2383,8 @@
"phpunit/phpunit": "^9.3"
},
"suggest": {
- "ext-pcov": "*",
- "ext-xdebug": "*"
+ "ext-pcov": "PHP extension that provides line coverage",
+ "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
},
"type": "library",
"extra": {
@@ -2349,6 +2417,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+ "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2"
},
"funding": [
@@ -2357,7 +2426,7 @@
"type": "github"
}
],
- "time": "2023-02-11T08:53:26+00:00"
+ "time": "2023-05-25T06:20:28+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -2606,12 +2675,12 @@
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "4e6f3c050b54192d0a28c6f314a3567c00a7d017"
+ "reference": "9d8ffd638716761de07b60262fceb553cb4afcd9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4e6f3c050b54192d0a28c6f314a3567c00a7d017",
- "reference": "4e6f3c050b54192d0a28c6f314a3567c00a7d017",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9d8ffd638716761de07b60262fceb553cb4afcd9",
+ "reference": "9d8ffd638716761de07b60262fceb553cb4afcd9",
"shasum": ""
},
"require": {
@@ -2644,8 +2713,8 @@
"sebastian/version": "^3.0.2"
},
"suggest": {
- "ext-soap": "*",
- "ext-xdebug": "*"
+ "ext-soap": "To be able to generate mocks based on WSDL files",
+ "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
},
"bin": [
"phpunit"
@@ -2684,6 +2753,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
+ "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6"
},
"funding": [
@@ -2700,7 +2770,7 @@
"type": "tidelift"
}
],
- "time": "2023-02-14T15:49:39+00:00"
+ "time": "2023-05-25T06:23:23+00:00"
},
{
"name": "psr/cache",
@@ -2868,17 +2938,17 @@
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-client.git",
- "reference": "22b2ef5687f43679481615605d7a15c557ce85b1"
+ "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-client/zipball/22b2ef5687f43679481615605d7a15c557ce85b1",
- "reference": "22b2ef5687f43679481615605d7a15c557ce85b1",
+ "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31",
+ "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31",
"shasum": ""
},
"require": {
"php": "^7.0 || ^8.0",
- "psr/http-message": "^1.0"
+ "psr/http-message": "^1.0 || ^2.0"
},
"default-branch": true,
"type": "library",
@@ -2911,9 +2981,9 @@
"psr-18"
],
"support": {
- "source": "https://github.com/php-fig/http-client/tree/master"
+ "source": "https://github.com/php-fig/http-client/tree/1.0.2"
},
- "time": "2020-09-19T09:12:31+00:00"
+ "time": "2023-04-10T20:12:12+00:00"
},
{
"name": "psr/http-factory",
@@ -2921,17 +2991,17 @@
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-factory.git",
- "reference": "5a4f141ac2e5bc35e615134f127e1833158d2944"
+ "reference": "6d70f402f0eddb2b154b22950b5381bbf5b28469"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-factory/zipball/5a4f141ac2e5bc35e615134f127e1833158d2944",
- "reference": "5a4f141ac2e5bc35e615134f127e1833158d2944",
+ "url": "https://api.github.com/repos/php-fig/http-factory/zipball/6d70f402f0eddb2b154b22950b5381bbf5b28469",
+ "reference": "6d70f402f0eddb2b154b22950b5381bbf5b28469",
"shasum": ""
},
"require": {
"php": ">=7.0.0",
- "psr/http-message": "^1.0"
+ "psr/http-message": "^1.0 || ^2.0"
},
"default-branch": true,
"type": "library",
@@ -2955,7 +3025,7 @@
"homepage": "https://www.php-fig.org/"
}
],
- "description": "Common interfaces for PSR-7 HTTP message factories",
+ "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
"keywords": [
"factory",
"http",
@@ -2969,7 +3039,7 @@
"support": {
"source": "https://github.com/php-fig/http-factory/tree/master"
},
- "time": "2022-07-14T07:21:53+00:00"
+ "time": "2023-05-17T18:32:11+00:00"
},
{
"name": "psr/http-message",
@@ -2977,22 +3047,22 @@
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-message.git",
- "reference": "efd67d1dc14a7ef4fc4e518e7dee91c271d524e4"
+ "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-message/zipball/efd67d1dc14a7ef4fc4e518e7dee91c271d524e4",
- "reference": "efd67d1dc14a7ef4fc4e518e7dee91c271d524e4",
+ "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+ "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": "^7.2 || ^8.0"
},
"default-branch": true,
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -3007,7 +3077,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common interface for HTTP messages",
@@ -3021,9 +3091,9 @@
"response"
],
"support": {
- "source": "https://github.com/php-fig/http-message/tree/master"
+ "source": "https://github.com/php-fig/http-message/tree/2.0"
},
- "time": "2019-08-29T13:16:46+00:00"
+ "time": "2023-04-04T09:54:51+00:00"
},
{
"name": "psr/log",
@@ -3466,16 +3536,16 @@
},
{
"name": "sebastian/diff",
- "version": "4.0.4",
+ "version": "4.0.x-dev",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
+ "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
- "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+ "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
"shasum": ""
},
"require": {
@@ -3520,7 +3590,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/diff/issues",
- "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+ "source": "https://github.com/sebastianbergmann/diff/tree/4.0"
},
"funding": [
{
@@ -3528,7 +3598,7 @@
"type": "github"
}
],
- "time": "2020-10-26T13:10:38+00:00"
+ "time": "2023-05-07T05:35:17+00:00"
},
{
"name": "sebastian/environment",
@@ -3972,12 +4042,12 @@
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/resource-operations.git",
- "reference": "e1157eac767e4dc4ae40dd9aab7fb4de6e56bd32"
+ "reference": "20bdda85c7c585ab265c0c37ec052a019bae29c4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/e1157eac767e4dc4ae40dd9aab7fb4de6e56bd32",
- "reference": "e1157eac767e4dc4ae40dd9aab7fb4de6e56bd32",
+ "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/20bdda85c7c585ab265c0c37ec052a019bae29c4",
+ "reference": "20bdda85c7c585ab265c0c37ec052a019bae29c4",
"shasum": ""
},
"require": {
@@ -4019,7 +4089,7 @@
"type": "github"
}
],
- "time": "2023-02-08T06:53:39+00:00"
+ "time": "2023-03-25T08:11:39+00:00"
},
{
"name": "sebastian/type",
@@ -4132,16 +4202,16 @@
},
{
"name": "symfony/console",
- "version": "6.3.x-dev",
+ "version": "6.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "766d8f0b461e01dcbb352e02dc72455b1e55aeb8"
+ "reference": "6d340bfbfc082c9ed7eec4844f12132a26b2d344"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/766d8f0b461e01dcbb352e02dc72455b1e55aeb8",
- "reference": "766d8f0b461e01dcbb352e02dc72455b1e55aeb8",
+ "url": "https://api.github.com/repos/symfony/console/zipball/6d340bfbfc082c9ed7eec4844f12132a26b2d344",
+ "reference": "6d340bfbfc082c9ed7eec4844f12132a26b2d344",
"shasum": ""
},
"require": {
@@ -4149,7 +4219,7 @@
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/polyfill-mbstring": "~1.0",
"symfony/service-contracts": "^2.5|^3",
- "symfony/string": "^5.4|^6.0"
+ "symfony/string": "^5.4|^6.0|^7.0"
},
"conflict": {
"symfony/dependency-injection": "<5.4",
@@ -4163,18 +4233,12 @@
},
"require-dev": {
"psr/log": "^1|^2|^3",
- "symfony/config": "^5.4|^6.0",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/event-dispatcher": "^5.4|^6.0",
- "symfony/lock": "^5.4|^6.0",
- "symfony/process": "^5.4|^6.0",
- "symfony/var-dumper": "^5.4|^6.0"
- },
- "suggest": {
- "psr/log": "For using the console logger",
- "symfony/event-dispatcher": "",
- "symfony/lock": "",
- "symfony/process": ""
+ "symfony/config": "^5.4|^6.0|^7.0",
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+ "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+ "symfony/lock": "^5.4|^6.0|^7.0",
+ "symfony/process": "^5.4|^6.0|^7.0",
+ "symfony/var-dumper": "^5.4|^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -4203,12 +4267,12 @@
"homepage": "https://symfony.com",
"keywords": [
"cli",
- "command line",
+ "command-line",
"console",
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/6.3"
+ "source": "https://github.com/symfony/console/tree/6.4"
},
"funding": [
{
@@ -4224,30 +4288,29 @@
"type": "tidelift"
}
],
- "time": "2023-02-15T16:09:02+00:00"
+ "time": "2023-05-23T16:34:37+00:00"
},
{
"name": "symfony/deprecation-contracts",
- "version": "dev-main",
+ "version": "3.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3"
+ "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3",
- "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
+ "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
"shasum": ""
},
"require": {
"php": ">=8.1"
},
- "default-branch": true,
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.3-dev"
+ "dev-main": "3.4-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -4276,7 +4339,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0"
+ "source": "https://github.com/symfony/deprecation-contracts/tree/3.4"
},
"funding": [
{
@@ -4292,20 +4355,20 @@
"type": "tidelift"
}
],
- "time": "2022-11-25T10:21:52+00:00"
+ "time": "2023-05-23T14:45:45+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "6.3.x-dev",
+ "version": "6.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "be9d2633c312adc9804ee8aa6426cbc4277c2bf1"
+ "reference": "9ebe352542105f5f7186610a83deb18b90fae3d3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/be9d2633c312adc9804ee8aa6426cbc4277c2bf1",
- "reference": "be9d2633c312adc9804ee8aa6426cbc4277c2bf1",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9ebe352542105f5f7186610a83deb18b90fae3d3",
+ "reference": "9ebe352542105f5f7186610a83deb18b90fae3d3",
"shasum": ""
},
"require": {
@@ -4322,17 +4385,13 @@
},
"require-dev": {
"psr/log": "^1|^2|^3",
- "symfony/config": "^5.4|^6.0",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/error-handler": "^5.4|^6.0",
- "symfony/expression-language": "^5.4|^6.0",
- "symfony/http-foundation": "^5.4|^6.0",
+ "symfony/config": "^5.4|^6.0|^7.0",
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+ "symfony/error-handler": "^5.4|^6.0|^7.0",
+ "symfony/expression-language": "^5.4|^6.0|^7.0",
+ "symfony/http-foundation": "^5.4|^6.0|^7.0",
"symfony/service-contracts": "^2.5|^3",
- "symfony/stopwatch": "^5.4|^6.0"
- },
- "suggest": {
- "symfony/dependency-injection": "",
- "symfony/http-kernel": ""
+ "symfony/stopwatch": "^5.4|^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -4360,7 +4419,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/6.3"
+ "source": "https://github.com/symfony/event-dispatcher/tree/6.4"
},
"funding": [
{
@@ -4376,34 +4435,30 @@
"type": "tidelift"
}
],
- "time": "2023-02-14T09:04:20+00:00"
+ "time": "2023-05-23T16:34:37+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
- "version": "dev-main",
+ "version": "3.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
- "reference": "0782b0b52a737a05b4383d0df35a474303cabdae"
+ "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0782b0b52a737a05b4383d0df35a474303cabdae",
- "reference": "0782b0b52a737a05b4383d0df35a474303cabdae",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
+ "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
"shasum": ""
},
"require": {
"php": ">=8.1",
"psr/event-dispatcher": "^1"
},
- "suggest": {
- "symfony/event-dispatcher-implementation": ""
- },
- "default-branch": true,
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.3-dev"
+ "dev-main": "3.4-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -4440,7 +4495,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.2.0"
+ "source": "https://github.com/symfony/event-dispatcher-contracts/tree/3.4"
},
"funding": [
{
@@ -4456,20 +4511,20 @@
"type": "tidelift"
}
],
- "time": "2022-11-25T10:21:52+00:00"
+ "time": "2023-05-23T14:45:45+00:00"
},
{
"name": "symfony/filesystem",
- "version": "6.3.x-dev",
+ "version": "6.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "bf3226d895bb4cd6635ef42649ec4a5818e3bf01"
+ "reference": "c2196aa8b563ed0bc645ee316c40ead823adfead"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/bf3226d895bb4cd6635ef42649ec4a5818e3bf01",
- "reference": "bf3226d895bb4cd6635ef42649ec4a5818e3bf01",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/c2196aa8b563ed0bc645ee316c40ead823adfead",
+ "reference": "c2196aa8b563ed0bc645ee316c40ead823adfead",
"shasum": ""
},
"require": {
@@ -4503,7 +4558,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/6.3"
+ "source": "https://github.com/symfony/filesystem/tree/v6.3.0-RC1"
},
"funding": [
{
@@ -4519,27 +4574,27 @@
"type": "tidelift"
}
],
- "time": "2023-02-14T09:04:20+00:00"
+ "time": "2023-04-28T16:05:33+00:00"
},
{
"name": "symfony/finder",
- "version": "6.3.x-dev",
+ "version": "6.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "f5891f0383dc22a615ebd5848e87328d1efad0be"
+ "reference": "1bb60aa99f06979e6078007a812eb7c5ffc8efc2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/f5891f0383dc22a615ebd5848e87328d1efad0be",
- "reference": "f5891f0383dc22a615ebd5848e87328d1efad0be",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/1bb60aa99f06979e6078007a812eb7c5ffc8efc2",
+ "reference": "1bb60aa99f06979e6078007a812eb7c5ffc8efc2",
"shasum": ""
},
"require": {
"php": ">=8.1"
},
"require-dev": {
- "symfony/filesystem": "^6.0"
+ "symfony/filesystem": "^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -4567,7 +4622,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/6.3"
+ "source": "https://github.com/symfony/finder/tree/6.4"
},
"funding": [
{
@@ -4583,20 +4638,20 @@
"type": "tidelift"
}
],
- "time": "2023-02-14T09:04:20+00:00"
+ "time": "2023-05-23T16:34:37+00:00"
},
{
"name": "symfony/options-resolver",
- "version": "6.3.x-dev",
+ "version": "6.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
- "reference": "2fdfd4259397b1300da21c04ba52a673763b73c9"
+ "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/options-resolver/zipball/2fdfd4259397b1300da21c04ba52a673763b73c9",
- "reference": "2fdfd4259397b1300da21c04ba52a673763b73c9",
+ "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a10f19f5198d589d5c33333cffe98dc9820332dd",
+ "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd",
"shasum": ""
},
"require": {
@@ -4634,7 +4689,7 @@
"options"
],
"support": {
- "source": "https://github.com/symfony/options-resolver/tree/6.3"
+ "source": "https://github.com/symfony/options-resolver/tree/v6.3.0-RC1"
},
"funding": [
{
@@ -4650,7 +4705,7 @@
"type": "tidelift"
}
],
- "time": "2023-02-14T09:04:20+00:00"
+ "time": "2023-05-12T14:21:09+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -5152,16 +5207,16 @@
},
{
"name": "symfony/process",
- "version": "6.3.x-dev",
+ "version": "6.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "8d7df636e53698bf990ec0a22b67ec273aabf608"
+ "reference": "8741e3ed7fe2e91ec099e02446fb86667a0f1628"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/8d7df636e53698bf990ec0a22b67ec273aabf608",
- "reference": "8d7df636e53698bf990ec0a22b67ec273aabf608",
+ "url": "https://api.github.com/repos/symfony/process/zipball/8741e3ed7fe2e91ec099e02446fb86667a0f1628",
+ "reference": "8741e3ed7fe2e91ec099e02446fb86667a0f1628",
"shasum": ""
},
"require": {
@@ -5193,7 +5248,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/6.3"
+ "source": "https://github.com/symfony/process/tree/v6.3.0-RC1"
},
"funding": [
{
@@ -5209,20 +5264,20 @@
"type": "tidelift"
}
],
- "time": "2023-02-14T09:04:20+00:00"
+ "time": "2023-05-19T08:06:44+00:00"
},
{
"name": "symfony/service-contracts",
- "version": "dev-main",
+ "version": "3.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "aac98028c69df04ee77eb69b96b86ee51fbf4b75"
+ "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/aac98028c69df04ee77eb69b96b86ee51fbf4b75",
- "reference": "aac98028c69df04ee77eb69b96b86ee51fbf4b75",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
+ "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
"shasum": ""
},
"require": {
@@ -5232,14 +5287,10 @@
"conflict": {
"ext-psr": "<1.1|>=2"
},
- "suggest": {
- "symfony/service-implementation": ""
- },
- "default-branch": true,
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.3-dev"
+ "dev-main": "3.4-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -5279,7 +5330,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/service-contracts/tree/v3.2.0"
+ "source": "https://github.com/symfony/service-contracts/tree/3.4"
},
"funding": [
{
@@ -5295,20 +5346,20 @@
"type": "tidelift"
}
],
- "time": "2022-11-25T10:21:52+00:00"
+ "time": "2023-05-23T14:45:45+00:00"
},
{
"name": "symfony/stopwatch",
- "version": "6.3.x-dev",
+ "version": "6.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
- "reference": "f7fa451783b748e7b5942b9afe889b8df062e935"
+ "reference": "fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f7fa451783b748e7b5942b9afe889b8df062e935",
- "reference": "f7fa451783b748e7b5942b9afe889b8df062e935",
+ "url": "https://api.github.com/repos/symfony/stopwatch/zipball/fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2",
+ "reference": "fc47f1015ec80927ff64ba9094dfe8b9d48fe9f2",
"shasum": ""
},
"require": {
@@ -5341,7 +5392,7 @@
"description": "Provides a way to profile code",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/stopwatch/tree/6.3"
+ "source": "https://github.com/symfony/stopwatch/tree/v6.3.0-RC1"
},
"funding": [
{
@@ -5357,20 +5408,20 @@
"type": "tidelift"
}
],
- "time": "2023-02-14T09:04:20+00:00"
+ "time": "2023-02-16T10:14:28+00:00"
},
{
"name": "symfony/string",
- "version": "6.3.x-dev",
+ "version": "6.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "6515bacc98212164f10db4371fa70ee7b8c70b80"
+ "reference": "89bc6d5dcc94c89781e1f986e4d01b7ee91d684b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/6515bacc98212164f10db4371fa70ee7b8c70b80",
- "reference": "6515bacc98212164f10db4371fa70ee7b8c70b80",
+ "url": "https://api.github.com/repos/symfony/string/zipball/89bc6d5dcc94c89781e1f986e4d01b7ee91d684b",
+ "reference": "89bc6d5dcc94c89781e1f986e4d01b7ee91d684b",
"shasum": ""
},
"require": {
@@ -5384,11 +5435,11 @@
"symfony/translation-contracts": "<2.5"
},
"require-dev": {
- "symfony/error-handler": "^5.4|^6.0",
- "symfony/http-client": "^5.4|^6.0",
- "symfony/intl": "^6.2",
+ "symfony/error-handler": "^5.4|^6.0|^7.0",
+ "symfony/http-client": "^5.4|^6.0|^7.0",
+ "symfony/intl": "^6.2|^7.0",
"symfony/translation-contracts": "^2.5|^3.0",
- "symfony/var-exporter": "^5.4|^6.0"
+ "symfony/var-exporter": "^5.4|^6.0|^7.0"
},
"type": "library",
"autoload": {
@@ -5427,7 +5478,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/6.3"
+ "source": "https://github.com/symfony/string/tree/6.4"
},
"funding": [
{
@@ -5443,7 +5494,7 @@
"type": "tidelift"
}
],
- "time": "2023-02-14T09:04:20+00:00"
+ "time": "2023-05-23T16:34:37+00:00"
},
{
"name": "theseer/tokenizer",
diff --git a/core/imageboard/image.php b/core/imageboard/image.php
index 139b6e40..af2483df 100644
--- a/core/imageboard/image.php
+++ b/core/imageboard/image.php
@@ -170,9 +170,9 @@ class Image
* @return Image[]
*/
#[Query(name: "posts", type: "[Post!]!", args: ["tags" => "[string!]"])]
- public static function find_images(?int $start = 0, ?int $limit = null, array $tags=[]): array
+ public static function find_images(?int $offset = 0, ?int $limit = null, array $tags=[]): array
{
- $result = self::find_images_internal($start, $limit, $tags);
+ $result = self::find_images_internal($offset, $limit, $tags);
$images = [];
foreach ($result as $row) {
@@ -272,53 +272,6 @@ class Image
return (int)ceil(Image::count_images($tags) / $config->get_int(IndexConfig::IMAGES));
}
- private static function terms_to_conditions(array $terms): array
- {
- $tag_conditions = [];
- $img_conditions = [];
- $stpen = 0; // search term parse event number
- $order = null;
-
- /*
- * Turn a bunch of strings into a bunch of TagCondition
- * and ImgCondition objects
- */
- $stpe = send_event(new SearchTermParseEvent($stpen++, null, $terms));
- if ($stpe->order) {
- $order = $stpe->order;
- } elseif (!empty($stpe->querylets)) {
- foreach ($stpe->querylets as $querylet) {
- $img_conditions[] = new ImgCondition($querylet, true);
- }
- }
-
- foreach ($terms as $term) {
- $positive = true;
- if (is_string($term) && !empty($term) && ($term[0] == '-')) {
- $positive = false;
- $term = substr($term, 1);
- }
- if (strlen($term) === 0) {
- continue;
- }
-
- $stpe = send_event(new SearchTermParseEvent($stpen++, $term, $terms));
- if ($stpe->order) {
- $order = $stpe->order;
- } elseif (!empty($stpe->querylets)) {
- foreach ($stpe->querylets as $querylet) {
- $img_conditions[] = new ImgCondition($querylet, $positive);
- }
- } else {
- // if the whole match is wild, skip this
- if (str_replace("*", "", $term) != "") {
- $tag_conditions[] = new TagCondition($term, $positive);
- }
- }
- }
- return [$tag_conditions, $img_conditions, $order];
- }
-
/*
* Accessors & mutators
*/
@@ -849,19 +802,24 @@ class Image
): Querylet {
global $config;
- list($tag_conditions, $img_conditions, $order) = self::terms_to_conditions($terms);
- $order = ($order ?: "images.".$config->get_string(IndexConfig::ORDER));
+ $tag_conditions = [];
+ $img_conditions = [];
+ $order = null;
- $positive_tag_count = 0;
- $negative_tag_count = 0;
- foreach ($tag_conditions as $tq) {
- if ($tq->positive) {
- $positive_tag_count++;
- } else {
- $negative_tag_count++;
- }
+ /*
+ * Turn a bunch of strings into a bunch of TagCondition
+ * and ImgCondition objects
+ */
+ $stpen = 0; // search term parse event number
+ foreach (array_merge([null], $terms) as $term) {
+ $stpe = send_event(new SearchTermParseEvent($stpen++, $term, $terms));
+ $order ??= $stpe->order;
+ $img_conditions = array_merge($img_conditions, $stpe->img_conditions);
+ $tag_conditions = array_merge($tag_conditions, $stpe->tag_conditions);
}
+ $order = ($order ?: "images.".$config->get_string(IndexConfig::ORDER));
+
/*
* Turn a bunch of Querylet objects into a base query
*
@@ -875,7 +833,7 @@ class Image
*/
// no tags, do a simple search
- if ($positive_tag_count === 0 && $negative_tag_count === 0) {
+ if (count($tag_conditions) === 0) {
$query = new Querylet("SELECT images.* FROM images WHERE 1=1");
}
@@ -883,21 +841,20 @@ class Image
// and do the offset / limit there, which is 10x faster than fetching
// all the image_tags and doing the offset / limit on the result.
elseif (
- (
- ($positive_tag_count === 1 && $negative_tag_count === 0)
- || ($positive_tag_count === 0 && $negative_tag_count === 1)
- )
+ count($tag_conditions) === 1
&& empty($img_conditions)
&& ($order == "id DESC" || $order == "images.id DESC")
&& !is_null($offset)
&& !is_null($limit)
) {
- $in = $positive_tag_count === 1 ? "IN" : "NOT IN";
+ $tc = $tag_conditions[0];
+ $in = $tc->positive ? "IN" : "NOT IN";
// IN (SELECT id FROM tags) is 100x slower than doing a separate
// query and then a second query for IN(first_query_results)??
- $tag_array = self::tag_or_wildcard_to_ids($tag_conditions[0]->tag);
+ $tag_array = self::tag_or_wildcard_to_ids($tc->tag);
if (count($tag_array) == 0) {
- if ($positive_tag_count == 1) {
+ // if wildcard expanded to nothing, take a shortcut
+ if ($tc->positive) {
$query = new Querylet("SELECT images.* FROM images WHERE 1=0");
} else {
$query = new Querylet("SELECT images.* FROM images WHERE 1=1");
@@ -923,7 +880,7 @@ class Image
}
}
- // more than one positive tag, or more than zero negative tags
+ // more than one tag, or more than zero other conditions, or a non-default sort order
else {
$positive_tag_id_array = [];
$positive_wildcard_id_array = [];
diff --git a/core/permissions.php b/core/permissions.php
index 23a4491c..0cf1d9c4 100644
--- a/core/permissions.php
+++ b/core/permissions.php
@@ -118,4 +118,5 @@ abstract class Permissions
public const BULK_IMPORT = "bulk_import";
public const BULK_EXPORT = "bulk_export";
public const BULK_DOWNLOAD = "bulk_download";
+ public const BULK_PARENT_CHILD = "bulk_parent_child";
}
diff --git a/core/userclass.php b/core/userclass.php
index d3fbc7e9..22d2f698 100644
--- a/core/userclass.php
+++ b/core/userclass.php
@@ -184,6 +184,7 @@ new UserClass("admin", "base", [
Permissions::EDIT_FEATURE => true,
Permissions::BULK_EDIT_VOTE => true,
Permissions::EDIT_OTHER_VOTE => true,
+ Permissions::CREATE_VOTE => true,
Permissions::VIEW_SYSINTO => true,
Permissions::HELLBANNED => false,
@@ -222,6 +223,7 @@ new UserClass("admin", "base", [
Permissions::BULK_IMPORT =>true,
Permissions::BULK_EXPORT =>true,
Permissions::BULK_DOWNLOAD => true,
+ Permissions::BULK_PARENT_CHILD => true,
Permissions::SET_PRIVATE_IMAGE => true,
Permissions::SET_OTHERS_PRIVATE_IMAGES => true,
diff --git a/core/util.php b/core/util.php
index 84796074..f761a599 100644
--- a/core/util.php
+++ b/core/util.php
@@ -645,7 +645,7 @@ function _fatal_error(\Exception $e): void
foreach ($t as $n => $f) {
$c = $f['class'] ?? '';
$t = $f['type'] ?? '';
- $a = implode(", ", array_map("Shimmie2\stringer", $f['args']));
+ $a = implode(", ", array_map("Shimmie2\stringer", $f['args'] ?? []));
print("$n: {$f['file']}({$f['line']}): {$c}{$t}{$f['function']}({$a})\n");
}
diff --git a/ext/approval/main.php b/ext/approval/main.php
index 736dc665..90158ff8 100644
--- a/ext/approval/main.php
+++ b/ext/approval/main.php
@@ -121,6 +121,13 @@ class Approval extends Extension
}
}
+ public function onUserBlockBuilding(UserBlockBuildingEvent $event)
+ {
+ global $user;
+ if ($user->can(Permissions::APPROVE_IMAGE)) {
+ $event->add_link("Pending Approval", make_link("/post/list/approved%3Ano/1"), 60);
+ }
+ }
public const SEARCH_REGEXP = "/^approved:(yes|no)/";
public function onSearchTermParse(SearchTermParseEvent $event)
diff --git a/ext/autocomplete/script.js b/ext/autocomplete/script.js
index 06b9b826..d437bbf9 100644
--- a/ext/autocomplete/script.js
+++ b/ext/autocomplete/script.js
@@ -1,7 +1,7 @@
document.addEventListener('DOMContentLoaded', () => {
var metatags = ['order:id', 'order:width', 'order:height', 'order:filesize', 'order:filename', 'order:favorites'];
- $('[name="search"]').tagit({
+ $('.autocomplete_tags').tagit({
singleFieldDelimiter: ' ',
beforeTagAdded: function(event, ui) {
if(metatags.indexOf(ui.tagLabel) !== -1) {
@@ -93,8 +93,14 @@ document.addEventListener('DOMContentLoaded', () => {
//Stop tags containing space.
if(keyCode === 32) {
e.preventDefault();
+ var el = $('.ui-widget-content:focus');
- $('.autocomplete_tags').tagit('createTag', $(this).val());
+ //Find the correct element in a page with multiple tagit input boxes.
+ $('.autocomplete_tags').each(function(_,n){
+ if (n.parentNode.contains(el[0])){
+ $(n.parentNode).find('.autocomplete_tags').tagit('createTag', el.val());
+ }
+ });
$(this).autocomplete('close');
} else if (keyCode === 9) {
e.preventDefault();
diff --git a/ext/browser_search/info.php b/ext/browser_search/info.php
index ec07ed65..0644f9bc 100644
--- a/ext/browser_search/info.php
+++ b/ext/browser_search/info.php
@@ -17,6 +17,6 @@ class BrowserSearchInfo extends ExtensionInfo
public string $description = "Allows the user to add a browser 'plugin' to search the site with real-time suggestions";
public ?string $documentation =
"Once installed, users with an opensearch compatible browser should see their search box light up with whatever \"click here to add a search engine\" notification they have
-
-Some code (and lots of help) by Artanis (Erik Youngren
+
+ Delete
+
+ Tag
+
+ Source
+
+
Some code (and lots of help) by Artanis (Erik Youngren) from the 'tagger' extension - Used with permission";
}
diff --git a/ext/bulk_actions/info.php b/ext/bulk_actions/info.php
index b469d2a0..6d2f8fe0 100644
--- a/ext/bulk_actions/info.php
+++ b/ext/bulk_actions/info.php
@@ -13,5 +13,26 @@ class BulkActionsInfo extends ExtensionInfo
public array $authors = ["Matthew Barbour"=>"matthew@darkholme.net"];
public string $license = self::LICENSE_WTFPL;
public string $description = "Provides query and selection-based bulk action support";
- public ?string $documentation = "Provides bulk action section in list view. Allows performing actions against a set of posts based on query or manual selection. Based on Mass Tagger by Christian Walde
Deletes all selected posts.
+
Add the tags to all selected posts.
+ [background wallpaper]
+ [sky]
→ [background wallpaper sky]
+
+
Remove the tags from all selected posts.
+ [background wallpaper]
+ [-wallpaper]
→ [background]
+
+
Replace the tags in all selected posts.
+ [background wallpaper]
+ [sky]
→ [sky]
+
Sets the source of all selected posts.
+
Notes:
+"Notes:
danbooru API based on documentation from danbooru 1.0 -
http://attachr.com/7569
I've only been able to test add_post and find_tags because I use the
@@ -24,34 +24,32 @@ class DanbooruApiInfo extends ExtensionInfo