diff --git a/composer.json b/composer.json
index 2bafd7217..f25fa036b 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
"roave/security-advisories": "dev-master",
"christophwurst/nextcloud": "dev-master",
"phpunit/phpunit": "^8",
- "nextcloud/coding-standard": "^0.4.0",
+ "nextcloud/coding-standard": "^0.5.0",
"symfony/event-dispatcher": "^4.0",
"vimeo/psalm": "^4.3",
"php-parallel-lint/php-parallel-lint": "^1.2"
diff --git a/composer.lock b/composer.lock
index aa90f7785..ad6945da9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "3172d27bd19b2a125db3197c495deda9",
+ "content-hash": "0438a64454652b8d583560455e4e17f2",
"packages": [
{
"name": "cogpowered/finediff",
@@ -530,16 +530,16 @@
},
{
"name": "doctrine/annotations",
- "version": "1.11.1",
+ "version": "1.12.x-dev",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
- "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad"
+ "reference": "22569784dd247b2109646b4762a5c538e004f69d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/ce77a7ba1770462cd705a91a151b6c3746f9c6ad",
- "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/22569784dd247b2109646b4762a5c538e004f69d",
+ "reference": "22569784dd247b2109646b4762a5c538e004f69d",
"shasum": ""
},
"require": {
@@ -554,11 +554,6 @@
"phpunit/phpunit": "^7.5 || ^9.1.5"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.11.x-dev"
- }
- },
"autoload": {
"psr-4": {
"Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
@@ -599,9 +594,9 @@
],
"support": {
"issues": "https://github.com/doctrine/annotations/issues",
- "source": "https://github.com/doctrine/annotations/tree/1.11.1"
+ "source": "https://github.com/doctrine/annotations/tree/1.12.x"
},
- "time": "2020-10-26T10:28:16+00:00"
+ "time": "2021-01-12T23:03:47+00:00"
},
{
"name": "doctrine/instantiator",
@@ -674,30 +669,30 @@
},
{
"name": "doctrine/lexer",
- "version": "1.2.1",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
- "reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
+ "reference": "cffe3e94d62f717a10a7d8614a19917f9311a5bc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
- "reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
+ "url": "https://api.github.com/repos/doctrine/lexer/zipball/cffe3e94d62f717a10a7d8614a19917f9311a5bc",
+ "reference": "cffe3e94d62f717a10a7d8614a19917f9311a5bc",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0"
},
"require-dev": {
- "doctrine/coding-standard": "^6.0",
- "phpstan/phpstan": "^0.11.8",
- "phpunit/phpunit": "^8.2"
+ "doctrine/coding-standard": "^8.0",
+ "phpstan/phpstan": "^0.12",
+ "phpunit/phpunit": "^8.2 || ^9.4"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "1.3.x-dev"
}
},
"autoload": {
@@ -734,7 +729,7 @@
],
"support": {
"issues": "https://github.com/doctrine/lexer/issues",
- "source": "https://github.com/doctrine/lexer/tree/1.2.1"
+ "source": "https://github.com/doctrine/lexer/tree/master"
},
"funding": [
{
@@ -750,7 +745,7 @@
"type": "tidelift"
}
],
- "time": "2020-05-25T17:44:05+00:00"
+ "time": "2020-12-02T07:27:58+00:00"
},
{
"name": "felixfbecker/advanced-json-rpc",
@@ -856,16 +851,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v2.17.3",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "bd32f5dd72cdfc7b53f54077f980e144bfa2f595"
+ "reference": "4aee7b608ef792e52b96f2b0d7c244add2b1ee3c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/bd32f5dd72cdfc7b53f54077f980e144bfa2f595",
- "reference": "bd32f5dd72cdfc7b53f54077f980e144bfa2f595",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/4aee7b608ef792e52b96f2b0d7c244add2b1ee3c",
+ "reference": "4aee7b608ef792e52b96f2b0d7c244add2b1ee3c",
"shasum": ""
},
"require": {
@@ -887,7 +882,6 @@
"symfony/stopwatch": "^3.0 || ^4.0 || ^5.0"
},
"require-dev": {
- "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
"justinrainbow/json-schema": "^5.0",
"keradus/cli-executor": "^1.4",
"mikey179/vfsstream": "^1.6",
@@ -896,11 +890,11 @@
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
"phpspec/prophecy-phpunit": "^1.1 || ^2.0",
- "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.4.4 <9.5",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.5",
"phpunitgoodpractices/polyfill": "^1.5",
"phpunitgoodpractices/traits": "^1.9.1",
"sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1",
- "symfony/phpunit-bridge": "^5.1",
+ "symfony/phpunit-bridge": "^5.2.1",
"symfony/yaml": "^3.0 || ^4.0 || ^5.0"
},
"suggest": {
@@ -914,6 +908,11 @@
"php-cs-fixer"
],
"type": "application",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.18-dev"
+ }
+ },
"autoload": {
"psr-4": {
"PhpCsFixer\\": "src/"
@@ -948,7 +947,7 @@
"description": "A tool to automatically fix PHP code style",
"support": {
"issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
- "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.17.3"
+ "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/master"
},
"funding": [
{
@@ -956,7 +955,7 @@
"type": "github"
}
],
- "time": "2020-12-24T11:14:44+00:00"
+ "time": "2021-01-15T11:09:59+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -1069,21 +1068,21 @@
},
{
"name": "nextcloud/coding-standard",
- "version": "v0.4.0",
+ "version": "v0.5.0",
"source": {
"type": "git",
"url": "https://github.com/nextcloud/coding-standard.git",
- "reference": "57654010946567d063d231ff0e1ea44e1289f965"
+ "reference": "742ed895ae76c10daf95e08488cfb3f554199f40"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/57654010946567d063d231ff0e1ea44e1289f965",
- "reference": "57654010946567d063d231ff0e1ea44e1289f965",
+ "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/742ed895ae76c10daf95e08488cfb3f554199f40",
+ "reference": "742ed895ae76c10daf95e08488cfb3f554199f40",
"shasum": ""
},
"require": {
"friendsofphp/php-cs-fixer": "^2.17",
- "php": "^7.3|^8.0"
+ "php": "^7.2|^8.0"
},
"type": "library",
"autoload": {
@@ -1104,9 +1103,9 @@
"description": "Nextcloud coding standards for the php cs fixer",
"support": {
"issues": "https://github.com/nextcloud/coding-standard/issues",
- "source": "https://github.com/nextcloud/coding-standard/tree/v0.4.0"
+ "source": "https://github.com/nextcloud/coding-standard/tree/v0.5.0"
},
- "time": "2020-12-14T07:22:40+00:00"
+ "time": "2021-01-11T14:15:58+00:00"
},
{
"name": "nikic/php-parser",
@@ -3317,25 +3316,27 @@
},
{
"name": "symfony/deprecation-contracts",
- "version": "v2.2.0",
+ "version": "dev-main",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665"
+ "reference": "366d03137004f7fd0e9d9ae9360eaf2d5c66d1ad"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665",
- "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/366d03137004f7fd0e9d9ae9360eaf2d5c66d1ad",
+ "reference": "366d03137004f7fd0e9d9ae9360eaf2d5c66d1ad",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
+ "default-branch": true,
"type": "library",
"extra": {
+ "branch-version": "2.3",
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-main": "2.3-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -3364,7 +3365,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/deprecation-contracts/tree/master"
+ "source": "https://github.com/symfony/deprecation-contracts/tree/main"
},
"funding": [
{
@@ -3380,20 +3381,20 @@
"type": "tidelift"
}
],
- "time": "2020-09-07T11:33:47+00:00"
+ "time": "2021-01-01T09:26:45+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v4.4.18",
+ "version": "4.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "5d4c874b0eb1c32d40328a09dbc37307a5a910b0"
+ "reference": "e190184b968e9af9aabce87dddf6b6798a721595"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5d4c874b0eb1c32d40328a09dbc37307a5a910b0",
- "reference": "5d4c874b0eb1c32d40328a09dbc37307a5a910b0",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e190184b968e9af9aabce87dddf6b6798a721595",
+ "reference": "e190184b968e9af9aabce87dddf6b6798a721595",
"shasum": ""
},
"require": {
@@ -3444,10 +3445,10 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony EventDispatcher Component",
+ "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.18"
+ "source": "https://github.com/symfony/event-dispatcher/tree/4.4"
},
"funding": [
{
@@ -3463,7 +3464,7 @@
"type": "tidelift"
}
],
- "time": "2020-12-18T07:41:31+00:00"
+ "time": "2021-01-11T08:57:50+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@@ -3546,22 +3547,23 @@
},
{
"name": "symfony/filesystem",
- "version": "v5.2.1",
+ "version": "5.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "fa8f8cab6b65e2d99a118e082935344c5ba8c60d"
+ "reference": "4ff1d2e04790e021941a9bcbed5aca383f8250da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/fa8f8cab6b65e2d99a118e082935344c5ba8c60d",
- "reference": "fa8f8cab6b65e2d99a118e082935344c5ba8c60d",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/4ff1d2e04790e021941a9bcbed5aca383f8250da",
+ "reference": "4ff1d2e04790e021941a9bcbed5aca383f8250da",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"symfony/polyfill-ctype": "~1.8"
},
+ "default-branch": true,
"type": "library",
"autoload": {
"psr-4": {
@@ -3585,10 +3587,10 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Filesystem Component",
+ "description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v5.2.1"
+ "source": "https://github.com/symfony/filesystem/tree/5.x"
},
"funding": [
{
@@ -3604,25 +3606,26 @@
"type": "tidelift"
}
],
- "time": "2020-11-30T17:05:38+00:00"
+ "time": "2021-01-11T09:50:50+00:00"
},
{
"name": "symfony/finder",
- "version": "v5.2.1",
+ "version": "5.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "0b9231a5922fd7287ba5b411893c0ecd2733e5ba"
+ "reference": "03ff88196e9fec7f273469020b3939b1330e2156"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/0b9231a5922fd7287ba5b411893c0ecd2733e5ba",
- "reference": "0b9231a5922fd7287ba5b411893c0ecd2733e5ba",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/03ff88196e9fec7f273469020b3939b1330e2156",
+ "reference": "03ff88196e9fec7f273469020b3939b1330e2156",
"shasum": ""
},
"require": {
"php": ">=7.2.5"
},
+ "default-branch": true,
"type": "library",
"autoload": {
"psr-4": {
@@ -3646,10 +3649,10 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Finder Component",
+ "description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v5.2.1"
+ "source": "https://github.com/symfony/finder/tree/5.x"
},
"funding": [
{
@@ -3665,20 +3668,20 @@
"type": "tidelift"
}
],
- "time": "2020-12-08T17:02:38+00:00"
+ "time": "2021-01-11T09:50:50+00:00"
},
{
"name": "symfony/options-resolver",
- "version": "v5.2.1",
+ "version": "5.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
- "reference": "87a2a4a766244e796dd9cb9d6f58c123358cd986"
+ "reference": "4059853ccceaf451939a197ce0fefb0acd1124d6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/options-resolver/zipball/87a2a4a766244e796dd9cb9d6f58c123358cd986",
- "reference": "87a2a4a766244e796dd9cb9d6f58c123358cd986",
+ "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4059853ccceaf451939a197ce0fefb0acd1124d6",
+ "reference": "4059853ccceaf451939a197ce0fefb0acd1124d6",
"shasum": ""
},
"require": {
@@ -3687,6 +3690,7 @@
"symfony/polyfill-php73": "~1.0",
"symfony/polyfill-php80": "^1.15"
},
+ "default-branch": true,
"type": "library",
"autoload": {
"psr-4": {
@@ -3710,7 +3714,7 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony OptionsResolver Component",
+ "description": "Provides an improved replacement for the array_replace PHP function",
"homepage": "https://symfony.com",
"keywords": [
"config",
@@ -3718,7 +3722,7 @@
"options"
],
"support": {
- "source": "https://github.com/symfony/options-resolver/tree/v5.2.1"
+ "source": "https://github.com/symfony/options-resolver/tree/5.x"
},
"funding": [
{
@@ -3734,7 +3738,7 @@
"type": "tidelift"
}
],
- "time": "2020-10-24T12:08:07+00:00"
+ "time": "2021-01-11T10:44:39+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -4066,7 +4070,7 @@
},
{
"name": "symfony/polyfill-php70",
- "version": "v1.20.0",
+ "version": "dev-main",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
@@ -4081,6 +4085,7 @@
"require": {
"php": ">=7.1"
},
+ "default-branch": true,
"type": "metapackage",
"extra": {
"branch-alias": {
@@ -4134,25 +4139,26 @@
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.20.0",
+ "version": "dev-main",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930"
+ "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930",
- "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
+ "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
+ "default-branch": true,
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -4190,7 +4196,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php72/tree/v1.20.0"
+ "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.0"
},
"funding": [
{
@@ -4206,7 +4212,7 @@
"type": "tidelift"
}
],
- "time": "2020-10-23T14:02:19+00:00"
+ "time": "2021-01-07T16:49:33+00:00"
},
{
"name": "symfony/polyfill-php73",
@@ -4374,22 +4380,23 @@
},
{
"name": "symfony/process",
- "version": "v5.2.1",
+ "version": "5.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "bd8815b8b6705298beaa384f04fabd459c10bedd"
+ "reference": "b8d6eff26e48187fed15970799f4b605fa7242e4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/bd8815b8b6705298beaa384f04fabd459c10bedd",
- "reference": "bd8815b8b6705298beaa384f04fabd459c10bedd",
+ "url": "https://api.github.com/repos/symfony/process/zipball/b8d6eff26e48187fed15970799f4b605fa7242e4",
+ "reference": "b8d6eff26e48187fed15970799f4b605fa7242e4",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"symfony/polyfill-php80": "^1.15"
},
+ "default-branch": true,
"type": "library",
"autoload": {
"psr-4": {
@@ -4413,10 +4420,10 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Process Component",
+ "description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v5.2.1"
+ "source": "https://github.com/symfony/process/tree/5.x"
},
"funding": [
{
@@ -4432,7 +4439,7 @@
"type": "tidelift"
}
],
- "time": "2020-12-08T17:03:37+00:00"
+ "time": "2021-01-14T15:42:36+00:00"
},
{
"name": "symfony/service-contracts",
@@ -4517,22 +4524,23 @@
},
{
"name": "symfony/stopwatch",
- "version": "v5.2.1",
+ "version": "5.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
- "reference": "2b105c0354f39a63038a1d8bf776ee92852813af"
+ "reference": "f0302d2c69902b195f6bec61dc0bc52736c38b93"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/2b105c0354f39a63038a1d8bf776ee92852813af",
- "reference": "2b105c0354f39a63038a1d8bf776ee92852813af",
+ "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f0302d2c69902b195f6bec61dc0bc52736c38b93",
+ "reference": "f0302d2c69902b195f6bec61dc0bc52736c38b93",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"symfony/service-contracts": "^1.0|^2"
},
+ "default-branch": true,
"type": "library",
"autoload": {
"psr-4": {
@@ -4556,10 +4564,10 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Stopwatch Component",
+ "description": "Provides a way to profile code",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/stopwatch/tree/v5.2.1"
+ "source": "https://github.com/symfony/stopwatch/tree/5.x"
},
"funding": [
{
@@ -4575,7 +4583,7 @@
"type": "tidelift"
}
],
- "time": "2020-11-01T16:14:45+00:00"
+ "time": "2021-01-11T09:51:46+00:00"
},
{
"name": "symfony/string",
diff --git a/psalm.xml b/psalm.xml
index 04840bad9..b171e8627 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -18,6 +18,7 @@
+