diff --git a/composer.lock b/composer.lock index 19ef409f7..7cf526b3a 100644 --- a/composer.lock +++ b/composer.lock @@ -301,30 +301,30 @@ }, { "name": "composer/pcre", - "version": "1.0.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560" + "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560", - "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560", + "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "phpstan/phpstan": "^1.3", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^4.2 || ^5" + "symfony/phpunit-bridge": "^5" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.x-dev" + "dev-main": "3.x-dev" } }, "autoload": { @@ -352,7 +352,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/1.0.1" + "source": "https://github.com/composer/pcre/tree/3.1.0" }, "funding": [ { @@ -368,7 +368,7 @@ "type": "tidelift" } ], - "time": "2022-01-21T20:24:37+00:00" + "time": "2022-11-17T09:50:14+00:00" }, { "name": "composer/semver", @@ -453,27 +453,27 @@ }, { "name": "composer/xdebug-handler", - "version": "2.0.5", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a" + "reference": "ced299686f41dce890debac69273b47ffe98a40c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a", - "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", + "reference": "ced299686f41dce890debac69273b47ffe98a40c", "shasum": "" }, "require": { - "composer/pcre": "^1", - "php": "^5.3.2 || ^7.0 || ^8.0", + "composer/pcre": "^1 || ^2 || ^3", + "php": "^7.2.5 || ^8.0", "psr/log": "^1 || ^2 || ^3" }, "require-dev": { "phpstan/phpstan": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0" + "symfony/phpunit-bridge": "^6.0" }, "type": "library", "autoload": { @@ -499,7 +499,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.5" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" }, "funding": [ { @@ -515,7 +515,7 @@ "type": "tidelift" } ], - "time": "2022-02-24T20:20:32+00:00" + "time": "2022-02-25T21:32:43+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -554,90 +554,18 @@ }, "time": "2019-12-04T15:06:13+00:00" }, - { - "name": "doctrine/annotations", - "version": "1.13.2", - "source": { - "type": "git", - "url": "https://github.com/doctrine/annotations.git", - "reference": "5b668aef16090008790395c02c893b1ba13f7e08" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08", - "reference": "5b668aef16090008790395c02c893b1ba13f7e08", - "shasum": "" - }, - "require": { - "doctrine/lexer": "1.*", - "ext-tokenizer": "*", - "php": "^7.1 || ^8.0", - "psr/cache": "^1 || ^2 || ^3" - }, - "require-dev": { - "doctrine/cache": "^1.11 || ^2.0", - "doctrine/coding-standard": "^6.0 || ^8.1", - "phpstan/phpstan": "^0.12.20", - "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", - "symfony/cache": "^4.4 || ^5.2" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Docblock Annotations Parser", - "homepage": "https://www.doctrine-project.org/projects/annotations.html", - "keywords": [ - "annotations", - "docblock", - "parser" - ], - "support": { - "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.13.2" - }, - "time": "2021-08-05T19:00:23+00:00" - }, { "name": "doctrine/deprecations", - "version": "v1.0.0", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" + "reference": "8cffffb2218e01f3b370bf763e00e81697725259" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/8cffffb2218e01f3b370bf763e00e81697725259", + "reference": "8cffffb2218e01f3b370bf763e00e81697725259", "shasum": "" }, "require": { @@ -665,9 +593,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.0.0" + "source": "https://github.com/doctrine/deprecations/tree/v1.1.0" }, - "time": "2022-05-02T15:47:09+00:00" + "time": "2023-05-29T18:55:17+00:00" }, { "name": "doctrine/instantiator", @@ -739,86 +667,6 @@ ], "time": "2022-12-30T00:15:36+00:00" }, - { - "name": "doctrine/lexer", - "version": "1.2.1", - "source": { - "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.11.8", - "phpunit/phpunit": "^8.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "https://www.doctrine-project.org/projects/lexer.html", - "keywords": [ - "annotations", - "docblock", - "lexer", - "parser", - "php" - ], - "support": { - "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.1" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", - "type": "tidelift" - } - ], - "time": "2020-05-25T17:44:05+00:00" - }, { "name": "felixfbecker/advanced-json-rpc", "version": "v3.2.1", @@ -981,95 +829,6 @@ ], "time": "2022-12-24T12:35:10+00:00" }, - { - "name": "friendsofphp/php-cs-fixer", - "version": "v3.4.0", - "source": { - "type": "git", - "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/47177af1cfb9dab5d1cc4daf91b7179c2efe7fad", - "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad", - "shasum": "" - }, - "require": { - "composer/semver": "^3.2", - "composer/xdebug-handler": "^2.0", - "doctrine/annotations": "^1.12", - "ext-json": "*", - "ext-tokenizer": "*", - "php": "^7.2.5 || ^8.0", - "php-cs-fixer/diff": "^2.0", - "symfony/console": "^4.4.20 || ^5.1.3 || ^6.0", - "symfony/event-dispatcher": "^4.4.20 || ^5.0 || ^6.0", - "symfony/filesystem": "^4.4.20 || ^5.0 || ^6.0", - "symfony/finder": "^4.4.20 || ^5.0 || ^6.0", - "symfony/options-resolver": "^4.4.20 || ^5.0 || ^6.0", - "symfony/polyfill-mbstring": "^1.23", - "symfony/polyfill-php80": "^1.23", - "symfony/polyfill-php81": "^1.23", - "symfony/process": "^4.4.20 || ^5.0 || ^6.0", - "symfony/stopwatch": "^4.4.20 || ^5.0 || ^6.0" - }, - "require-dev": { - "justinrainbow/json-schema": "^5.2", - "keradus/cli-executor": "^1.5", - "mikey179/vfsstream": "^1.6.8", - "php-coveralls/php-coveralls": "^2.5.2", - "php-cs-fixer/accessible-object": "^1.1", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", - "phpspec/prophecy": "^1.15", - "phpspec/prophecy-phpunit": "^1.1 || ^2.0", - "phpunit/phpunit": "^8.5.21 || ^9.5", - "phpunitgoodpractices/polyfill": "^1.5", - "phpunitgoodpractices/traits": "^1.9.1", - "symfony/phpunit-bridge": "^5.2.4 || ^6.0", - "symfony/yaml": "^4.4.20 || ^5.0 || ^6.0" - }, - "suggest": { - "ext-dom": "For handling output formats in XML", - "ext-mbstring": "For handling non-UTF8 characters." - }, - "bin": [ - "php-cs-fixer" - ], - "type": "application", - "autoload": { - "psr-4": { - "PhpCsFixer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Dariusz Rumiński", - "email": "dariusz.ruminski@gmail.com" - } - ], - "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/v3.4.0" - }, - "funding": [ - { - "url": "https://github.com/keradus", - "type": "github" - } - ], - "time": "2021-12-11T16:25:08+00:00" - }, { "name": "myclabs/deep-copy", "version": "1.11.1", @@ -1182,21 +941,21 @@ }, { "name": "nextcloud/coding-standard", - "version": "v1.0.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/nextcloud/coding-standard.git", - "reference": "f3d1f9375e89c605deb1734f59a9f51ecbe80578" + "reference": "55def702fb9a37a219511e1d8c6fe8e37164c1fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/f3d1f9375e89c605deb1734f59a9f51ecbe80578", - "reference": "f3d1f9375e89c605deb1734f59a9f51ecbe80578", + "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/55def702fb9a37a219511e1d8c6fe8e37164c1fb", + "reference": "55def702fb9a37a219511e1d8c6fe8e37164c1fb", "shasum": "" }, "require": { - "friendsofphp/php-cs-fixer": "^3.2", - "php": "^7.3|^8.0" + "php": "^7.3|^8.0", + "php-cs-fixer/shim": "^3.17" }, "type": "library", "autoload": { @@ -1217,9 +976,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/v1.0.0" + "source": "https://github.com/nextcloud/coding-standard/tree/v1.1.1" }, - "time": "2021-11-10T08:44:10+00:00" + "time": "2023-06-01T12:05:01+00:00" }, { "name": "nextcloud/ocp", @@ -1434,56 +1193,56 @@ "time": "2022-02-21T01:04:05+00:00" }, { - "name": "php-cs-fixer/diff", - "version": "v2.0.2", + "name": "php-cs-fixer/shim", + "version": "v3.17.0", "source": { "type": "git", - "url": "https://github.com/PHP-CS-Fixer/diff.git", - "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3" + "url": "https://github.com/PHP-CS-Fixer/shim.git", + "reference": "f51b4aed90565c447136f1d015798f6f7c82490f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3", - "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3", + "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/f51b4aed90565c447136f1d015798f6f7c82490f", + "reference": "f51b4aed90565c447136f1d015798f6f7c82490f", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0 || ^8.0" + "ext-json": "*", + "ext-tokenizer": "*", + "php": "^7.4 || ^8.0" }, - "require-dev": { - "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", - "symfony/process": "^3.3" + "replace": { + "friendsofphp/php-cs-fixer": "self.version" }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] + "suggest": { + "ext-dom": "For handling output formats in XML", + "ext-mbstring": "For handling non-UTF8 characters." }, + "bin": [ + "php-cs-fixer", + "php-cs-fixer.phar" + ], + "type": "application", "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" } ], - "description": "sebastian/diff v3 backport support for PHP 5.6+", - "homepage": "https://github.com/PHP-CS-Fixer", - "keywords": [ - "diff" - ], + "description": "A tool to automatically fix PHP code style", "support": { - "issues": "https://github.com/PHP-CS-Fixer/diff/issues", - "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2" + "issues": "https://github.com/PHP-CS-Fixer/shim/issues", + "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.17.0" }, - "time": "2020-10-14T08:32:19+00:00" + "time": "2023-05-22T20:00:38+00:00" }, { "name": "php-parallel-lint/php-parallel-lint", @@ -2177,55 +1936,6 @@ ], "time": "2023-05-11T05:14:45+00:00" }, - { - "name": "psr/cache", - "version": "3.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/cache.git", - "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", - "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", - "shasum": "" - }, - "require": { - "php": ">=8.0.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Cache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common interface for caching libraries", - "keywords": [ - "cache", - "psr", - "psr-6" - ], - "support": { - "source": "https://github.com/php-fig/cache/tree/3.0.0" - }, - "time": "2021-02-03T23:26:27+00:00" - }, { "name": "psr/clock", "version": "1.0.0", @@ -3883,16 +3593,16 @@ }, { "name": "symfony/console", - "version": "v5.4.23", + "version": "v5.4.24", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "90f21e27d0d88ce38720556dd164d4a1e4c3934c" + "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/90f21e27d0d88ce38720556dd164d4a1e4c3934c", - "reference": "90f21e27d0d88ce38720556dd164d4a1e4c3934c", + "url": "https://api.github.com/repos/symfony/console/zipball/560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8", + "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8", "shasum": "" }, "require": { @@ -3962,7 +3672,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.23" + "source": "https://github.com/symfony/console/tree/v5.4.24" }, "funding": [ { @@ -3978,7 +3688,7 @@ "type": "tidelift" } ], - "time": "2023-04-24T18:47:29+00:00" + "time": "2023-05-26T05:13:16+00:00" }, { "name": "symfony/deprecation-contracts", @@ -4049,16 +3759,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v4.4.34", + "version": "v4.4.44", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "1a024b45369c9d55d76b6b8a241bd20c9ea1cbd8" + "reference": "1e866e9e5c1b22168e0ce5f0b467f19bba61266a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1a024b45369c9d55d76b6b8a241bd20c9ea1cbd8", - "reference": "1a024b45369c9d55d76b6b8a241bd20c9ea1cbd8", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1e866e9e5c1b22168e0ce5f0b467f19bba61266a", + "reference": "1e866e9e5c1b22168e0ce5f0b467f19bba61266a", "shasum": "" }, "require": { @@ -4113,7 +3823,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.34" + "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.44" }, "funding": [ { @@ -4129,7 +3839,7 @@ "type": "tidelift" } ], - "time": "2021-11-15T14:42:25+00:00" + "time": "2022-07-20T09:59:04+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -4274,138 +3984,6 @@ ], "time": "2023-03-02T11:38:35+00:00" }, - { - "name": "symfony/finder", - "version": "v5.4.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "e77046c252be48c48a40816187ed527703c8f76c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/e77046c252be48c48a40816187ed527703c8f76c", - "reference": "e77046c252be48c48a40816187ed527703c8f76c", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php80": "^1.16" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Finder\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Finds files and directories via an intuitive fluent interface", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.2" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-12-15T11:06:13+00:00" - }, - { - "name": "symfony/options-resolver", - "version": "v5.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/options-resolver.git", - "reference": "b0fb78576487af19c500aaddb269fd36701d4847" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b0fb78576487af19c500aaddb269fd36701d4847", - "reference": "b0fb78576487af19c500aaddb269fd36701d4847", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php73": "~1.0", - "symfony/polyfill-php80": "^1.16" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\OptionsResolver\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides an improved replacement for the array_replace PHP function", - "homepage": "https://symfony.com", - "keywords": [ - "config", - "configuration", - "options" - ], - "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-11-23T10:19:22+00:00" - }, { "name": "symfony/polyfill-ctype", "version": "v1.27.0", @@ -4898,147 +4476,6 @@ ], "time": "2022-11-03T14:55:06+00:00" }, - { - "name": "symfony/polyfill-php81", - "version": "v1.23.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "e66119f3de95efc359483f810c4c3e6436279436" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/e66119f3de95efc359483f810c4c3e6436279436", - "reference": "e66119f3de95efc359483f810c4c3e6436279436", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.23.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-05-21T13:25:03+00:00" - }, - { - "name": "symfony/process", - "version": "v5.4.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "2b3ba8722c4aaf3e88011be5e7f48710088fb5e4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/2b3ba8722c4aaf3e88011be5e7f48710088fb5e4", - "reference": "2b3ba8722c4aaf3e88011be5e7f48710088fb5e4", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/polyfill-php80": "^1.16" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Process\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Executes commands in sub-processes", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/process/tree/v5.4.2" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-12-27T21:01:00+00:00" - }, { "name": "symfony/service-contracts", "version": "v2.5.2", @@ -5122,68 +4559,6 @@ ], "time": "2022-05-30T19:17:29+00:00" }, - { - "name": "symfony/stopwatch", - "version": "v5.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/208ef96122bfed82a8f3a61458a07113a08bdcfe", - "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/service-contracts": "^1|^2|^3" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Stopwatch\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides a way to profile code", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-11-23T10:19:22+00:00" - }, { "name": "symfony/string", "version": "v5.4.22", diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php index 4e1d192e0..15d4bd59d 100644 --- a/lib/Activity/ActivityManager.php +++ b/lib/Activity/ActivityManager.php @@ -45,8 +45,8 @@ use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\MultipleObjectsReturnedException; use OCP\Comments\IComment; use OCP\IUser; -use OCP\Server; use OCP\L10N\IFactory; +use OCP\Server; use Psr\Log\LoggerInterface; class ActivityManager { @@ -332,8 +332,8 @@ class ActivityManager { case self::SUBJECT_BOARD_UPDATE_ARCHIVED: case self::SUBJECT_BOARD_DELETE: case self::SUBJECT_BOARD_RESTORE: - // Not defined as there is no activity for - // case self::SUBJECT_BOARD_UPDATE_COLOR + // Not defined as there is no activity for + // case self::SUBJECT_BOARD_UPDATE_COLOR break; case self::SUBJECT_CARD_COMMENT_CREATE: $eventType = 'deck_comment'; @@ -374,7 +374,7 @@ class ActivityManager { $additionalParams['before'] = $additionalParams['before']->format('c'); } - break; + break; case self::SUBJECT_ATTACHMENT_CREATE: case self::SUBJECT_ATTACHMENT_UPDATE: case self::SUBJECT_ATTACHMENT_DELETE: diff --git a/lib/Activity/CommentEventHandler.php b/lib/Activity/CommentEventHandler.php index dc68c3239..47e11a9fd 100644 --- a/lib/Activity/CommentEventHandler.php +++ b/lib/Activity/CommentEventHandler.php @@ -23,12 +23,12 @@ namespace OCA\Deck\Activity; +use \OCP\Comments\ICommentsEventHandler; use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\ChangeHelper; use OCA\Deck\Notification\NotificationHelper; use OCP\Comments\CommentsEvent; use OCP\Comments\IComment; -use \OCP\Comments\ICommentsEventHandler; class CommentEventHandler implements ICommentsEventHandler { diff --git a/lib/Activity/DeckProvider.php b/lib/Activity/DeckProvider.php index 7808ef013..0b7a63e7e 100644 --- a/lib/Activity/DeckProvider.php +++ b/lib/Activity/DeckProvider.php @@ -26,6 +26,7 @@ namespace OCA\Deck\Activity; use OCA\Deck\Db\Acl; +use OCA\Deck\Service\CardService; use OCP\Activity\IEvent; use OCP\Activity\IProvider; use OCP\Comments\IComment; @@ -35,7 +36,6 @@ use OCP\IConfig; use OCP\IURLGenerator; use OCP\IUserManager; use OCP\L10N\IFactory; -use OCA\Deck\Service\CardService; class DeckProvider implements IProvider { diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 477f96f51..78de597dd 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -43,11 +43,11 @@ use OCA\Deck\Event\CardUpdatedEvent; use OCA\Deck\Event\SessionClosedEvent; use OCA\Deck\Event\SessionCreatedEvent; use OCA\Deck\Listeners\BeforeTemplateRenderedListener; -use OCA\Deck\Listeners\ParticipantCleanupListener; use OCA\Deck\Listeners\FullTextSearchEventListener; +use OCA\Deck\Listeners\LiveUpdateListener; +use OCA\Deck\Listeners\ParticipantCleanupListener; use OCA\Deck\Listeners\ResourceAdditionalScriptsListener; use OCA\Deck\Listeners\ResourceListener; -use OCA\Deck\Listeners\LiveUpdateListener; use OCA\Deck\Middleware\DefaultBoardMiddleware; use OCA\Deck\Middleware\ExceptionMiddleware; use OCA\Deck\Notification\Notifier; diff --git a/lib/Command/UserExport.php b/lib/Command/UserExport.php index 090e2f072..4b6e91ec1 100644 --- a/lib/Command/UserExport.php +++ b/lib/Command/UserExport.php @@ -46,12 +46,12 @@ class UserExport extends Command { private $assignedUsersMapper; public function __construct(BoardMapper $boardMapper, - BoardService $boardService, - StackMapper $stackMapper, - CardMapper $cardMapper, - AssignmentMapper $assignedUsersMapper, - IUserManager $userManager, - IGroupManager $groupManager) { + BoardService $boardService, + StackMapper $stackMapper, + CardMapper $cardMapper, + AssignmentMapper $assignedUsersMapper, + IUserManager $userManager, + IGroupManager $groupManager) { parent::__construct(); $this->cardMapper = $cardMapper; diff --git a/lib/Controller/AttachmentApiController.php b/lib/Controller/AttachmentApiController.php index debf93f6f..181bca72a 100644 --- a/lib/Controller/AttachmentApiController.php +++ b/lib/Controller/AttachmentApiController.php @@ -22,11 +22,11 @@ */ namespace OCA\Deck\Controller; +use OCA\Deck\Service\AttachmentService; use OCP\AppFramework\ApiController; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; use OCP\IRequest; -use OCA\Deck\Service\AttachmentService; class AttachmentApiController extends ApiController { private $attachmentService; diff --git a/lib/Controller/BoardApiController.php b/lib/Controller/BoardApiController.php index 32a9a971c..4d7f6bee1 100644 --- a/lib/Controller/BoardApiController.php +++ b/lib/Controller/BoardApiController.php @@ -25,13 +25,13 @@ namespace OCA\Deck\Controller; use OCA\Deck\Db\Board; +use OCA\Deck\Service\BoardService; use OCA\Deck\StatusException; use OCP\AppFramework\ApiController; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; -use OCP\IRequest; -use OCA\Deck\Service\BoardService; +use OCP\IRequest; use Sabre\HTTP\Util; /** diff --git a/lib/Controller/CardApiController.php b/lib/Controller/CardApiController.php index 1c9e87a18..4a61b60ee 100644 --- a/lib/Controller/CardApiController.php +++ b/lib/Controller/CardApiController.php @@ -23,20 +23,20 @@ * */ - namespace OCA\Deck\Controller; +namespace OCA\Deck\Controller; - use OCA\Deck\Service\AssignmentService; - use OCP\AppFramework\ApiController; - use OCP\AppFramework\Http; - use OCP\AppFramework\Http\DataResponse; - use OCP\IRequest; - use OCA\Deck\Service\CardService; +use OCA\Deck\Service\AssignmentService; +use OCA\Deck\Service\CardService; +use OCP\AppFramework\ApiController; +use OCP\AppFramework\Http; +use OCP\AppFramework\Http\DataResponse; +use OCP\IRequest; - /** - * Class BoardApiController - * - * @package OCA\Deck\Controller - */ +/** + * Class BoardApiController + * + * @package OCA\Deck\Controller + */ class CardApiController extends ApiController { private $cardService; private $userId; diff --git a/lib/Controller/CardController.php b/lib/Controller/CardController.php index b6f6e6958..e901ab00a 100644 --- a/lib/Controller/CardController.php +++ b/lib/Controller/CardController.php @@ -25,8 +25,8 @@ namespace OCA\Deck\Controller; use OCA\Deck\Service\AssignmentService; use OCA\Deck\Service\CardService; -use OCP\IRequest; use OCP\AppFramework\Controller; +use OCP\IRequest; class CardController extends Controller { private $userId; diff --git a/lib/Controller/ConfigController.php b/lib/Controller/ConfigController.php index b64e23106..d263994cb 100644 --- a/lib/Controller/ConfigController.php +++ b/lib/Controller/ConfigController.php @@ -36,7 +36,7 @@ class ConfigController extends OCSController { $AppName, IRequest $request, ConfigService $configService - ) { + ) { parent::__construct($AppName, $request); $this->configService = $configService; diff --git a/lib/Controller/LabelApiController.php b/lib/Controller/LabelApiController.php index 979b103a5..63cf2f513 100644 --- a/lib/Controller/LabelApiController.php +++ b/lib/Controller/LabelApiController.php @@ -23,11 +23,11 @@ namespace OCA\Deck\Controller; +use OCA\Deck\Service\LabelService; use OCP\AppFramework\ApiController; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; use OCP\IRequest; -use OCA\Deck\Service\LabelService; /** * Class BoardApiController diff --git a/lib/Controller/LabelController.php b/lib/Controller/LabelController.php index 530647326..71794e749 100644 --- a/lib/Controller/LabelController.php +++ b/lib/Controller/LabelController.php @@ -24,8 +24,8 @@ namespace OCA\Deck\Controller; use OCA\Deck\Service\LabelService; -use OCP\IRequest; use OCP\AppFramework\Controller; +use OCP\IRequest; class LabelController extends Controller { private $labelService; diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index 88ef05ff9..1f23bbde4 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -23,25 +23,25 @@ namespace OCA\Deck\Controller; +use \OCP\AppFramework\Http\RedirectResponse; use OCA\Deck\AppInfo\Application; +use OCA\Deck\Db\Acl; +use OCA\Deck\Db\CardMapper; +use OCA\Deck\Service\CardService; use OCA\Deck\Service\ConfigService; use OCA\Deck\Service\PermissionService; use OCA\Files\Event\LoadSidebar; use OCA\Text\Event\LoadEditor; use OCA\Viewer\Event\LoadViewer; +use OCP\AppFramework\Controller; use OCP\AppFramework\Http\ContentSecurityPolicy; +use OCP\AppFramework\Http\TemplateResponse; use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent as CollaborationResourcesEvent; use OCP\EventDispatcher\IEventDispatcher; use OCP\IConfig; use OCP\IInitialStateService; use OCP\IRequest; -use OCP\AppFramework\Http\TemplateResponse; -use OCP\AppFramework\Controller; -use OCA\Deck\Db\CardMapper; use OCP\IURLGenerator; -use \OCP\AppFramework\Http\RedirectResponse; -use OCA\Deck\Db\Acl; -use OCA\Deck\Service\CardService; class PageController extends Controller { private PermissionService $permissionService; @@ -64,7 +64,7 @@ class PageController extends Controller { IURLGenerator $urlGenerator, CardService $cardService, IConfig $config - ) { + ) { parent::__construct($AppName, $request); $this->permissionService = $permissionService; diff --git a/lib/Controller/SessionController.php b/lib/Controller/SessionController.php index 1d1744c9c..0e6a66b7c 100644 --- a/lib/Controller/SessionController.php +++ b/lib/Controller/SessionController.php @@ -24,14 +24,14 @@ declare(strict_types=1); namespace OCA\Deck\Controller; -use OCA\Deck\Service\SessionService; -use OCA\Deck\Service\PermissionService; +use OCA\Deck\Db\Acl; use OCA\Deck\Db\BoardMapper; +use OCA\Deck\Service\PermissionService; +use OCA\Deck\Service\SessionService; use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCSController; use OCP\IRequest; -use OCA\Deck\Db\Acl; class SessionController extends OCSController { private SessionService $sessionService; diff --git a/lib/Controller/StackApiController.php b/lib/Controller/StackApiController.php index d39bd7f5b..f210770de 100644 --- a/lib/Controller/StackApiController.php +++ b/lib/Controller/StackApiController.php @@ -24,13 +24,13 @@ namespace OCA\Deck\Controller; +use OCA\Deck\Service\BoardService; +use OCA\Deck\Service\StackService; use OCA\Deck\StatusException; use OCP\AppFramework\ApiController; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; use OCP\IRequest; -use OCA\Deck\Service\StackService; -use OCA\Deck\Service\BoardService; use Sabre\HTTP\Util; /** diff --git a/lib/Controller/StackController.php b/lib/Controller/StackController.php index 6452ef310..c59bf9e1b 100644 --- a/lib/Controller/StackController.php +++ b/lib/Controller/StackController.php @@ -25,10 +25,10 @@ namespace OCA\Deck\Controller; use OCA\Deck\Service\StackService; -use OCP\IRequest; - use OCP\AppFramework\Controller; +use OCP\IRequest; + class StackController extends Controller { private $userId; private $stackService; diff --git a/lib/Cron/CardDescriptionActivity.php b/lib/Cron/CardDescriptionActivity.php index 8b973410d..35dce02e9 100644 --- a/lib/Cron/CardDescriptionActivity.php +++ b/lib/Cron/CardDescriptionActivity.php @@ -24,10 +24,10 @@ namespace OCA\Deck\Cron; -use OCP\AppFramework\Utility\ITimeFactory; -use OCP\BackgroundJob\Job; use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Db\CardMapper; +use OCP\AppFramework\Utility\ITimeFactory; +use OCP\BackgroundJob\Job; class CardDescriptionActivity extends Job { diff --git a/lib/Cron/DeleteCron.php b/lib/Cron/DeleteCron.php index f766931d9..edea4d02f 100644 --- a/lib/Cron/DeleteCron.php +++ b/lib/Cron/DeleteCron.php @@ -24,14 +24,14 @@ namespace OCA\Deck\Cron; -use OCP\AppFramework\Utility\ITimeFactory; -use OCP\BackgroundJob\TimedJob; use OCA\Deck\Db\AttachmentMapper; use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\CardMapper; use OCA\Deck\InvalidAttachmentType; use OCA\Deck\Service\AttachmentService; +use OCP\AppFramework\Utility\ITimeFactory; use OCP\BackgroundJob\IJob; +use OCP\BackgroundJob\TimedJob; class DeleteCron extends TimedJob { diff --git a/lib/Cron/ScheduledNotifications.php b/lib/Cron/ScheduledNotifications.php index 09fee228b..ef72e644c 100644 --- a/lib/Cron/ScheduledNotifications.php +++ b/lib/Cron/ScheduledNotifications.php @@ -23,12 +23,12 @@ namespace OCA\Deck\Cron; -use OCP\AppFramework\Utility\ITimeFactory; -use OCP\BackgroundJob\Job; use OCA\Deck\Db\Card; use OCA\Deck\Db\CardMapper; use OCA\Deck\Notification\NotificationHelper; use OCP\AppFramework\Db\DoesNotExistException; +use OCP\AppFramework\Utility\ITimeFactory; +use OCP\BackgroundJob\Job; use OCP\ILogger; class ScheduledNotifications extends Job { diff --git a/lib/Cron/SessionsCleanup.php b/lib/Cron/SessionsCleanup.php index cbdf18713..a372c9e72 100644 --- a/lib/Cron/SessionsCleanup.php +++ b/lib/Cron/SessionsCleanup.php @@ -39,8 +39,8 @@ class SessionsCleanup extends TimedJob { public function __construct(ITimeFactory $time, - SessionService $sessionService, - ILogger $logger) { + SessionService $sessionService, + ILogger $logger) { parent::__construct($time); $this->sessionService = $sessionService; $this->logger = $logger; diff --git a/lib/Db/BoardMapper.php b/lib/Db/BoardMapper.php index dfc742bb5..c5df1b6a3 100644 --- a/lib/Db/BoardMapper.php +++ b/lib/Db/BoardMapper.php @@ -29,8 +29,8 @@ use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\QBMapper; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; -use OCP\IUserManager; use OCP\IGroupManager; +use OCP\IUserManager; use Psr\Log\LoggerInterface; /** @template-extends QBMapper */ @@ -126,9 +126,9 @@ class BoardMapper extends QBMapper implements IPermissionMapper { $groupIds = $this->groupManager->getUserGroupIds($this->userManager->get($userId)); if (count($groupIds) !== 0) { $qb->orWhere($qb->expr()->andX( - $qb->expr()->in('acl.participant', $qb->createNamedParameter($groupIds, IQueryBuilder::PARAM_STR_ARRAY)), - $qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_GROUP, IQueryBuilder::PARAM_INT)), - )); + $qb->expr()->in('acl.participant', $qb->createNamedParameter($groupIds, IQueryBuilder::PARAM_STR_ARRAY)), + $qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_GROUP, IQueryBuilder::PARAM_INT)), + )); } // Shared to circles of the user @@ -147,7 +147,7 @@ class BoardMapper extends QBMapper implements IPermissionMapper { } public function findAllForUser(string $userId, ?int $since = null, bool $includeArchived = true, ?int $before = null, - ?string $term = null): array { + ?string $term = null): array { $useCache = ($since === -1 && $includeArchived === true && $before === null && $term === null); if (!isset($this->userBoardCache[$userId]) || !$useCache) { $groups = $this->groupManager->getUserGroupIds( @@ -186,7 +186,7 @@ class BoardMapper extends QBMapper implements IPermissionMapper { * Find all boards for a given user */ public function findAllByUser(string $userId, ?int $limit = null, ?int $offset = null, ?int $since = null, - bool $includeArchived = true, ?int $before = null, ?string $term = null): array { + bool $includeArchived = true, ?int $before = null, ?string $term = null): array { // FIXME this used to be a UNION to get boards owned by $userId and the user shares in one single query // Is it possible with the query builder? $qb = $this->db->getQueryBuilder(); @@ -293,7 +293,7 @@ class BoardMapper extends QBMapper implements IPermissionMapper { * Find all boards for a given user */ public function findAllByGroups(string $userId, array $groups, ?int $limit = null, ?int $offset = null, ?int $since = null, - bool $includeArchived = true, ?int $before = null, ?string $term = null): array { + bool $includeArchived = true, ?int $before = null, ?string $term = null): array { if (count($groups) <= 0) { return []; } @@ -347,7 +347,7 @@ class BoardMapper extends QBMapper implements IPermissionMapper { } public function findAllByCircles(string $userId, ?int $limit = null, ?int $offset = null, ?int $since = null, - bool $includeArchived = true, ?int $before = null, ?string $term = null) { + bool $includeArchived = true, ?int $before = null, ?string $term = null) { $circles = $this->circlesService->getUserCircles($userId); if (count($circles) === 0) { return []; diff --git a/lib/Db/ChangeHelper.php b/lib/Db/ChangeHelper.php index bb9342886..004a05da2 100644 --- a/lib/Db/ChangeHelper.php +++ b/lib/Db/ChangeHelper.php @@ -23,8 +23,8 @@ namespace OCA\Deck\Db; -use OCP\ICacheFactory; use OCP\ICache; +use OCP\ICacheFactory; use OCP\IDBConnection; use OCP\IRequest; diff --git a/lib/Db/StackMapper.php b/lib/Db/StackMapper.php index 162f1ee56..7f5d8f565 100644 --- a/lib/Db/StackMapper.php +++ b/lib/Db/StackMapper.php @@ -28,9 +28,9 @@ use OCP\AppFramework\Db\Entity; use OCP\AppFramework\Db\MultipleObjectsReturnedException; use OCP\Cache\CappedMemoryCache; use OCP\DB\QueryBuilder\IQueryBuilder; -use OCP\IDBConnection; use OCP\ICache; use OCP\ICacheFactory; +use OCP\IDBConnection; /** @template-extends DeckMapper */ class StackMapper extends DeckMapper implements IPermissionMapper { diff --git a/lib/Listeners/LiveUpdateListener.php b/lib/Listeners/LiveUpdateListener.php index f099057ce..5ef6bba77 100644 --- a/lib/Listeners/LiveUpdateListener.php +++ b/lib/Listeners/LiveUpdateListener.php @@ -27,13 +27,13 @@ declare(strict_types=1); namespace OCA\Deck\Listeners; use OCA\Deck\Db\StackMapper; -use OCA\Deck\NotifyPushEvents; use OCA\Deck\Event\AAclEvent; use OCA\Deck\Event\ACardEvent; use OCA\Deck\Event\BoardUpdatedEvent; use OCA\Deck\Event\CardUpdatedEvent; use OCA\Deck\Event\SessionClosedEvent; use OCA\Deck\Event\SessionCreatedEvent; +use OCA\Deck\NotifyPushEvents; use OCA\Deck\Service\SessionService; use OCA\NotifyPush\Queue\IQueue; use OCP\EventDispatcher\Event; diff --git a/lib/Middleware/ExceptionMiddleware.php b/lib/Middleware/ExceptionMiddleware.php index 48a5f3e24..f3f4e5179 100644 --- a/lib/Middleware/ExceptionMiddleware.php +++ b/lib/Middleware/ExceptionMiddleware.php @@ -24,16 +24,16 @@ namespace OCA\Deck\Middleware; use OCA\Deck\Controller\PageController; -use OCA\Deck\StatusException; use OCA\Deck\Exceptions\ConflictException; +use OCA\Deck\StatusException; use OCP\AppFramework\Db\DoesNotExistException; -use OCP\AppFramework\Middleware; use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Middleware; use OCP\AppFramework\OCS\OCSException; use OCP\AppFramework\OCSController; +use OCP\IConfig; use OCP\ILogger; use OCP\IRequest; -use OCP\IConfig; class ExceptionMiddleware extends Middleware { diff --git a/lib/Reference/BoardReferenceProvider.php b/lib/Reference/BoardReferenceProvider.php index 8443341a3..62f0a7362 100644 --- a/lib/Reference/BoardReferenceProvider.php +++ b/lib/Reference/BoardReferenceProvider.php @@ -38,9 +38,9 @@ class BoardReferenceProvider implements IReferenceProvider { private IL10N $l10n; public function __construct(BoardService $boardService, - IURLGenerator $urlGenerator, - IL10N $l10n, - ?string $userId) { + IURLGenerator $urlGenerator, + IL10N $l10n, + ?string $userId) { $this->urlGenerator = $urlGenerator; $this->boardService = $boardService; $this->userId = $userId; diff --git a/lib/Reference/CardReferenceProvider.php b/lib/Reference/CardReferenceProvider.php index 45e0c0d8c..9a348c2da 100644 --- a/lib/Reference/CardReferenceProvider.php +++ b/lib/Reference/CardReferenceProvider.php @@ -47,11 +47,11 @@ class CardReferenceProvider extends ADiscoverableReferenceProvider implements IS private IL10N $l10n; public function __construct(CardService $cardService, - BoardService $boardService, - StackService $stackService, - IURLGenerator $urlGenerator, - IL10N $l10n, - ?string $userId) { + BoardService $boardService, + StackService $stackService, + IURLGenerator $urlGenerator, + IL10N $l10n, + ?string $userId) { $this->cardService = $cardService; $this->urlGenerator = $urlGenerator; $this->boardService = $boardService; diff --git a/lib/Reference/CommentReferenceProvider.php b/lib/Reference/CommentReferenceProvider.php index c45b61bee..54606421b 100644 --- a/lib/Reference/CommentReferenceProvider.php +++ b/lib/Reference/CommentReferenceProvider.php @@ -48,12 +48,12 @@ class CommentReferenceProvider implements IReferenceProvider { private CommentService $commentService; public function __construct(CardService $cardService, - BoardService $boardService, - StackService $stackService, - CommentService $commentService, - IURLGenerator $urlGenerator, - IL10N $l10n, - ?string $userId) { + BoardService $boardService, + StackService $stackService, + CommentService $commentService, + IURLGenerator $urlGenerator, + IL10N $l10n, + ?string $userId) { $this->cardService = $cardService; $this->urlGenerator = $urlGenerator; $this->boardService = $boardService; diff --git a/lib/Service/AttachmentService.php b/lib/Service/AttachmentService.php index b563f0bcf..82a946c09 100644 --- a/lib/Service/AttachmentService.php +++ b/lib/Service/AttachmentService.php @@ -26,6 +26,7 @@ namespace OCA\Deck\Service; use OCA\Deck\Activity\ActivityManager; use OCA\Deck\AppInfo\Application; use OCA\Deck\BadRequestException; +use OCA\Deck\Cache\AttachmentCacheHelper; use OCA\Deck\Db\Acl; use OCA\Deck\Db\Attachment; use OCA\Deck\Db\AttachmentMapper; @@ -34,7 +35,6 @@ use OCA\Deck\Db\ChangeHelper; use OCA\Deck\InvalidAttachmentType; use OCA\Deck\NoPermissionException; use OCA\Deck\NotFoundException; -use OCA\Deck\Cache\AttachmentCacheHelper; use OCA\Deck\StatusException; use OCA\Deck\Validators\AttachmentServiceValidator; use OCP\AppFramework\Db\IMapperException; diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php index b8389aeef..b31bdbe58 100644 --- a/lib/Service/BoardService.php +++ b/lib/Service/BoardService.php @@ -27,13 +27,17 @@ namespace OCA\Deck\Service; use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Activity\ChangeSet; use OCA\Deck\AppInfo\Application; +use OCA\Deck\BadRequestException; use OCA\Deck\Db\Acl; use OCA\Deck\Db\AclMapper; use OCA\Deck\Db\AssignmentMapper; +use OCA\Deck\Db\Board; +use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\ChangeHelper; use OCA\Deck\Db\IPermissionMapper; use OCA\Deck\Db\Label; +use OCA\Deck\Db\LabelMapper; use OCA\Deck\Db\Session; use OCA\Deck\Db\SessionMapper; use OCA\Deck\Db\Stack; @@ -41,24 +45,20 @@ use OCA\Deck\Db\StackMapper; use OCA\Deck\Event\AclCreatedEvent; use OCA\Deck\Event\AclDeletedEvent; use OCA\Deck\Event\AclUpdatedEvent; +use OCA\Deck\Event\BoardUpdatedEvent; use OCA\Deck\NoPermissionException; use OCA\Deck\Notification\NotificationHelper; +use OCA\Deck\Validators\BoardServiceValidator; use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\MultipleObjectsReturnedException; +use OCP\DB\Exception as DbException; use OCP\EventDispatcher\IEventDispatcher; use OCP\IConfig; use OCP\IDBConnection; use OCP\IGroupManager; use OCP\IL10N; -use OCP\DB\Exception as DbException; -use OCA\Deck\Db\Board; -use OCA\Deck\Db\BoardMapper; -use OCA\Deck\Db\LabelMapper; -use OCP\IUserManager; -use OCA\Deck\BadRequestException; -use OCA\Deck\Event\BoardUpdatedEvent; -use OCA\Deck\Validators\BoardServiceValidator; use OCP\IURLGenerator; +use OCP\IUserManager; use OCP\Server; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; @@ -144,7 +144,7 @@ class BoardService { * Get all boards that are shared with a user, their groups or circles */ public function getUserBoards(?int $since = null, bool $includeArchived = true, ?int $before = null, - ?string $term = null): array { + ?string $term = null): array { return $this->boardMapper->findAllForUser($this->userId, $since, $includeArchived, $before, $term); } diff --git a/lib/Service/CardService.php b/lib/Service/CardService.php index 8e96dce09..45559b87f 100644 --- a/lib/Service/CardService.php +++ b/lib/Service/CardService.php @@ -28,13 +28,16 @@ namespace OCA\Deck\Service; use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Activity\ChangeSet; +use OCA\Deck\BadRequestException; +use OCA\Deck\Db\Acl; use OCA\Deck\Db\Assignment; use OCA\Deck\Db\AssignmentMapper; +use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\Card; use OCA\Deck\Db\CardMapper; -use OCA\Deck\Db\Acl; use OCA\Deck\Db\ChangeHelper; use OCA\Deck\Db\Label; +use OCA\Deck\Db\LabelMapper; use OCA\Deck\Db\StackMapper; use OCA\Deck\Event\CardCreatedEvent; use OCA\Deck\Event\CardDeletedEvent; @@ -42,16 +45,13 @@ use OCA\Deck\Event\CardUpdatedEvent; use OCA\Deck\Model\CardDetails; use OCA\Deck\NoPermissionException; use OCA\Deck\Notification\NotificationHelper; -use OCA\Deck\Db\BoardMapper; -use OCA\Deck\Db\LabelMapper; use OCA\Deck\StatusException; -use OCA\Deck\BadRequestException; use OCA\Deck\Validators\CardServiceValidator; use OCP\Comments\ICommentsManager; use OCP\EventDispatcher\IEventDispatcher; use OCP\IRequest; -use OCP\IUserManager; use OCP\IURLGenerator; +use OCP\IUserManager; use Psr\Log\LoggerInterface; class CardService { diff --git a/lib/Service/DefaultBoardService.php b/lib/Service/DefaultBoardService.php index 5698994d6..ccfb41028 100644 --- a/lib/Service/DefaultBoardService.php +++ b/lib/Service/DefaultBoardService.php @@ -24,10 +24,10 @@ namespace OCA\Deck\Service; use OCA\Deck\AppInfo\Application; +use OCA\Deck\BadRequestException; use OCA\Deck\Db\BoardMapper; use OCP\IConfig; use OCP\IL10N; -use OCA\Deck\BadRequestException; use OCP\PreConditionNotMetException; class DefaultBoardService { @@ -39,13 +39,13 @@ class DefaultBoardService { private $l10n; public function __construct( - IL10N $l10n, - BoardMapper $boardMapper, - BoardService $boardService, - StackService $stackService, - CardService $cardService, - IConfig $config - ) { + IL10N $l10n, + BoardMapper $boardMapper, + BoardService $boardService, + StackService $stackService, + CardService $cardService, + IConfig $config + ) { $this->boardService = $boardService; $this->stackService = $stackService; $this->cardService = $cardService; diff --git a/lib/Service/FileService.php b/lib/Service/FileService.php index 5a3dbfb20..d4e5c4c90 100644 --- a/lib/Service/FileService.php +++ b/lib/Service/FileService.php @@ -25,8 +25,8 @@ namespace OCA\Deck\Service; use OCA\Deck\Db\Attachment; use OCA\Deck\Db\AttachmentMapper; -use OCA\Deck\StatusException; use OCA\Deck\Exceptions\ConflictException; +use OCA\Deck\StatusException; use OCP\AppFramework\Http\StreamResponse; use OCP\Files\IAppData; use OCP\Files\IMimeTypeDetector; diff --git a/lib/Service/LabelService.php b/lib/Service/LabelService.php index 61ed58f07..aacb93bfd 100644 --- a/lib/Service/LabelService.php +++ b/lib/Service/LabelService.php @@ -23,12 +23,12 @@ namespace OCA\Deck\Service; +use OCA\Deck\BadRequestException; +use OCA\Deck\Db\Acl; use OCA\Deck\Db\ChangeHelper; use OCA\Deck\Db\Label; -use OCA\Deck\Db\Acl; use OCA\Deck\Db\LabelMapper; use OCA\Deck\StatusException; -use OCA\Deck\BadRequestException; use OCA\Deck\Validators\LabelServiceValidator; class LabelService { @@ -50,7 +50,7 @@ class LabelService { BoardService $boardService, ChangeHelper $changeHelper, LabelServiceValidator $labelServiceValidator - ) { + ) { $this->labelMapper = $labelMapper; $this->permissionService = $permissionService; $this->boardService = $boardService; diff --git a/lib/Service/OverviewService.php b/lib/Service/OverviewService.php index 7c1f4479f..d2a705f7b 100644 --- a/lib/Service/OverviewService.php +++ b/lib/Service/OverviewService.php @@ -29,11 +29,11 @@ namespace OCA\Deck\Service; use OCA\Deck\Db\AssignmentMapper; use OCA\Deck\Db\Board; +use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\CardMapper; +use OCA\Deck\Db\LabelMapper; use OCA\Deck\Model\CardDetails; use OCP\Comments\ICommentsManager; -use OCA\Deck\Db\BoardMapper; -use OCA\Deck\Db\LabelMapper; use OCP\IUserManager; class OverviewService { diff --git a/lib/Service/PermissionService.php b/lib/Service/PermissionService.php index c1c0e9eaa..84b6fcec4 100644 --- a/lib/Service/PermissionService.php +++ b/lib/Service/PermissionService.php @@ -23,7 +23,6 @@ namespace OCA\Deck\Service; -use OCP\Cache\CappedMemoryCache; use OCA\Circles\Model\Member; use OCA\Deck\Db\Acl; use OCA\Deck\Db\AclMapper; @@ -34,6 +33,7 @@ use OCA\Deck\Db\User; use OCA\Deck\NoPermissionException; use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\MultipleObjectsReturnedException; +use OCP\Cache\CappedMemoryCache; use OCP\IConfig; use OCP\IGroupManager; use OCP\ILogger; diff --git a/lib/Service/SessionService.php b/lib/Service/SessionService.php index a6287a050..7f0f619f5 100644 --- a/lib/Service/SessionService.php +++ b/lib/Service/SessionService.php @@ -26,12 +26,12 @@ namespace OCA\Deck\Service; use OCA\Deck\Db\Session; use OCA\Deck\Db\SessionMapper; -use OCA\Deck\Event\SessionCreatedEvent; use OCA\Deck\Event\SessionClosedEvent; +use OCA\Deck\Event\SessionCreatedEvent; +use OCA\NotifyPush\Queue\IQueue; use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Utility\ITimeFactory; use OCP\EventDispatcher\IEventDispatcher; -use OCA\NotifyPush\Queue\IQueue; use OCP\Security\ISecureRandom; class SessionService { diff --git a/lib/Validators/LabelServiceValidator.php b/lib/Validators/LabelServiceValidator.php index c350cb769..ce23c81b2 100644 --- a/lib/Validators/LabelServiceValidator.php +++ b/lib/Validators/LabelServiceValidator.php @@ -23,7 +23,7 @@ * */ - declare(strict_types=1); +declare(strict_types=1); namespace OCA\Deck\Validators; diff --git a/psalm.xml b/psalm.xml index 178ff30fd..480bce23d 100644 --- a/psalm.xml +++ b/psalm.xml @@ -21,7 +21,6 @@ - diff --git a/tests/integration/database/AssignmentMapperTest.php b/tests/integration/database/AssignmentMapperTest.php index 7066c494a..9b9f08070 100644 --- a/tests/integration/database/AssignmentMapperTest.php +++ b/tests/integration/database/AssignmentMapperTest.php @@ -26,8 +26,8 @@ namespace OCA\Deck\Db; use OCA\Deck\NotFoundException; use OCA\Deck\Service\AssignmentService; use OCA\Deck\Service\BoardService; -use OCA\Deck\Service\StackService; use OCA\Deck\Service\CardService; +use OCA\Deck\Service\StackService; use OCP\IGroupManager; use OCP\IUserManager; use OCP\IUserSession; diff --git a/tests/integration/features/bootstrap/RequestContext.php b/tests/integration/features/bootstrap/RequestContext.php index ebf01e80a..f980ea4d4 100644 --- a/tests/integration/features/bootstrap/RequestContext.php +++ b/tests/integration/features/bootstrap/RequestContext.php @@ -1,11 +1,11 @@ permissionService->expects($this->once())->method('checkPermission'); $this->stackMapper->expects($this->once())->method('findAll')->willReturn($this->getStacks()); $this->cardService->expects($this->atLeastOnce())->method('enrichCards')->will( - $this->returnCallback( - function ($cards) { - foreach ($cards as $card) { - $card->setLabels($this->getLabels()[$card->getId()]); - } - return array_map(function ($card) { - return new CardDetails($card); - }, $cards); - } - ) - ); + $this->returnCallback( + function ($cards) { + foreach ($cards as $card) { + $card->setLabels($this->getLabels()[$card->getId()]); + } + return array_map(function ($card) { + return new CardDetails($card); + }, $cards); + } + ) + ); $this->cardMapper->expects($this->any())->method('findAll')->willReturn($this->getCards(222)); diff --git a/tests/unit/controller/BoardApiControllerTest.php b/tests/unit/controller/BoardApiControllerTest.php index 3fd9198f0..d74b0bd7d 100644 --- a/tests/unit/controller/BoardApiControllerTest.php +++ b/tests/unit/controller/BoardApiControllerTest.php @@ -22,13 +22,13 @@ */ namespace OCA\Deck\Controller; +use OCA\Deck\Db\Board; +use OCA\Deck\Service\BoardService; use OCP\AppFramework\Http; + use OCP\AppFramework\Http\DataResponse; use OCP\IRequest; -use OCA\Deck\Service\BoardService; -use OCA\Deck\Db\Board; - class BoardApiControllerTest extends \Test\TestCase { private $appName = 'deck'; private $userId = 'admin'; diff --git a/tests/unit/controller/BoardImportApiControllerTest.php b/tests/unit/controller/BoardImportApiControllerTest.php index 926e4c473..20db54ae6 100644 --- a/tests/unit/controller/BoardImportApiControllerTest.php +++ b/tests/unit/controller/BoardImportApiControllerTest.php @@ -23,10 +23,10 @@ namespace OCA\Deck\Controller; use OCA\Deck\Db\Board; +use OCA\Deck\Service\Importer\BoardImportService; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; use OCP\IRequest; -use OCA\Deck\Service\Importer\BoardImportService; class BoardImportApiControllerTest extends \Test\TestCase { private $appName = 'deck'; diff --git a/tests/unit/controller/CardApiControllerTest.php b/tests/unit/controller/CardApiControllerTest.php index 4ef894f16..dfc498173 100644 --- a/tests/unit/controller/CardApiControllerTest.php +++ b/tests/unit/controller/CardApiControllerTest.php @@ -22,14 +22,14 @@ */ namespace OCA\Deck\Controller; +use OCA\Deck\Db\Card; use OCA\Deck\Service\AssignmentService; +use OCA\Deck\Service\CardService; use OCP\AppFramework\Http; + use OCP\AppFramework\Http\DataResponse; use OCP\IRequest; -use OCA\Deck\Db\Card; -use OCA\Deck\Service\CardService; - class CardApiControllerTest extends \Test\TestCase { private $controller; private $request; diff --git a/tests/unit/controller/LabelApiControllerTest.php b/tests/unit/controller/LabelApiControllerTest.php index 86dec24f6..602d7a89c 100644 --- a/tests/unit/controller/LabelApiControllerTest.php +++ b/tests/unit/controller/LabelApiControllerTest.php @@ -22,12 +22,12 @@ */ namespace OCA\Deck\Controller; -use OCP\AppFramework\Http; -use OCP\AppFramework\Http\DataResponse; -use OCP\IRequest; - use OCA\Deck\Db\Label; use OCA\Deck\Service\LabelService; +use OCP\AppFramework\Http; + +use OCP\AppFramework\Http\DataResponse; +use OCP\IRequest; class LabelApiControllerTest extends \Test\TestCase { private $controller; diff --git a/tests/unit/controller/PageControllerTest.php b/tests/unit/controller/PageControllerTest.php index 81c10bfbe..f2ed9edfa 100644 --- a/tests/unit/controller/PageControllerTest.php +++ b/tests/unit/controller/PageControllerTest.php @@ -29,9 +29,9 @@ use OCA\Deck\Service\CardService; use OCA\Deck\Service\ConfigService; use OCA\Deck\Service\PermissionService; use OCP\EventDispatcher\IEventDispatcher; +use OCP\IConfig; use OCP\IInitialStateService; use OCP\IRequest; -use OCP\IConfig; use OCP\IURLGenerator; use PHPUnit\Framework\TestCase; diff --git a/tests/unit/controller/StackApiControllerTest.php b/tests/unit/controller/StackApiControllerTest.php index 4d30176a9..11d3438e1 100644 --- a/tests/unit/controller/StackApiControllerTest.php +++ b/tests/unit/controller/StackApiControllerTest.php @@ -22,14 +22,14 @@ */ namespace OCA\Deck\Controller; +use OCA\Deck\Db\Stack; +use OCA\Deck\Service\BoardService; +use OCA\Deck\Service\StackService; + use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; use OCP\IRequest; -use OCA\Deck\Service\BoardService; -use OCA\Deck\Service\StackService; -use OCA\Deck\Db\Stack; - class StackApiControllerTest extends \Test\TestCase { private $appName = 'deck'; private $userId = 'admin';