From 34ffd8015efeff877fa771644df335fd75ced880 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 23 Nov 2023 13:45:43 +0100 Subject: [PATCH 1/5] chore(CI): Adjust testing matrix for Nextcloud 28 on stable28 Signed-off-by: Joas Schilling --- .github/workflows/phpunit-mysql.yml | 4 +- .github/workflows/phpunit-oci.yml | 2 +- .github/workflows/phpunit-pgsql.yml | 2 +- .github/workflows/phpunit-sqlite.yml | 2 +- composer.json | 2 +- composer.lock | 1784 +++++++------------------- 6 files changed, 481 insertions(+), 1315 deletions(-) diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml index 988010b63..5a281ac80 100644 --- a/.github/workflows/phpunit-mysql.yml +++ b/.github/workflows/phpunit-mysql.yml @@ -38,8 +38,8 @@ jobs: strategy: matrix: - php-versions: ['8.0', '8.1', '8.2'] - server-versions: ['master'] + php-versions: ['8.0', '8.1', '8.2', '8.3'] + server-versions: ['stable28'] services: mysql: diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml index 7ba3f6e27..1a60391df 100644 --- a/.github/workflows/phpunit-oci.yml +++ b/.github/workflows/phpunit-oci.yml @@ -39,7 +39,7 @@ jobs: strategy: matrix: php-versions: ['8.0'] - server-versions: ['master'] + server-versions: ['stable28'] services: oracle: diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml index c944d35c5..379dfd1dc 100644 --- a/.github/workflows/phpunit-pgsql.yml +++ b/.github/workflows/phpunit-pgsql.yml @@ -39,7 +39,7 @@ jobs: strategy: matrix: php-versions: ['8.0'] - server-versions: ['master'] + server-versions: ['stable28'] services: postgres: diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index 35463b0dc..9ce8b09b8 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -39,7 +39,7 @@ jobs: strategy: matrix: php-versions: ['8.0'] - server-versions: ['master'] + server-versions: ['stable28'] steps: - name: Set app env diff --git a/composer.json b/composer.json index 87ef8b581..103def986 100644 --- a/composer.json +++ b/composer.json @@ -39,6 +39,6 @@ "phpunit/phpunit": "^9.5", "vimeo/psalm": "^4.22", "nextcloud/coding-standard": "^1.0", - "nextcloud/ocp": "dev-master" + "nextcloud/ocp": "dev-stable28" } } diff --git a/composer.lock b/composer.lock index e7074e28d..e9e91699c 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": "4202cbee01e48850ef10cf1e6de9f469", + "content-hash": "38afa5f5b24a097af7c701bb25e3c5c6", "packages": [], "packages-dev": [ { @@ -248,16 +248,16 @@ }, { "name": "composer/pcre", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", "shasum": "" }, "require": { @@ -299,7 +299,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.0" + "source": "https://github.com/composer/pcre/tree/3.1.1" }, "funding": [ { @@ -315,20 +315,20 @@ "type": "tidelift" } ], - "time": "2022-11-17T09:50:14+00:00" + "time": "2023-10-11T07:11:09+00:00" }, { "name": "composer/semver", - "version": "3.3.2", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", "shasum": "" }, "require": { @@ -378,9 +378,9 @@ "versioning" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.3.2" + "source": "https://github.com/composer/semver/tree/3.4.0" }, "funding": [ { @@ -396,7 +396,7 @@ "type": "tidelift" } ], - "time": "2022-04-01T19:23:25+00:00" + "time": "2023-08-31T09:50:34+00:00" }, { "name": "composer/xdebug-handler", @@ -501,103 +501,31 @@ }, "time": "2019-12-04T15:06:13+00:00" }, - { - "name": "doctrine/annotations", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/annotations.git", - "reference": "d02c9f3742044e17d5fa8d28d8402a2d95c33302" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/d02c9f3742044e17d5fa8d28d8402a2d95c33302", - "reference": "d02c9f3742044e17d5fa8d28d8402a2d95c33302", - "shasum": "" - }, - "require": { - "doctrine/lexer": "^2 || ^3", - "ext-tokenizer": "*", - "php": "^7.2 || ^8.0", - "psr/cache": "^1 || ^2 || ^3" - }, - "require-dev": { - "doctrine/cache": "^2.0", - "doctrine/coding-standard": "^10", - "phpstan/phpstan": "^1.8.0", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "symfony/cache": "^5.4 || ^6", - "vimeo/psalm": "^4.10" - }, - "suggest": { - "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations" - }, - "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/2.0.0" - }, - "time": "2022-12-19T18:17:20+00:00" - }, { "name": "doctrine/deprecations", - "version": "v1.0.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", "shasum": "" }, "require": { - "php": "^7.1|^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^9", - "phpunit/phpunit": "^7.5|^8.5|^9.5", - "psr/log": "^1|^2|^3" + "phpstan/phpstan": "1.4.10 || 1.10.15", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "0.18.4", + "psr/log": "^1 || ^2 || ^3", + "vimeo/psalm": "4.30.0 || 5.12.0" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -616,36 +544,36 @@ "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/1.1.2" }, - "time": "2022-05-02T15:47:09+00:00" + "time": "2023-09-27T20:04:15+00:00" }, { "name": "doctrine/instantiator", - "version": "1.5.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^8.1" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^11", + "doctrine/coding-standard": "^11", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.16 || ^1", - "phpstan/phpstan": "^1.4", - "phpstan/phpstan-phpunit": "^1", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.30 || ^5.4" + "phpbench/phpbench": "^1.2", + "phpstan/phpstan": "^1.9.4", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5.27", + "vimeo/psalm": "^5.4" }, "type": "library", "autoload": { @@ -672,7 +600,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.5.0" + "source": "https://github.com/doctrine/instantiator/tree/2.0.0" }, "funding": [ { @@ -688,85 +616,7 @@ "type": "tidelift" } ], - "time": "2022-12-30T00:15:36+00:00" - }, - { - "name": "doctrine/lexer", - "version": "2.1.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", - "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", - "shasum": "" - }, - "require": { - "doctrine/deprecations": "^1.0", - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^9 || ^10", - "phpstan/phpstan": "^1.3", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "psalm/plugin-phpunit": "^0.18.3", - "vimeo/psalm": "^4.11 || ^5.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\Lexer\\": "src" - } - }, - "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/2.1.0" - }, - "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": "2022-12-14T08:49:07+00:00" + "time": "2022-12-30T00:23:10+00:00" }, { "name": "felixfbecker/advanced-json-rpc", @@ -869,96 +719,6 @@ }, "time": "2022-03-02T22:36:06+00:00" }, - { - "name": "friendsofphp/php-cs-fixer", - "version": "v3.14.3", - "source": { - "type": "git", - "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "b418036b95b4936a33fe906245d3044395935e73" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/b418036b95b4936a33fe906245d3044395935e73", - "reference": "b418036b95b4936a33fe906245d3044395935e73", - "shasum": "" - }, - "require": { - "composer/semver": "^3.3", - "composer/xdebug-handler": "^3.0.3", - "doctrine/annotations": "^2", - "doctrine/lexer": "^2 || ^3", - "ext-json": "*", - "ext-tokenizer": "*", - "php": "^7.4 || ^8.0", - "sebastian/diff": "^4.0", - "symfony/console": "^5.4 || ^6.0", - "symfony/event-dispatcher": "^5.4 || ^6.0", - "symfony/filesystem": "^5.4 || ^6.0", - "symfony/finder": "^5.4 || ^6.0", - "symfony/options-resolver": "^5.4 || ^6.0", - "symfony/polyfill-mbstring": "^1.27", - "symfony/polyfill-php80": "^1.27", - "symfony/polyfill-php81": "^1.27", - "symfony/process": "^5.4 || ^6.0", - "symfony/stopwatch": "^5.4 || ^6.0" - }, - "require-dev": { - "justinrainbow/json-schema": "^5.2", - "keradus/cli-executor": "^2.0", - "mikey179/vfsstream": "^1.6.11", - "php-coveralls/php-coveralls": "^2.5.3", - "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.16", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.5", - "phpunitgoodpractices/polyfill": "^1.6", - "phpunitgoodpractices/traits": "^1.9.2", - "symfony/phpunit-bridge": "^6.2.3", - "symfony/yaml": "^5.4 || ^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/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.14.3" - }, - "funding": [ - { - "url": "https://github.com/keradus", - "type": "github" - } - ], - "time": "2023-01-30T00:24:29+00:00" - }, { "name": "myclabs/deep-copy", "version": "1.11.1", @@ -1020,16 +780,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v4.1.0", + "version": "v4.2.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f" + "reference": "f60565f8c0566a31acf06884cdaa591867ecc956" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", - "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956", + "reference": "f60565f8c0566a31acf06884cdaa591867ecc956", "shasum": "" }, "require": { @@ -1065,27 +825,27 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.1.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0" }, - "time": "2022-12-08T20:46:14+00:00" + "time": "2023-04-09T17:37:40+00:00" }, { "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": { @@ -1106,36 +866,35 @@ "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", - "version": "dev-master", + "version": "dev-stable28", "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "0d48464588287f0300fc6b9a8f1cd5f827a0e2e3" + "reference": "2ac04202af2904a000d3e4090f7def301a4cecfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/0d48464588287f0300fc6b9a8f1cd5f827a0e2e3", - "reference": "0d48464588287f0300fc6b9a8f1cd5f827a0e2e3", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/2ac04202af2904a000d3e4090f7def301a4cecfe", + "reference": "2ac04202af2904a000d3e4090f7def301a4cecfe", "shasum": "" }, "require": { - "php": "^7.4 || ~8.0 || ~8.1", + "php": "~8.0 || ~8.1 || ~8.2 || ~8.3", "psr/clock": "^1.0", - "psr/container": "^1.1.1", + "psr/container": "^2.0.2", "psr/event-dispatcher": "^1.0", - "psr/log": "^1.1" + "psr/log": "^1.1.4" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "26.0.0-dev" + "dev-stable28": "28.0.0-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -1151,22 +910,22 @@ "description": "Composer package containing Nextcloud's public API (classes, interfaces)", "support": { "issues": "https://github.com/nextcloud-deps/ocp/issues", - "source": "https://github.com/nextcloud-deps/ocp/tree/master" + "source": "https://github.com/nextcloud-deps/ocp/tree/stable28" }, - "time": "2023-01-31T00:40:45+00:00" + "time": "2023-11-23T10:57:48+00:00" }, { "name": "nikic/php-parser", - "version": "v4.16.0", + "version": "v4.17.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "19526a33fb561ef417e822e85f08a00db4059c17" + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", - "reference": "19526a33fb561ef417e822e85f08a00db4059c17", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", "shasum": "" }, "require": { @@ -1207,9 +966,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" }, - "time": "2023-06-25T14:52:30+00:00" + "time": "2023-08-13T19:53:39+00:00" }, { "name": "openlss/lib-array2xml", @@ -1375,6 +1134,58 @@ }, "time": "2022-02-21T01:04:05+00:00" }, + { + "name": "php-cs-fixer/shim", + "version": "v3.39.0", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/shim.git", + "reference": "33304deae9dd24f333fd9210c80e37c2013210d7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/33304deae9dd24f333fd9210c80e37c2013210d7", + "reference": "33304deae9dd24f333fd9210c80e37c2013210d7", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-tokenizer": "*", + "php": "^7.4 || ^8.0" + }, + "replace": { + "friendsofphp/php-cs-fixer": "self.version" + }, + "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": [ + "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/PHP-CS-Fixer/shim/issues", + "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.39.0" + }, + "time": "2023-11-22T11:20:32+00:00" + }, { "name": "phpdocumentor/reflection-common", "version": "2.2.0", @@ -1487,24 +1298,27 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.2", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d" + "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d", - "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", + "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", "shasum": "" }, "require": { + "doctrine/deprecations": "^1.0", "php": "^7.4 || ^8.0", - "phpdocumentor/reflection-common": "^2.0" + "phpdocumentor/reflection-common": "^2.0", + "phpstan/phpdoc-parser": "^1.13" }, "require-dev": { "ext-tokenizer": "*", + "phpbench/phpbench": "^1.2", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.8", "phpstan/phpstan-phpunit": "^1.1", @@ -1536,22 +1350,69 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3" + }, + "time": "2023-08-12T11:01:26+00:00" + }, + { + "name": "phpstan/phpdoc-parser", + "version": "1.24.3", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpdoc-parser.git", + "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/12f01d214f1c73b9c91fdb3b1c415e4c70652083", + "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "doctrine/annotations": "^2.0", + "nikic/php-parser": "^4.15", + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^1.5", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.0", + "phpunit/phpunit": "^9.5", + "symfony/process": "^5.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "PHPStan\\PhpDocParser\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "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.24.3" }, - "time": "2022-10-14T12:47:21+00:00" + "time": "2023-11-18T20:15:32+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.26", + "version": "9.2.29", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1" + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", "shasum": "" }, "require": { @@ -1607,7 +1468,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29" }, "funding": [ { @@ -1615,7 +1477,7 @@ "type": "github" } ], - "time": "2023-03-06T12:58:08+00:00" + "time": "2023-09-19T04:57:46+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1860,16 +1722,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.10", + "version": "9.6.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328" + "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a6d351645c3fe5a30f5e86be6577d946af65a328", - "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be", + "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be", "shasum": "" }, "require": { @@ -1884,7 +1746,7 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.13", + "phpunit/php-code-coverage": "^9.2.28", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -1943,7 +1805,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.10" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.13" }, "funding": [ { @@ -1959,34 +1821,29 @@ "type": "tidelift" } ], - "time": "2023-07-10T04:04:23+00:00" + "time": "2023-09-19T05:39:22+00:00" }, { - "name": "psr/cache", - "version": "3.0.0", + "name": "psr/clock", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/php-fig/cache.git", - "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" + "url": "https://github.com/php-fig/clock.git", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", - "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d", "shasum": "" }, "require": { - "php": ">=8.0.0" + "php": "^7.0 || ^8.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { - "Psr\\Cache\\": "src/" + "Psr\\Clock\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1999,83 +1856,44 @@ "homepage": "https://www.php-fig.org/" } ], - "description": "Common interface for caching libraries", + "description": "Common interface for reading the clock.", + "homepage": "https://github.com/php-fig/clock", "keywords": [ - "cache", + "clock", + "now", "psr", - "psr-6" + "psr-20", + "time" ], "support": { - "source": "https://github.com/php-fig/cache/tree/3.0.0" + "issues": "https://github.com/php-fig/clock/issues", + "source": "https://github.com/php-fig/clock/tree/1.0.0" }, - "time": "2021-02-03T23:26:27+00:00" + "time": "2022-11-25T14:36:26+00:00" }, { - "name": "psr/clock", - "version": "1.0.0", + "name": "psr/container", + "version": "2.0.2", "source": { "type": "git", - "url": "https://github.com/php-fig/clock.git", - "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d" + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d", - "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", "shasum": "" }, "require": { - "php": "^7.0 || ^8.0" + "php": ">=7.4.0" }, "type": "library", - "autoload": { - "psr-4": { - "Psr\\Clock\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" } - ], - "description": "Common interface for reading the clock.", - "homepage": "https://github.com/php-fig/clock", - "keywords": [ - "clock", - "now", - "psr", - "psr-20", - "time" - ], - "support": { - "issues": "https://github.com/php-fig/clock/issues", - "source": "https://github.com/php-fig/clock/tree/1.0.0" - }, - "time": "2022-11-25T14:36:26+00:00" - }, - { - "name": "psr/container", - "version": "1.1.2", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", - "shasum": "" - }, - "require": { - "php": ">=7.4.0" }, - "type": "library", "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -2102,9 +1920,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.2" + "source": "https://github.com/php-fig/container/tree/2.0.2" }, - "time": "2021-11-05T16:50:12+00:00" + "time": "2021-11-05T16:47:00+00:00" }, { "name": "psr/event-dispatcher", @@ -2712,16 +2530,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.5", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" + "reference": "bde739e7565280bda77be70044ac1047bc007e34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", "shasum": "" }, "require": { @@ -2764,7 +2582,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" }, "funding": [ { @@ -2772,7 +2590,7 @@ "type": "github" } ], - "time": "2022-02-14T08:28:10+00:00" + "time": "2023-08-02T09:26:13+00:00" }, { "name": "sebastian/lines-of-code", @@ -3172,52 +2990,43 @@ }, { "name": "symfony/console", - "version": "v5.4.19", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "dccb8d251a9017d5994c988b034d3e18aaabf740" + "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/dccb8d251a9017d5994c988b034d3e18aaabf740", - "reference": "dccb8d251a9017d5994c988b034d3e18aaabf740", + "url": "https://api.github.com/repos/symfony/console/zipball/0d14a9f6d04d4ac38a8cea1171f4554e325dae92", + "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.9", - "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1|^2|^3", - "symfony/string": "^5.1|^6.0" + "symfony/service-contracts": "^2.5|^3", + "symfony/string": "^5.4|^6.0" }, "conflict": { - "psr/log": ">=3", - "symfony/dependency-injection": "<4.4", - "symfony/dotenv": "<5.1", - "symfony/event-dispatcher": "<4.4", - "symfony/lock": "<4.4", - "symfony/process": "<4.4" + "symfony/dependency-injection": "<5.4", + "symfony/dotenv": "<5.4", + "symfony/event-dispatcher": "<5.4", + "symfony/lock": "<5.4", + "symfony/process": "<5.4" }, "provide": { - "psr/log-implementation": "1.0|2.0" + "psr/log-implementation": "1.0|2.0|3.0" }, "require-dev": { - "psr/log": "^1|^2", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/event-dispatcher": "^4.4|^5.0|^6.0", - "symfony/lock": "^4.4|^5.0|^6.0", - "symfony/process": "^4.4|^5.0|^6.0", - "symfony/var-dumper": "^4.4|^5.0|^6.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" + "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" }, "type": "library", "autoload": { @@ -3246,12 +3055,12 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command line", + "command-line", "console", "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.19" + "source": "https://github.com/symfony/console/tree/v6.3.8" }, "funding": [ { @@ -3267,29 +3076,29 @@ "type": "tidelift" } ], - "time": "2023-01-01T08:32:19+00:00" + "time": "2023-10-31T08:09:35+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.2", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -3318,7 +3127,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" }, "funding": [ { @@ -3334,57 +3143,48 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { - "name": "symfony/event-dispatcher", - "version": "v5.4.19", + "name": "symfony/polyfill-ctype", + "version": "v1.28.0", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "abf49cc084c087d94b4cb939c3f3672971784e0c" + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/abf49cc084c087d94b4cb939c3f3672971784e0c", - "reference": "abf49cc084c087d94b4cb939c3f3672971784e0c", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/event-dispatcher-contracts": "^2|^3", - "symfony/polyfill-php80": "^1.16" - }, - "conflict": { - "symfony/dependency-injection": "<4.4" + "php": ">=7.1" }, "provide": { - "psr/event-dispatcher-implementation": "1.0", - "symfony/event-dispatcher-implementation": "2.0" - }, - "require-dev": { - "psr/log": "^1|^2|^3", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/error-handler": "^4.4|^5.0|^6.0", - "symfony/expression-language": "^4.4|^5.0|^6.0", - "symfony/http-foundation": "^4.4|^5.0|^6.0", - "symfony/service-contracts": "^1.1|^2|^3", - "symfony/stopwatch": "^4.4|^5.0|^6.0" + "ext-ctype": "*" }, "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" + "ext-ctype": "For best performance" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { + "files": [ + "bootstrap.php" + ], "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3392,18 +3192,24 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", + "description": "Symfony polyfill for ctype functions", "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.19" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" }, "funding": [ { @@ -3419,42 +3225,44 @@ "type": "tidelift" } ], - "time": "2023-01-01T08:32:19+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { - "name": "symfony/event-dispatcher-contracts", - "version": "v2.5.2", + "name": "symfony/polyfill-intl-grapheme", + "version": "v1.28.0", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1" + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "875e90aeea2777b6f135677f618529449334a612" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", + "reference": "875e90aeea2777b6f135677f618529449334a612", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/event-dispatcher": "^1" + "php": ">=7.1" }, "suggest": { - "symfony/event-dispatcher-implementation": "" + "ext-intl": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "1.28-dev" }, "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { + "files": [ + "bootstrap.php" + ], "psr-4": { - "Symfony\\Contracts\\EventDispatcher\\": "" + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -3471,18 +3279,18 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Generic abstractions related to dispatching event", + "description": "Symfony polyfill for intl's grapheme_* functions", "homepage": "https://symfony.com", "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" + "compatibility", + "grapheme", + "intl", + "polyfill", + "portable", + "shim" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" }, "funding": [ { @@ -3498,35 +3306,47 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { - "name": "symfony/filesystem", - "version": "v5.4.19", + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.28.0", "source": { "type": "git", - "url": "https://github.com/symfony/filesystem.git", - "reference": "648bfaca6a494f3e22378123bcee2894045dc9d8" + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/648bfaca6a494f3e22378123bcee2894045dc9d8", - "reference": "648bfaca6a494f3e22378123bcee2894045dc9d8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.8", - "symfony/polyfill-php80": "^1.16" + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { + "files": [ + "bootstrap.php" + ], "psr-4": { - "Symfony\\Component\\Filesystem\\": "" + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "Resources/stubs" ] }, "notification-url": "https://packagist.org/downloads/", @@ -3535,18 +3355,26 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Provides basic utilities for the filesystem", + "description": "Symfony polyfill for intl's Normalizer class and related functions", "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.19" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" }, "funding": [ { @@ -3562,35 +3390,48 @@ "type": "tidelift" } ], - "time": "2023-01-14T19:14:44+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { - "name": "symfony/finder", - "version": "v5.4.19", + "name": "symfony/polyfill-mbstring", + "version": "v1.28.0", "source": { "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "6071aebf810ad13fe8200c224f36103abb37cf1f" + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "42292d99c55abe617799667f454222c54c60e229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/6071aebf810ad13fe8200c224f36103abb37cf1f", - "reference": "6071aebf810ad13fe8200c224f36103abb37cf1f", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php80": "^1.16" + "php": ">=7.1" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { + "files": [ + "bootstrap.php" + ], "psr-4": { - "Symfony\\Component\\Finder\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "Symfony\\Polyfill\\Mbstring\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3598,18 +3439,25 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Finds files and directories via an intuitive fluent interface", + "description": "Symfony polyfill for the Mbstring extension", "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.19" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" }, "funding": [ { @@ -3625,35 +3473,44 @@ "type": "tidelift" } ], - "time": "2023-01-14T19:14:44+00:00" + "time": "2023-07-28T09:04:16+00:00" }, { - "name": "symfony/options-resolver", - "version": "v5.4.19", + "name": "symfony/polyfill-php80", + "version": "v1.28.0", "source": { "type": "git", - "url": "https://github.com/symfony/options-resolver.git", - "reference": "b03c99236445492f20c61666e8f7e5d388b078e5" + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b03c99236445492f20c61666e8f7e5d388b078e5", - "reference": "b03c99236445492f20c61666e8f7e5d388b078e5", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php73": "~1.0", - "symfony/polyfill-php80": "^1.16" + "php": ">=7.1" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { + "files": [ + "bootstrap.php" + ], "psr-4": { - "Symfony\\Component\\OptionsResolver\\": "" + "Symfony\\Polyfill\\Php80\\": "" }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "Resources/stubs" ] }, "notification-url": "https://packagist.org/downloads/", @@ -3662,23 +3519,28 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Provides an improved replacement for the array_replace PHP function", + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ - "config", - "configuration", - "options" + "compatibility", + "polyfill", + "portable", + "shim" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.19" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" }, "funding": [ { @@ -3694,48 +3556,46 @@ "type": "tidelift" } ], - "time": "2023-01-01T08:32:19+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { - "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "name": "symfony/service-contracts", + "version": "v3.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "url": "https://github.com/symfony/service-contracts.git", + "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838", + "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.1", + "psr/container": "^2.0" }, - "provide": { - "ext-ctype": "*" - }, - "suggest": { - "ext-ctype": "For best performance" + "conflict": { + "ext-psr": "<1.1|>=2" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "3.4-dev" }, "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" } }, "autoload": { - "files": [ - "bootstrap.php" - ], "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - } + "Symfony\\Contracts\\Service\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3743,647 +3603,15 @@ ], "authors": [ { - "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill for ctype functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "ctype", - "polyfill", - "portable" - ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.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": "2022-11-03T14:55:06+00:00" - }, - { - "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - } - }, - "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 for intl's grapheme_* functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "grapheme", - "intl", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.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": "2022-11-03T14:55:06+00:00" - }, - { - "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, - "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 for intl's Normalizer class and related functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "intl", - "normalizer", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.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": "2022-11-03T14:55:06+00:00" - }, - { - "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "provide": { - "ext-mbstring": "*" - }, - "suggest": { - "ext-mbstring": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - } - }, - "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 for the Mbstring extension", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.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": "2022-11-03T14:55:06+00:00" - }, - { - "name": "symfony/polyfill-php73", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, - "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 7.3+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.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": "2022-11-03T14:55:06+00:00" - }, - { - "name": "symfony/polyfill-php80", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.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": "2022-11-03T14:55:06+00:00" - }, - { - "name": "symfony/polyfill-php81", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" - }, - "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.27.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": "2022-11-03T14:55:06+00:00" - }, - { - "name": "symfony/process", - "version": "v5.4.19", - "source": { - "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "c5ba874c9b636dbccf761e22ce750e88ec3f55e1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/c5ba874c9b636dbccf761e22ce750e88ec3f55e1", - "reference": "c5ba874c9b636dbccf761e22ce750e88ec3f55e1", - "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.19" - }, - "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": "2023-01-01T08:32:19+00:00" - }, - { - "name": "symfony/service-contracts", - "version": "v2.5.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/service-contracts.git", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "psr/container": "^1.1", - "symfony/deprecation-contracts": "^2.1|^3" - }, - "conflict": { - "ext-psr": "<1.1|>=2" - }, - "suggest": { - "symfony/service-implementation": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\Service\\": "" - } - }, - "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": "Generic abstractions related to writing services", + "description": "Generic abstractions related to writing services", "homepage": "https://symfony.com", "keywords": [ "abstractions", @@ -4394,69 +3622,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.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": "2022-05-30T19:17:29+00:00" - }, - { - "name": "symfony/stopwatch", - "version": "v5.4.19", - "source": { - "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "bd2b066090fd6a67039371098fa25a84cb2679ec" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/bd2b066090fd6a67039371098fa25a84cb2679ec", - "reference": "bd2b066090fd6a67039371098fa25a84cb2679ec", - "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.19" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.0" }, "funding": [ { @@ -4472,38 +3638,38 @@ "type": "tidelift" } ], - "time": "2023-01-01T08:32:19+00:00" + "time": "2023-07-30T20:28:31+00:00" }, { "name": "symfony/string", - "version": "v5.4.19", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "0a01071610fd861cc160dfb7e2682ceec66064cb" + "reference": "13880a87790c76ef994c91e87efb96134522577a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/0a01071610fd861cc160dfb7e2682ceec66064cb", - "reference": "0a01071610fd861cc160dfb7e2682ceec66064cb", + "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a", + "reference": "13880a87790c76ef994c91e87efb96134522577a", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "~1.15" + "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/translation-contracts": ">=3.0" + "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^4.4|^5.0|^6.0", - "symfony/http-client": "^4.4|^5.0|^6.0", - "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0|^6.0" + "symfony/error-handler": "^5.4|^6.0", + "symfony/http-client": "^5.4|^6.0", + "symfony/intl": "^6.2", + "symfony/translation-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^5.4|^6.0" }, "type": "library", "autoload": { @@ -4542,7 +3708,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.19" + "source": "https://github.com/symfony/string/tree/v6.3.8" }, "funding": [ { @@ -4558,20 +3724,20 @@ "type": "tidelift" } ], - "time": "2023-01-01T08:32:19+00:00" + "time": "2023-11-09T08:28:21+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -4600,7 +3766,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -4608,7 +3774,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-11-20T00:12:19+00:00" }, { "name": "vimeo/psalm", @@ -4838,7 +4004,7 @@ "platform": [], "platform-dev": [], "platform-overrides": { - "php": "8.0" + "php": "8.1" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 283feb3ce363ec25da031b7bab4492790e97d7df Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 18 Apr 2024 13:09:06 +0200 Subject: [PATCH 2/5] fix(dev-deps): Adjust dependencies for still supported PHP 8.0 Signed-off-by: Ferdinand Thiessen --- composer.json | 4 +- composer.lock | 898 ++++++++++++++------------------------------------ 2 files changed, 242 insertions(+), 660 deletions(-) diff --git a/composer.json b/composer.json index 103def986..a86e83dee 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "classmap-authoritative": true, "autoloader-suffix": "Circles", "platform": { - "php": "8.1" + "php": "8.0.2" } }, "authors": [ @@ -38,7 +38,7 @@ "require-dev": { "phpunit/phpunit": "^9.5", "vimeo/psalm": "^4.22", - "nextcloud/coding-standard": "^1.0", + "nextcloud/coding-standard": "^1.1", "nextcloud/ocp": "dev-stable28" } } diff --git a/composer.lock b/composer.lock index e9e91699c..ed7f67e42 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "38afa5f5b24a097af7c701bb25e3c5c6", + "content-hash": "1876b64644734531857fb1044ea65473", "packages": [], "packages-dev": [ { "name": "amphp/amp", - "version": "v2.6.2", + "version": "v2.6.4", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb" + "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", - "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", + "url": "https://api.github.com/repos/amphp/amp/zipball/ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", + "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", "shasum": "" }, "require": { @@ -30,8 +30,8 @@ "ext-json": "*", "jetbrains/phpstorm-stubs": "^2019.3", "phpunit/phpunit": "^7 | ^8 | ^9", - "psalm/phar": "^3.11@dev", - "react/promise": "^2" + "react/promise": "^2", + "vimeo/psalm": "^3.12" }, "type": "library", "extra": { @@ -86,7 +86,7 @@ "support": { "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.6.2" + "source": "https://github.com/amphp/amp/tree/v2.6.4" }, "funding": [ { @@ -94,20 +94,20 @@ "type": "github" } ], - "time": "2022-02-20T17:52:18+00:00" + "time": "2024-03-21T18:52:26+00:00" }, { "name": "amphp/byte-stream", - "version": "v1.8.1", + "version": "v1.8.2", "source": { "type": "git", "url": "https://github.com/amphp/byte-stream.git", - "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd" + "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd", - "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/4f0e968ba3798a423730f567b1b50d3441c16ddc", + "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc", "shasum": "" }, "require": { @@ -123,11 +123,6 @@ "psalm/phar": "^3.11.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, "autoload": { "files": [ "lib/functions.php" @@ -151,7 +146,7 @@ } ], "description": "A stream abstraction to make working with non-blocking I/O simple.", - "homepage": "http://amphp.org/byte-stream", + "homepage": "https://amphp.org/byte-stream", "keywords": [ "amp", "amphp", @@ -161,9 +156,8 @@ "stream" ], "support": { - "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/byte-stream/issues", - "source": "https://github.com/amphp/byte-stream/tree/v1.8.1" + "source": "https://github.com/amphp/byte-stream/tree/v1.8.2" }, "funding": [ { @@ -171,7 +165,7 @@ "type": "github" } ], - "time": "2021-03-30T17:13:30+00:00" + "time": "2024-04-13T18:00:56+00:00" }, { "name": "composer/package-versions-deprecated", @@ -248,16 +242,16 @@ }, { "name": "composer/pcre", - "version": "3.1.1", + "version": "3.1.3", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" + "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", - "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", + "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", "shasum": "" }, "require": { @@ -299,7 +293,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.1" + "source": "https://github.com/composer/pcre/tree/3.1.3" }, "funding": [ { @@ -315,7 +309,7 @@ "type": "tidelift" } ], - "time": "2023-10-11T07:11:09+00:00" + "time": "2024-03-19T10:26:25+00:00" }, { "name": "composer/semver", @@ -400,16 +394,16 @@ }, { "name": "composer/xdebug-handler", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "ced299686f41dce890debac69273b47ffe98a40c" + "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", - "reference": "ced299686f41dce890debac69273b47ffe98a40c", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/4f988f8fdf580d53bdb2d1278fe93d1ed5462255", + "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255", "shasum": "" }, "require": { @@ -420,7 +414,7 @@ "require-dev": { "phpstan/phpstan": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^6.0" + "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5" }, "type": "library", "autoload": { @@ -444,9 +438,9 @@ "performance" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.4" }, "funding": [ { @@ -462,7 +456,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T21:32:43+00:00" + "time": "2024-03-26T18:29:49+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -503,16 +497,16 @@ }, { "name": "doctrine/deprecations", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", - "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", "shasum": "" }, "require": { @@ -544,36 +538,36 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.2" + "source": "https://github.com/doctrine/deprecations/tree/1.1.3" }, - "time": "2023-09-27T20:04:15+00:00" + "time": "2024-01-30T19:34:25+00:00" }, { "name": "doctrine/instantiator", - "version": "2.0.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", - "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", "shasum": "" }, "require": { - "php": "^8.1" + "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^11", + "doctrine/coding-standard": "^9 || ^11", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^1.2", - "phpstan/phpstan": "^1.9.4", - "phpstan/phpstan-phpunit": "^1.3", - "phpunit/phpunit": "^9.5.27", - "vimeo/psalm": "^5.4" + "phpbench/phpbench": "^0.16 || ^1", + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-phpunit": "^1", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.30 || ^5.4" }, "type": "library", "autoload": { @@ -600,7 +594,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/2.0.0" + "source": "https://github.com/doctrine/instantiator/tree/1.5.0" }, "funding": [ { @@ -616,7 +610,7 @@ "type": "tidelift" } ], - "time": "2022-12-30T00:23:10+00:00" + "time": "2022-12-30T00:15:36+00:00" }, { "name": "felixfbecker/advanced-json-rpc", @@ -780,16 +774,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v4.2.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "f60565f8c0566a31acf06884cdaa591867ecc956" + "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956", - "reference": "f60565f8c0566a31acf06884cdaa591867ecc956", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0", + "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0", "shasum": "" }, "require": { @@ -800,7 +794,7 @@ "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", + "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0", "squizlabs/php_codesniffer": "~3.5" }, "type": "library", @@ -825,9 +819,9 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1" }, - "time": "2023-04-09T17:37:40+00:00" + "time": "2024-01-31T06:18:54+00:00" }, { "name": "nextcloud/coding-standard", @@ -876,12 +870,12 @@ "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "2ac04202af2904a000d3e4090f7def301a4cecfe" + "reference": "80cdd62e56c7bf54d35ea2f012786e6cf7d4de27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/2ac04202af2904a000d3e4090f7def301a4cecfe", - "reference": "2ac04202af2904a000d3e4090f7def301a4cecfe", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/80cdd62e56c7bf54d35ea2f012786e6cf7d4de27", + "reference": "80cdd62e56c7bf54d35ea2f012786e6cf7d4de27", "shasum": "" }, "require": { @@ -912,25 +906,25 @@ "issues": "https://github.com/nextcloud-deps/ocp/issues", "source": "https://github.com/nextcloud-deps/ocp/tree/stable28" }, - "time": "2023-11-23T10:57:48+00:00" + "time": "2024-04-06T00:32:02+00:00" }, { "name": "nikic/php-parser", - "version": "v4.17.1", + "version": "v4.19.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b", + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.1" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", @@ -966,9 +960,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1" }, - "time": "2023-08-13T19:53:39+00:00" + "time": "2024-03-17T08:10:35+00:00" }, { "name": "openlss/lib-array2xml", @@ -1025,20 +1019,21 @@ }, { "name": "phar-io/manifest", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + "reference": "54750ef60c58e43759730615a392c31c80e23176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-phar": "*", "ext-xmlwriter": "*", "phar-io/version": "^3.0.1", @@ -1079,9 +1074,15 @@ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" + "source": "https://github.com/phar-io/manifest/tree/2.0.4" }, - "time": "2021-07-20T11:28:43+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" }, { "name": "phar-io/version", @@ -1136,16 +1137,16 @@ }, { "name": "php-cs-fixer/shim", - "version": "v3.39.0", + "version": "v3.54.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/shim.git", - "reference": "33304deae9dd24f333fd9210c80e37c2013210d7" + "reference": "887c350fccbadb2b84278fdb963c25a0c304ac9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/33304deae9dd24f333fd9210c80e37c2013210d7", - "reference": "33304deae9dd24f333fd9210c80e37c2013210d7", + "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/887c350fccbadb2b84278fdb963c25a0c304ac9c", + "reference": "887c350fccbadb2b84278fdb963c25a0c304ac9c", "shasum": "" }, "require": { @@ -1182,9 +1183,9 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/PHP-CS-Fixer/shim/issues", - "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.39.0" + "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.54.0" }, - "time": "2023-11-22T11:20:32+00:00" + "time": "2024-04-17T08:23:10+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -1241,28 +1242,35 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", + "version": "5.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" + "reference": "298d2febfe79d03fe714eb871d5538da55205b1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/298d2febfe79d03fe714eb871d5538da55205b1a", + "reference": "298d2febfe79d03fe714eb871d5538da55205b1a", "shasum": "" }, "require": { + "doctrine/deprecations": "^1.1", "ext-filter": "*", - "php": "^7.2 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", + "phpdocumentor/type-resolver": "^1.7", + "phpstan/phpdoc-parser": "^1.7", "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" + "mockery/mockery": "~1.3.5", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-webmozart-assert": "^1.2", + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^5.13" }, "type": "library", "extra": { @@ -1286,33 +1294,33 @@ }, { "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" + "email": "opensource@ijaap.nl" } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.0" }, - "time": "2021-10-19T17:43:47+00:00" + "time": "2024-04-09T21:13:58+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.7.3", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419" + "reference": "153ae662783729388a584b4361f2545e4d841e3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", - "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", + "reference": "153ae662783729388a584b4361f2545e4d841e3c", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", - "php": "^7.4 || ^8.0", + "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", "phpstan/phpdoc-parser": "^1.13" }, @@ -1350,22 +1358,22 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" }, - "time": "2023-08-12T11:01:26+00:00" + "time": "2024-02-23T11:10:43+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.3", + "version": "1.28.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083" + "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/12f01d214f1c73b9c91fdb3b1c415e4c70652083", - "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", + "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", "shasum": "" }, "require": { @@ -1397,29 +1405,29 @@ "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.24.3" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0" }, - "time": "2023-11-18T20:15:32+00:00" + "time": "2024-04-03T18:51:33+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.29", + "version": "9.2.31", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" + "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", - "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965", + "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -1469,7 +1477,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.29" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31" }, "funding": [ { @@ -1477,7 +1485,7 @@ "type": "github" } ], - "time": "2023-09-19T04:57:46+00:00" + "time": "2024-03-02T06:37:42+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1722,16 +1730,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.13", + "version": "9.6.19", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be" + "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be", - "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8", + "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8", "shasum": "" }, "require": { @@ -1805,7 +1813,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.13" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19" }, "funding": [ { @@ -1821,7 +1829,7 @@ "type": "tidelift" } ], - "time": "2023-09-19T05:39:22+00:00" + "time": "2024-04-05T04:35:58+00:00" }, { "name": "psr/clock", @@ -2026,16 +2034,16 @@ }, { "name": "sebastian/cli-parser", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b", + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b", "shasum": "" }, "require": { @@ -2070,7 +2078,7 @@ "homepage": "https://github.com/sebastianbergmann/cli-parser", "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2" }, "funding": [ { @@ -2078,7 +2086,7 @@ "type": "github" } ], - "time": "2020-09-28T06:08:49+00:00" + "time": "2024-03-02T06:27:43+00:00" }, { "name": "sebastian/code-unit", @@ -2267,20 +2275,20 @@ }, { "name": "sebastian/complexity", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", "shasum": "" }, "require": { - "nikic/php-parser": "^4.7", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -2312,7 +2320,7 @@ "homepage": "https://github.com/sebastianbergmann/complexity", "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" }, "funding": [ { @@ -2320,20 +2328,20 @@ "type": "github" } ], - "time": "2020-10-26T15:52:27+00:00" + "time": "2023-12-22T06:19:30+00:00" }, { "name": "sebastian/diff", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc", "shasum": "" }, "require": { @@ -2378,7 +2386,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6" }, "funding": [ { @@ -2386,7 +2394,7 @@ "type": "github" } ], - "time": "2023-05-07T05:35:17+00:00" + "time": "2024-03-02T06:30:58+00:00" }, { "name": "sebastian/environment", @@ -2453,16 +2461,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72", + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72", "shasum": "" }, "require": { @@ -2518,7 +2526,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6" }, "funding": [ { @@ -2526,20 +2534,20 @@ "type": "github" } ], - "time": "2022-09-14T06:03:37+00:00" + "time": "2024-03-02T06:33:00+00:00" }, { "name": "sebastian/global-state", - "version": "5.0.6", + "version": "5.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bde739e7565280bda77be70044ac1047bc007e34" + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", - "reference": "bde739e7565280bda77be70044ac1047bc007e34", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", "shasum": "" }, "require": { @@ -2582,7 +2590,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7" }, "funding": [ { @@ -2590,24 +2598,24 @@ "type": "github" } ], - "time": "2023-08-02T09:26:13+00:00" + "time": "2024-03-02T06:35:11+00:00" }, { "name": "sebastian/lines-of-code", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", "shasum": "" }, "require": { - "nikic/php-parser": "^4.6", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -2639,7 +2647,7 @@ "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" }, "funding": [ { @@ -2647,7 +2655,7 @@ "type": "github" } ], - "time": "2020-11-28T06:42:11+00:00" + "time": "2023-12-22T06:20:34+00:00" }, { "name": "sebastian/object-enumerator", @@ -2826,16 +2834,16 @@ }, { "name": "sebastian/resource-operations", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e", + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e", "shasum": "" }, "require": { @@ -2847,7 +2855,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -2868,8 +2876,7 @@ "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4" }, "funding": [ { @@ -2877,7 +2884,7 @@ "type": "github" } ], - "time": "2020-09-28T06:45:17+00:00" + "time": "2024-03-14T16:00:52+00:00" }, { "name": "sebastian/type", @@ -2990,43 +2997,43 @@ }, { "name": "symfony/console", - "version": "v6.3.8", + "version": "v3.4.47", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92" + "reference": "a10b1da6fc93080c180bba7219b5ff5b7518fe81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0d14a9f6d04d4ac38a8cea1171f4554e325dae92", - "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92", + "url": "https://api.github.com/repos/symfony/console/zipball/a10b1da6fc93080c180bba7219b5ff5b7518fe81", + "reference": "a10b1da6fc93080c180bba7219b5ff5b7518fe81", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3", - "symfony/polyfill-mbstring": "~1.0", - "symfony/service-contracts": "^2.5|^3", - "symfony/string": "^5.4|^6.0" + "php": "^5.5.9|>=7.0.8", + "symfony/debug": "~2.8|~3.0|~4.0", + "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/dependency-injection": "<5.4", - "symfony/dotenv": "<5.4", - "symfony/event-dispatcher": "<5.4", - "symfony/lock": "<5.4", - "symfony/process": "<5.4" + "symfony/dependency-injection": "<3.4", + "symfony/process": "<3.3" }, "provide": { - "psr/log-implementation": "1.0|2.0|3.0" + "psr/log-implementation": "1.0" }, "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" + "psr/log": "~1.0", + "symfony/config": "~3.3|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/lock": "~3.4|~4.0", + "symfony/process": "~3.3|~4.0" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/lock": "", + "symfony/process": "" }, "type": "library", "autoload": { @@ -3051,83 +3058,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Eases the creation of beautiful and testable command line interfaces", - "homepage": "https://symfony.com", - "keywords": [ - "cli", - "command-line", - "console", - "terminal" - ], - "support": { - "source": "https://github.com/symfony/console/tree/v6.3.8" - }, - "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": "2023-10-31T08:09:35+00:00" - }, - { - "name": "symfony/deprecation-contracts", - "version": "v3.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.4-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "files": [ - "function.php" - ] - }, - "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": "A generic function and convention to trigger deprecation notices", + "description": "Symfony Console Component", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/console/tree/v3.4.47" }, "funding": [ { @@ -3143,210 +3077,39 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2020-10-24T10:57:07+00:00" }, { - "name": "symfony/polyfill-ctype", - "version": "v1.28.0", + "name": "symfony/debug", + "version": "v4.4.44", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" + "url": "https://github.com/symfony/debug.git", + "reference": "1a692492190773c5310bc7877cb590c04c2f05be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "url": "https://api.github.com/repos/symfony/debug/zipball/1a692492190773c5310bc7877cb590c04c2f05be", + "reference": "1a692492190773c5310bc7877cb590c04c2f05be", "shasum": "" }, "require": { - "php": ">=7.1" - }, - "provide": { - "ext-ctype": "*" - }, - "suggest": { - "ext-ctype": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for ctype functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "ctype", - "polyfill", - "portable" - ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.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": "2023-01-26T09:26:14+00:00" - }, - { - "name": "symfony/polyfill-intl-grapheme", - "version": "v1.28.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "875e90aeea2777b6f135677f618529449334a612" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", - "reference": "875e90aeea2777b6f135677f618529449334a612", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - } - }, - "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 for intl's grapheme_* functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "grapheme", - "intl", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" + "php": ">=7.1.3", + "psr/log": "^1|^2|^3" }, - "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": "2023-01-26T09:26:14+00:00" - }, - { - "name": "symfony/polyfill-intl-normalizer", - "version": "v1.28.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", - "shasum": "" - }, - "require": { - "php": ">=7.1" + "conflict": { + "symfony/http-kernel": "<3.4" }, - "suggest": { - "ext-intl": "For best performance" + "require-dev": { + "symfony/http-kernel": "^3.4|^4.0|^5.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, "autoload": { - "files": [ - "bootstrap.php" - ], "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + "Symfony\\Component\\Debug\\": "" }, - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -3355,26 +3118,18 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill for intl's Normalizer class and related functions", + "description": "Provides tools to ease debugging PHP code", "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "intl", - "normalizer", - "polyfill", - "portable", - "shim" - ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" + "source": "https://github.com/symfony/debug/tree/v4.4.44" }, "funding": [ { @@ -3390,20 +3145,21 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "abandoned": "symfony/error-handler", + "time": "2022-07-28T16:29:46+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "42292d99c55abe617799667f454222c54c60e229" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", - "reference": "42292d99c55abe617799667f454222c54c60e229", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { @@ -3417,9 +3173,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3457,7 +3210,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -3473,20 +3226,20 @@ "type": "tidelift" } ], - "time": "2023-07-28T09:04:16+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", "shasum": "" }, "require": { @@ -3494,9 +3247,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3540,175 +3290,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.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": "2023-01-26T09:26:14+00:00" - }, - { - "name": "symfony/service-contracts", - "version": "v3.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/service-contracts.git", - "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838", - "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838", - "shasum": "" - }, - "require": { - "php": ">=8.1", - "psr/container": "^2.0" - }, - "conflict": { - "ext-psr": "<1.1|>=2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.4-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\Service\\": "" - }, - "exclude-from-classmap": [ - "/Test/" - ] - }, - "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": "Generic abstractions related to writing services", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.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": "2023-07-30T20:28:31+00:00" - }, - { - "name": "symfony/string", - "version": "v6.3.8", - "source": { - "type": "git", - "url": "https://github.com/symfony/string.git", - "reference": "13880a87790c76ef994c91e87efb96134522577a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a", - "reference": "13880a87790c76ef994c91e87efb96134522577a", - "shasum": "" - }, - "require": { - "php": ">=8.1", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-intl-grapheme": "~1.0", - "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "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/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^5.4|^6.0" - }, - "type": "library", - "autoload": { - "files": [ - "Resources/functions.php" - ], - "psr-4": { - "Symfony\\Component\\String\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "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": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", - "homepage": "https://symfony.com", - "keywords": [ - "grapheme", - "i18n", - "string", - "unicode", - "utf-8", - "utf8" - ], - "support": { - "source": "https://github.com/symfony/string/tree/v6.3.8" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" }, "funding": [ { @@ -3724,20 +3306,20 @@ "type": "tidelift" } ], - "time": "2023-11-09T08:28:21+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", "shasum": "" }, "require": { @@ -3766,7 +3348,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.2" + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" }, "funding": [ { @@ -3774,7 +3356,7 @@ "type": "github" } ], - "time": "2023-11-20T00:12:19+00:00" + "time": "2024-03-03T12:36:25+00:00" }, { "name": "vimeo/psalm", @@ -4004,7 +3586,7 @@ "platform": [], "platform-dev": [], "platform-overrides": { - "php": "8.1" + "php": "8.0.2" }, "plugin-api-version": "2.6.0" } From a258664ebcd89b16954ed0425c3c16cc156974d3 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 18 Apr 2024 13:19:44 +0200 Subject: [PATCH 3/5] fix: Add needed event type for template doc string Signed-off-by: Ferdinand Thiessen --- lib/Listeners/Files/AddingMemberSendMail.php | 1 + lib/Listeners/Files/CreatingShareSendMail.php | 1 + lib/Listeners/Files/DestroyingCircle.php | 1 + lib/Listeners/Files/ListenerFilesLoadScripts.php | 3 +++ lib/Listeners/Files/MemberAddedSendMail.php | 1 + lib/Listeners/Files/MembershipsRemoved.php | 1 + lib/Listeners/Files/PreparingMemberSendMail.php | 1 + lib/Listeners/Files/PreparingShareSendMail.php | 1 + lib/Listeners/Files/RemovingMember.php | 1 + lib/Listeners/Files/ShareCreatedSendMail.php | 1 + 10 files changed, 12 insertions(+) diff --git a/lib/Listeners/Files/AddingMemberSendMail.php b/lib/Listeners/Files/AddingMemberSendMail.php index a1dcbb07d..79445627b 100644 --- a/lib/Listeners/Files/AddingMemberSendMail.php +++ b/lib/Listeners/Files/AddingMemberSendMail.php @@ -49,6 +49,7 @@ * Class AddingMemberSendMail * * @package OCA\Circles\Listeners\Files + * @implements IEventListener */ class AddingMemberSendMail implements IEventListener { use TStringTools; diff --git a/lib/Listeners/Files/CreatingShareSendMail.php b/lib/Listeners/Files/CreatingShareSendMail.php index 6e72b9f3c..7369cad5c 100644 --- a/lib/Listeners/Files/CreatingShareSendMail.php +++ b/lib/Listeners/Files/CreatingShareSendMail.php @@ -56,6 +56,7 @@ * Class CreatingShareSendMail * * @package OCA\Circles\Listeners\Files + * @implements IEventListener */ class CreatingShareSendMail implements IEventListener { use TStringTools; diff --git a/lib/Listeners/Files/DestroyingCircle.php b/lib/Listeners/Files/DestroyingCircle.php index c65bba6ae..a9783ea69 100644 --- a/lib/Listeners/Files/DestroyingCircle.php +++ b/lib/Listeners/Files/DestroyingCircle.php @@ -44,6 +44,7 @@ * Class AddingMemberSendMail * * @package OCA\Circles\Listeners\Files + * @implements IEventListener */ class DestroyingCircle implements IEventListener { use TStringTools; diff --git a/lib/Listeners/Files/ListenerFilesLoadScripts.php b/lib/Listeners/Files/ListenerFilesLoadScripts.php index c4700c82f..324501363 100644 --- a/lib/Listeners/Files/ListenerFilesLoadScripts.php +++ b/lib/Listeners/Files/ListenerFilesLoadScripts.php @@ -34,6 +34,9 @@ use OCP\EventDispatcher\IEventListener; use OCP\Util; +/** + * @implements IEventListener + */ class ListenerFilesLoadScripts implements IEventListener { public function __construct( ) { diff --git a/lib/Listeners/Files/MemberAddedSendMail.php b/lib/Listeners/Files/MemberAddedSendMail.php index 738e9e3fb..86a0a4947 100644 --- a/lib/Listeners/Files/MemberAddedSendMail.php +++ b/lib/Listeners/Files/MemberAddedSendMail.php @@ -47,6 +47,7 @@ * Class MemberAdded * * @package OCA\Circles\Listeners\Files + * @implements IEventListener */ class MemberAddedSendMail implements IEventListener { use TStringTools; diff --git a/lib/Listeners/Files/MembershipsRemoved.php b/lib/Listeners/Files/MembershipsRemoved.php index a1523bf27..7654b737e 100644 --- a/lib/Listeners/Files/MembershipsRemoved.php +++ b/lib/Listeners/Files/MembershipsRemoved.php @@ -59,6 +59,7 @@ * Class MembershipsRemoved * * @package OCA\Circles\Listeners\Files + * @implements IEventListener */ class MembershipsRemoved implements IEventListener { use TStringTools; diff --git a/lib/Listeners/Files/PreparingMemberSendMail.php b/lib/Listeners/Files/PreparingMemberSendMail.php index 5b557d375..fa868a59d 100644 --- a/lib/Listeners/Files/PreparingMemberSendMail.php +++ b/lib/Listeners/Files/PreparingMemberSendMail.php @@ -54,6 +54,7 @@ * Class PreparingMemberSendMail * * @package OCA\Circles\Listeners\Files + * @implements IEventListener */ class PreparingMemberSendMail implements IEventListener { use TStringTools; diff --git a/lib/Listeners/Files/PreparingShareSendMail.php b/lib/Listeners/Files/PreparingShareSendMail.php index 9ae0ded73..660241abc 100644 --- a/lib/Listeners/Files/PreparingShareSendMail.php +++ b/lib/Listeners/Files/PreparingShareSendMail.php @@ -55,6 +55,7 @@ * Class PreparingShareSendMail * * @package OCA\Circles\Listeners\Files + * @implements IEventListener */ class PreparingShareSendMail implements IEventListener { use TStringTools; diff --git a/lib/Listeners/Files/RemovingMember.php b/lib/Listeners/Files/RemovingMember.php index 04e681e1b..33337d2d4 100644 --- a/lib/Listeners/Files/RemovingMember.php +++ b/lib/Listeners/Files/RemovingMember.php @@ -47,6 +47,7 @@ * Class RemovingMember * * @package OCA\Circles\Listeners\Files + * @implements IEventListener */ class RemovingMember implements IEventListener { use TStringTools; diff --git a/lib/Listeners/Files/ShareCreatedSendMail.php b/lib/Listeners/Files/ShareCreatedSendMail.php index 0b776f0de..b1e119f06 100644 --- a/lib/Listeners/Files/ShareCreatedSendMail.php +++ b/lib/Listeners/Files/ShareCreatedSendMail.php @@ -57,6 +57,7 @@ * Class ShareCreatedSendMail * * @package OCA\Circles\Listeners\Files + * @implements IEventListener */ class ShareCreatedSendMail implements IEventListener { use TStringTools; From 0e52267e61989890b1f8c91c4506ede6140affd6 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 18 Apr 2024 13:31:46 +0200 Subject: [PATCH 4/5] fix: Update psalm baseline Signed-off-by: Ferdinand Thiessen --- psalm.xml | 11 ++-- tests/psalm-baseline.xml | 139 +++++++++++++++++++-------------------- tests/stub.phpstub | 6 ++ 3 files changed, 81 insertions(+), 75 deletions(-) diff --git a/psalm.xml b/psalm.xml index 4e7483bac..ab84a76b9 100644 --- a/psalm.xml +++ b/psalm.xml @@ -1,10 +1,11 @@ diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml index 5492e3ae8..11ffa32b4 100644 --- a/tests/psalm-baseline.xml +++ b/tests/psalm-baseline.xml @@ -1,25 +1,21 @@ - - - - $lang - - - - - array<string,string|integer> - - - null - - - Circles::generateAbsoluteLink($circle->getUniqueId()) - - + - - OCA\Files\App - + + registerEventListener + registerEventListener + registerEventListener + registerEventListener + registerEventListener + registerEventListener + registerEventListener + registerEventListener + + + + + array + @@ -37,28 +33,29 @@ $this->federationNotifications Notifications - + getLazyRootFolder - setHtmlBody - setPlainBody - setSubject - - - IFederatedUser - - - $this->federatedUserService->getCurrentUser() - - AppConfig + AppConfig - + + section + + + + + section + + + + + section setType @@ -78,6 +75,12 @@ $owner === null + + Process + + + section + @@ -94,6 +97,22 @@ getStatus hasInvitedBy + + section + + + + + section + + + + + MissingInputException + + + section + @@ -218,11 +237,6 @@ !$sendPasswordByMail $sendPasswordByMail - - setHtmlBody - setPlainBody - setSubject - @@ -250,11 +264,6 @@ $mustBeChecked - - setHtmlBody - setPlainBody - setSubject - @@ -431,8 +440,8 @@ + $attributes Cache::cacheEntryFromData($this->getFileCache()->toCache(), OC::$server->getMimeTypeLoader()) - $this->setAttributes($attributes) Circle @@ -515,8 +524,12 @@ $bookId $bookId - + CardDavBackend + GenericEvent + GenericEvent + GenericEvent + GenericEvent $this->cardDavBackend @@ -528,21 +541,20 @@ - - $context - new GenericEvent(null, $arguments) - + + EventDispatcher + GenericEvent + + + $this->eventDispatcher + EventDispatcher + gObj - - - FederatedUser - - asyncBroadcast @@ -572,7 +584,6 @@ getGlobalScaleEvent getGlobalScaleEvent getInstances - getInstances getKey @@ -631,13 +642,6 @@ $signed === null - - - setHtmlBody - setPlainBody - setSubject - - federatedEventService @@ -705,15 +709,15 @@ + + isset($this->logger) && $this->logger instanceof LoggerInterface + isset($this->logger) HintException - - isset($this->logger) - @@ -733,9 +737,4 @@ $s[$e] - - - $event instanceof UserUpdatedEvent - - diff --git a/tests/stub.phpstub b/tests/stub.phpstub index 20c934f1a..4d4cf10f0 100644 --- a/tests/stub.phpstub +++ b/tests/stub.phpstub @@ -21,6 +21,12 @@ declare(strict_types=1); * */ +namespace OCA\Files\Event { + class LoadAdditionalScriptsEvent extends \OCP\EventDispatcher\Event { + // + } +} + namespace OCA\Files_Trashbin\Trash { use OCP\Files\Node; use OCP\Files\Storage\IStorage; From dbfff0d13d84d273877a6040de4559187b0a1cb0 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 18 Apr 2024 13:46:30 +0200 Subject: [PATCH 5/5] chore: Adjust coding style Signed-off-by: Ferdinand Thiessen --- lib/Circles/FileSharingBroadcaster.php | 48 +-- lib/CirclesManager.php | 10 +- lib/Command/CirclesCheck.php | 2 +- lib/Command/CirclesDetails.php | 2 +- lib/Command/CirclesList.php | 8 +- lib/Command/CirclesMemberships.php | 20 +- lib/Command/CirclesRemote.php | 14 +- lib/Command/CirclesReport.php | 14 +- lib/Command/CirclesTest.php | 122 +++--- lib/Command/Groups.php | 6 +- lib/Command/MembersAdd.php | 24 +- lib/Command/SharesFiles.php | 62 +-- lib/Controller/AdminController.php | 4 +- lib/Controller/EventWrapperController.php | 42 +- lib/Db/AccountsRequest.php | 2 +- lib/Db/CircleRequest.php | 14 +- lib/Db/CircleRequestBuilder.php | 2 +- lib/Db/CoreQueryBuilder.php | 12 +- lib/Db/CoreRequestBuilder.php | 6 +- lib/Db/DeprecatedMembersRequest.php | 20 +- lib/Db/DeprecatedRequestBuilder.php | 40 +- lib/Db/EventWrapperRequestBuilder.php | 2 +- lib/Db/GSSharesRequest.php | 4 +- lib/Db/MemberRequest.php | 16 +- lib/Db/MembershipRequestBuilder.php | 2 +- lib/Db/MountRequest.php | 382 +++++++++--------- lib/Db/MountRequestBuilder.php | 2 +- lib/Db/RemoteRequestBuilder.php | 2 +- lib/Db/ShareLockRequestBuilder.php | 2 +- lib/Db/ShareTokenRequestBuilder.php | 2 +- lib/Db/ShareWrapperRequest.php | 12 +- lib/Db/ShareWrapperRequestBuilder.php | 4 +- lib/Events/CircleResultGenericEvent.php | 2 +- lib/Events/Files/FileShareCreatedEvent.php | 2 +- lib/FederatedItems/CircleCreate.php | 2 +- lib/FederatedItems/CircleEdit.php | 2 +- lib/FederatedItems/CircleJoin.php | 138 +++---- lib/FederatedItems/CircleLeave.php | 4 +- lib/FederatedItems/CircleSettings.php | 2 +- lib/FederatedItems/Files/FileShare.php | 8 +- lib/FederatedItems/Files/FileUnshare.php | 10 +- lib/FederatedItems/ItemLock.php | 8 +- lib/FederatedItems/LoopbackTest.php | 2 +- lib/FederatedItems/MassiveMemberAdd.php | 4 +- lib/FederatedItems/MemberLevel.php | 2 +- lib/FederatedItems/SharedItemsSync.php | 2 +- lib/GlobalScale/AGlobalScaleEvent.php | 4 +- lib/GlobalScale/CircleStatus.php | 2 +- lib/GlobalScale/FileShare.php | 28 +- lib/GlobalScale/GSMount/Mount.php | 2 +- lib/GlobalScale/GSMount/MountProvider.php | 2 +- lib/GlobalScale/MemberAdd.php | 20 +- lib/GlobalScale/MemberJoin.php | 2 +- lib/GlobalScale/Test.php | 2 +- lib/GlobalScale/UserDeleted.php | 2 +- lib/Handlers/WebfingerHandler.php | 4 +- .../Examples/ExampleAddingCircleMember.php | 2 +- .../Examples/ExampleMembershipsCreated.php | 4 +- .../Examples/ExampleMembershipsRemoved.php | 4 +- .../ExampleRequestingCircleMember.php | 2 +- lib/Listeners/Files/AddingMemberSendMail.php | 4 +- lib/Listeners/Files/CreatingShareSendMail.php | 4 +- lib/Listeners/Files/DestroyingCircle.php | 4 +- lib/Listeners/Files/MemberAddedSendMail.php | 10 +- .../Files/PreparingMemberSendMail.php | 4 +- .../Files/PreparingShareSendMail.php | 4 +- lib/Listeners/Files/ShareCreatedSendMail.php | 4 +- .../Notifications/RequestingMember.php | 2 +- lib/Migration/Migration.php | 2 +- lib/Model/BaseCircle.php | 54 +-- lib/Model/Circle.php | 4 +- lib/Model/DavCard.php | 4 +- lib/Model/DeprecatedCircle.php | 2 +- lib/Model/Federated/EventWrapper.php | 2 +- lib/Model/Federated/FederatedEvent.php | 6 +- lib/Model/Federated/FederatedShare.php | 6 +- lib/Model/Federated/RemoteInstance.php | 6 +- lib/Model/FederatedUser.php | 12 +- lib/Model/GlobalScale/GSShare.php | 2 +- lib/Model/GlobalScale/GSShareMountpoint.php | 2 +- lib/Model/GlobalScale/GSWrapper.php | 2 +- lib/Model/Helpers/MemberHelper.php | 2 +- lib/Model/Mount.php | 88 ++-- lib/Model/Mountpoint.php | 2 +- lib/Model/Report.php | 2 +- lib/Model/ShareToken.php | 4 +- lib/Model/ShareWrapper.php | 42 +- lib/Model/SharesToken.php | 2 +- lib/MountManager/CircleMount.php | 2 +- lib/MountManager/CircleMountProvider.php | 50 +-- lib/Search/GlobalScaleUsers.php | 12 +- lib/Service/CirclesService.php | 40 +- lib/Service/ContactService.php | 6 +- lib/Service/DavService.php | 16 +- lib/Service/EventsService.php | 2 +- lib/Service/FederatedEventService.php | 8 +- lib/Service/GSUpstreamService.php | 22 +- lib/Service/GlobalScaleService.php | 260 ++++++------ lib/Service/GroupsService.php | 2 +- lib/Service/InterfaceService.php | 6 +- lib/Service/MaintenanceService.php | 18 +- lib/Service/MemberService.php | 22 +- lib/Service/MembersService.php | 18 +- lib/Service/MigrationService.php | 2 +- lib/Service/MiscService.php | 2 +- lib/Service/NotificationService.php | 26 +- lib/Service/RemoteDownstreamService.php | 48 +-- lib/Service/RemoteService.php | 8 +- lib/Service/RemoteStreamService.php | 2 +- lib/Service/RemoteUpstreamService.php | 326 +++++++-------- lib/Service/SearchService.php | 2 +- lib/Service/SendMailService.php | 10 +- lib/Service/ShareService.php | 6 +- lib/Service/ShareWrapperService.php | 2 +- lib/ShareByCircleProvider.php | 40 +- lib/Tools/Traits/TNCRequest.php | 2 +- lib/UnifiedSearch/UnifiedSearchProvider.php | 2 +- tests/TestSuiteListener.php | 4 +- 118 files changed, 1210 insertions(+), 1210 deletions(-) diff --git a/lib/Circles/FileSharingBroadcaster.php b/lib/Circles/FileSharingBroadcaster.php index 4ea3f080c..5529cede7 100644 --- a/lib/Circles/FileSharingBroadcaster.php +++ b/lib/Circles/FileSharingBroadcaster.php @@ -218,14 +218,14 @@ public function createShareToMember(SharingFrame $frame, DeprecatedMember $membe $password = ''; $sendPasswordByMail = true; -// if ($this->configService->enforcePasswordProtection($circle)) { -// if ($circle->getSetting('password_single_enabled') === 'true') { -// $password = $circle->getPasswordSingle(); -// $sendPasswordByMail = false; -// } else { -// $password = $this->miscService->token(15); -// } -// } + // if ($this->configService->enforcePasswordProtection($circle)) { + // if ($circle->getSetting('password_single_enabled') === 'true') { + // $password = $circle->getPasswordSingle(); + // $sendPasswordByMail = false; + // } else { + // $password = $this->miscService->token(15); + // } + // } $sharesToken = $this->tokensRequest->generateTokenForMember($member, $share->getId(), $password); @@ -470,9 +470,9 @@ protected function sendMail($fileName, $link, $author, $circleName, $email) { * @throws Exception */ protected function sendPasswordByMail(IShare $share, $circleName, $email, $password) { -// if (!$this->configService->sendPasswordByMail() || $password === '') { -// return; -// } + // if (!$this->configService->sendPasswordByMail() || $password === '') { + // return; + // } $message = $this->mailer->createMessage(); @@ -591,9 +591,9 @@ public function sendMailExitingShares( $data = []; $password = ''; -// if ($this->configService->enforcePasswordProtection($circle)) { -// $password = $this->miscService->token(15); -// } + // if ($this->configService->enforcePasswordProtection($circle)) { + // $password = $this->miscService->token(15); + // } foreach ($unknownShares as $share) { try { @@ -625,9 +625,9 @@ public function sendMailExitingShares( * @throws Exception */ protected function sendPasswordExistingShares(DeprecatedMember $author, string $email, string $password) { -// if (!$this->configService->sendPasswordByMail() || $password === '') { -// return; -// } + // if (!$this->configService->sendPasswordByMail() || $password === '') { + // return; + // } $message = $this->mailer->createMessage(); @@ -742,12 +742,12 @@ protected function generateMailExitingShares($author, $circleName) { */ protected function fillMailExistingShares(IEMailTemplate $emailTemplate, array $data) { foreach ($data as $item) { -// $text = $this->l10n->t('%s shared »%s« with you.', [$item['author'], $item['filename']]); -// $emailTemplate->addBodyText( -// htmlspecialchars($text) . '
' . htmlspecialchars( -// $this->l10n->t('Click the button below to open it.') -// ), $text -// ); + // $text = $this->l10n->t('%s shared »%s« with you.', [$item['author'], $item['filename']]); + // $emailTemplate->addBodyText( + // htmlspecialchars($text) . '
' . htmlspecialchars( + // $this->l10n->t('Click the button below to open it.') + // ), $text + // ); $emailTemplate->addBodyButton( $this->l10n->t('Open »%s«', [htmlspecialchars($item['filename'])]), $item['link'] ); @@ -764,7 +764,7 @@ protected function fillMailExistingShares(IEMailTemplate $emailTemplate, array $ */ protected function sendMailExistingShares(IEMailTemplate $emailTemplate, $author, $recipient) { $subject = $this->l10n->t('%s shared multiple files with you.', [$author]); -// $emailTemplate->addHeading($subject, false); + // $emailTemplate->addHeading($subject, false); $instanceName = $this->defaults->getName(); $senderName = $this->l10n->t('%s on %s', [$author, $instanceName]); diff --git a/lib/CirclesManager.php b/lib/CirclesManager.php index 9dbcfa76c..84286a252 100644 --- a/lib/CirclesManager.php +++ b/lib/CirclesManager.php @@ -559,10 +559,10 @@ public function probeCircles(?CircleProbe $circleProbe = null, ?DataProbe $dataP * @throws MemberNotFoundException * @throws RequestBuilderException */ -// public function getMember(string $circleId, string $singleId): Member { -// $this->federatedUserService->bypassCurrentUserCondition(true); -// $this->memberService->getMemberById($circleId, $singleId); -// } + // public function getMember(string $circleId, string $singleId): Member { + // $this->federatedUserService->bypassCurrentUserCondition(true); + // $this->memberService->getMemberById($circleId, $singleId); + // } /** @@ -572,5 +572,5 @@ public function probeCircles(?CircleProbe $circleProbe = null, ?DataProbe $dataP * * @return Member */ -// public function getMemberById(string $memberId): Member { + // public function getMemberById(string $memberId): Member { } diff --git a/lib/Command/CirclesCheck.php b/lib/Command/CirclesCheck.php index 6b0791012..7248cd4f7 100644 --- a/lib/Command/CirclesCheck.php +++ b/lib/Command/CirclesCheck.php @@ -180,7 +180,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int throw new Exception('Unknown type: ' . implode(', ', self::$checks)); } -// $this->configService->setAppValue(ConfigService::TEST_NC_BASE, $test); + // $this->configService->setAppValue(ConfigService::TEST_NC_BASE, $test); if ($type === '' || $type === 'loopback') { $output->writeln('### Checking loopback address.'); diff --git a/lib/Command/CirclesDetails.php b/lib/Command/CirclesDetails.php index ae204fd97..7461d892b 100644 --- a/lib/Command/CirclesDetails.php +++ b/lib/Command/CirclesDetails.php @@ -31,7 +31,6 @@ namespace OCA\Circles\Command; -use OCA\Circles\Tools\Exceptions\InvalidItemException; use OC\Core\Command\Base; use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\Circles\Exceptions\FederatedItemException; @@ -55,6 +54,7 @@ use OCA\Circles\Service\FederatedUserService; use OCA\Circles\Service\MemberService; use OCA\Circles\Service\RemoteService; +use OCA\Circles\Tools\Exceptions\InvalidItemException; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; diff --git a/lib/Command/CirclesList.php b/lib/Command/CirclesList.php index 1915b8350..b5f2441fa 100644 --- a/lib/Command/CirclesList.php +++ b/lib/Command/CirclesList.php @@ -31,10 +31,6 @@ namespace OCA\Circles\Command; -use OCA\Circles\Tools\Exceptions\RequestNetworkException; -use OCA\Circles\Tools\Exceptions\SignatoryException; -use OCA\Circles\Tools\Traits\TArrayTools; -use OCA\Circles\Tools\Traits\TStringTools; use OC\Core\Command\Base; use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\Circles\Exceptions\FederatedItemException; @@ -60,6 +56,10 @@ use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\FederatedUserService; use OCA\Circles\Service\RemoteService; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\SignatoryException; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TStringTools; use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; diff --git a/lib/Command/CirclesMemberships.php b/lib/Command/CirclesMemberships.php index b98319987..00f81c5d1 100644 --- a/lib/Command/CirclesMemberships.php +++ b/lib/Command/CirclesMemberships.php @@ -206,11 +206,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int $type = Member::parseTypeString($input->getOption('type')); $federatedUser = $this->federatedUserService->getFederatedUser($userId, $type); -// if ($this->input->getOption('reset')) { -// $this->membershipsService->resetMemberships($federatedUser->getSingleId()); -// -// return 0; -// } + // if ($this->input->getOption('reset')) { + // $this->membershipsService->resetMemberships($federatedUser->getSingleId()); + // + // return 0; + // } $output->writeln('Id: ' . $federatedUser->getUserId() . ''); $output->writeln('Instance: ' . $federatedUser->getInstance() . ''); @@ -359,11 +359,11 @@ public function displayLeaf(SimpleDataStore $data, int $lineNumber): string { * @throws RequestBuilderException */ private function manageAllMemberships() { -// if ($this->input->getOption('reset')) { -// $this->membershipsService->resetMemberships('', true); -// -// return; -// } + // if ($this->input->getOption('reset')) { + // $this->membershipsService->resetMemberships('', true); + // + // return; + // } $this->federatedUserService->bypassCurrentUserCondition(true); diff --git a/lib/Command/CirclesRemote.php b/lib/Command/CirclesRemote.php index 947967c0b..c00dc652a 100644 --- a/lib/Command/CirclesRemote.php +++ b/lib/Command/CirclesRemote.php @@ -31,13 +31,6 @@ namespace OCA\Circles\Command; -use OCA\Circles\Tools\Exceptions\RequestNetworkException; -use OCA\Circles\Tools\Exceptions\SignatoryException; -use OCA\Circles\Tools\Exceptions\SignatureException; -use OCA\Circles\Tools\Model\NCRequest; -use OCA\Circles\Tools\Model\NCSignedRequest; -use OCA\Circles\Tools\Traits\TNCWellKnown; -use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OC\Core\Command\Base; use OCA\Circles\AppInfo\Application; @@ -49,6 +42,13 @@ use OCA\Circles\Service\GlobalScaleService; use OCA\Circles\Service\InterfaceService; use OCA\Circles\Service\RemoteStreamService; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\SignatoryException; +use OCA\Circles\Tools\Exceptions\SignatureException; +use OCA\Circles\Tools\Model\NCRequest; +use OCA\Circles\Tools\Model\NCSignedRequest; +use OCA\Circles\Tools\Traits\TNCWellKnown; +use OCA\Circles\Tools\Traits\TStringTools; use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; diff --git a/lib/Command/CirclesReport.php b/lib/Command/CirclesReport.php index 2668f022f..d80f4e9bd 100644 --- a/lib/Command/CirclesReport.php +++ b/lib/Command/CirclesReport.php @@ -31,9 +31,6 @@ namespace OCA\Circles\Command; -use OCA\Circles\Tools\Exceptions\InvalidItemException; -use OCA\Circles\Tools\Traits\TDeserialize; -use OCA\Circles\Tools\Traits\TArrayTools; use OC\Core\Command\Base; use OCA\Circles\Exceptions\InitiatorNotFoundException; use OCA\Circles\Exceptions\UnknownInterfaceException; @@ -49,6 +46,9 @@ use OCA\Circles\Service\FederatedUserService; use OCA\Circles\Service\InterfaceService; use OCA\Circles\Service\MemberService; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TDeserialize; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\ConsoleOutput; @@ -230,7 +230,7 @@ public function fillCommandList(string $source, string $field): array { * @param string $command */ public function manageCommand(string $command): void { -// echo $command . "\n"; + // echo $command . "\n"; } @@ -344,9 +344,9 @@ private function obfuscateFederatedUser(FederatedUser $federatedUser): Federated } // what was that for ? -// if ($federatedUser->hasLink()) { -// $federatedUser->setLink($this->obfuscateMembership($federatedUser->getLink())); -// } + // if ($federatedUser->hasLink()) { + // $federatedUser->setLink($this->obfuscateMembership($federatedUser->getLink())); + // } if ($federatedUser->hasMemberships()) { $memberships = []; diff --git a/lib/Command/CirclesTest.php b/lib/Command/CirclesTest.php index 9f5ff1307..08f5bda11 100644 --- a/lib/Command/CirclesTest.php +++ b/lib/Command/CirclesTest.php @@ -31,11 +31,6 @@ namespace OCA\Circles\Command; -use OCA\Circles\Tools\Exceptions\InvalidItemException; -use OCA\Circles\Tools\Exceptions\ItemNotFoundException; -use OCA\Circles\Tools\Traits\TDeserialize; -use OCA\Circles\Tools\Traits\TArrayTools; -use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OC\Core\Command\Base; use OCA\Circles\AppInfo\Application; @@ -47,6 +42,11 @@ use OCA\Circles\Model\Member; use OCA\Circles\Model\Probes\CircleProbe; use OCA\Circles\Service\ConfigService; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Exceptions\ItemNotFoundException; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TStringTools; use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; @@ -157,7 +157,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int // loading CirclesManager /** @var CirclesManager $circlesManager */ $circlesManager = \OC::$server->get(CirclesManager::class); -// $circlesManager->startSuperSession(); + // $circlesManager->startSuperSession(); $federatedUser = $circlesManager->getFederatedUser('test1', Member::TYPE_USER); @@ -169,11 +169,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int //$probe->includePersonalCircles(); // get hidden circles (to get Groups) -// $probe->includeHiddenCircles(); + // $probe->includeHiddenCircles(); -// $probe->includePersonalCircles(); -// $probe->addOptionBool('filterPersonalCircles', true); -// $probe->mustBeMember(); + // $probe->includePersonalCircles(); + // $probe->addOptionBool('filterPersonalCircles', true); + // $probe->mustBeMember(); $circles = $circlesManager->getCircles($probe); @@ -205,7 +205,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int $federatedUser = $circlesManager->getFederatedUser('testGroup', Member::TYPE_GROUP); echo 'singleId: ' . $federatedUser->getSingleId() . "\n"; -// $federatedUser->getMemberships(); + // $federatedUser->getMemberships(); // get Circles available to test1 @@ -248,12 +248,12 @@ function (Member $member): string { ); echo json_encode($members, JSON_PRETTY_PRINT); -// $circlesManager->startSession($federatedUser); + // $circlesManager->startSession($federatedUser); -// $circlesManager->destroyCircle('XXHHLGdwQTxENgU'); -// $circles = array_map(function(Circle $circle): string { -// return $circle->getDisplayName(); -// }, $circlesManager->getCircles()); + // $circlesManager->destroyCircle('XXHHLGdwQTxENgU'); + // $circles = array_map(function(Circle $circle): string { + // return $circle->getDisplayName(); + // }, $circlesManager->getCircles()); return 0; $circlesManager->stopSession(); @@ -262,27 +262,27 @@ function (Member $member): string { //echo json_encode($circles, JSON_PRETTY_PRINT); -// $circle = $circlesManager->createCircle('This is a test2'); -// -// -// $federatedUser2 = $circlesManager->getFederatedUser('test3', Member::TYPE_USER); -// $circlesManager->startSession($federatedUser); -// + // $circle = $circlesManager->createCircle('This is a test2'); + // + // + // $federatedUser2 = $circlesManager->getFederatedUser('test3', Member::TYPE_USER); + // $circlesManager->startSession($federatedUser); + // //// $info = $circlesManager->getCircle($circle->getSingleId()); ////echo json_encode($info); -// -// $circles = $circlesManager->getCircles(); -// foreach ($circles as $circle) { -// echo $circle->getDisplayName() . "\n"; + // + // $circles = $circlesManager->getCircles(); + // foreach ($circles as $circle) { + // echo $circle->getDisplayName() . "\n"; //// $circlesManager->startSession($federatedUser2); //// $circlesManager->destroyCircle($circle->getSingleId()); -// } -// -// -// // testing getCircle() -// -// -// return 0; + // } + // + // + // // testing getCircle() + // + // + // return 0; // testing queryHelper; @@ -301,26 +301,26 @@ function (Member $member): string { /** @var FederatedUser $federatedUser */ $federatedUser = $circlesManager->getFederatedUser('test1', Member::TYPE_USER); -// $circlesQueryHelper->limitToInheritedMembers('test', 'shared_to', $federatedUser, true); -// $circlesQueryHelper->addCircleDetails('test', 'shared_to'); -// -// $items = []; -// $cursor = $qb->execute(); -// while ($row = $cursor->fetch()) { -// try { -// $items[] = [ -// 'id' => $row['id'], -// 'data' => $row['data'], -// 'circle' => $circlesQueryHelper->extractCircle($row) -// ]; -// } catch (Exception $e) { -// } -// } -// $cursor->closeCursor(); -// -// echo json_encode($items, JSON_PRETTY_PRINT); -// -// return 0; + // $circlesQueryHelper->limitToInheritedMembers('test', 'shared_to', $federatedUser, true); + // $circlesQueryHelper->addCircleDetails('test', 'shared_to'); + // + // $items = []; + // $cursor = $qb->execute(); + // while ($row = $cursor->fetch()) { + // try { + // $items[] = [ + // 'id' => $row['id'], + // 'data' => $row['data'], + // 'circle' => $circlesQueryHelper->extractCircle($row) + // ]; + // } catch (Exception $e) { + // } + // } + // $cursor->closeCursor(); + // + // echo json_encode($items, JSON_PRETTY_PRINT); + // + // return 0; if ($input->getOption('are-you-aware-this-will-delete-all-my-data') === 'yes-i-am') { @@ -397,14 +397,14 @@ private function testCirclesApp() { $this->t('Adding local users and moderators'); $this->addLocalMemberByUserId(); -// $this->addLocalMemberBySingleId(); -// $this->addLocalMemberUsingMember(); -// $this->levelLocalMemberToModerator(); -// $this->addRemoteMemberUsingModerator(); -// $this->addRemoteMemberUsingRemoteMember(); -// $this->levelRemoteMemberToAdmin(); -// $this->addRemoteMemberUsingRemoteAdmin(); -// + // $this->addLocalMemberBySingleId(); + // $this->addLocalMemberUsingMember(); + // $this->levelLocalMemberToModerator(); + // $this->addRemoteMemberUsingModerator(); + // $this->addRemoteMemberUsingRemoteMember(); + // $this->levelRemoteMemberToAdmin(); + // $this->addRemoteMemberUsingRemoteAdmin(); + // } diff --git a/lib/Command/Groups.php b/lib/Command/Groups.php index 3dfe28846..49a739136 100644 --- a/lib/Command/Groups.php +++ b/lib/Command/Groups.php @@ -138,9 +138,9 @@ private function getCircleIdAndGroupFromArguments(InputInterface $input) { throw new CommandMissingArgumentException( ); -// $this->l10n->t( -// 'Missing argument: {cmd} circle_id group', ['cmd' => './occ circles:link'] -// ) + // $this->l10n->t( + // 'Missing argument: {cmd} circle_id group', ['cmd' => './occ circles:link'] + // ) } return [$input->getArgument('circle_id'), $input->getArgument('group')]; diff --git a/lib/Command/MembersAdd.php b/lib/Command/MembersAdd.php index 256745094..6589b3137 100644 --- a/lib/Command/MembersAdd.php +++ b/lib/Command/MembersAdd.php @@ -31,13 +31,6 @@ namespace OCA\Circles\Command; -use OCA\Circles\Tools\Exceptions\RequestContentException; -use OCA\Circles\Tools\Exceptions\RequestNetworkException; -use OCA\Circles\Tools\Exceptions\RequestResultNotJsonException; -use OCA\Circles\Tools\Exceptions\RequestResultSizeException; -use OCA\Circles\Tools\Exceptions\RequestServerException; -use OCA\Circles\Tools\Model\NCRequest; -use OCA\Circles\Tools\Model\Request; use Exception; use OC\Core\Command\Base; use OCA\Circles\Exceptions\FederatedItemException; @@ -46,6 +39,13 @@ use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\FederatedUserService; use OCA\Circles\Service\MemberService; +use OCA\Circles\Tools\Exceptions\RequestContentException; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\RequestResultNotJsonException; +use OCA\Circles\Tools\Exceptions\RequestResultSizeException; +use OCA\Circles\Tools\Exceptions\RequestServerException; +use OCA\Circles\Tools\Model\NCRequest; +use OCA\Circles\Tools\Model\Request; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; @@ -192,11 +192,11 @@ private function findUserFromLookup(string $search, string &$instance = ''): str $result[] = $user['userid']['value'] . ' @' . $host . ''; } -// if ($userId === '') { -// foreach($result as $item) { -// $output->writeln($item); -// } -// } + // if ($userId === '') { + // foreach($result as $item) { + // $output->writeln($item); + // } + // } return $userId; } diff --git a/lib/Command/SharesFiles.php b/lib/Command/SharesFiles.php index e0b3a0d34..9fc590fb3 100644 --- a/lib/Command/SharesFiles.php +++ b/lib/Command/SharesFiles.php @@ -31,7 +31,6 @@ namespace OCA\Circles\Command; -use OCA\Circles\Tools\Traits\TArrayTools; use OC\Core\Command\Base; use OCA\Circles\Exceptions\FederatedUserException; use OCA\Circles\Exceptions\FederatedUserNotFoundException; @@ -44,6 +43,7 @@ use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\FederatedUserService; use OCA\Circles\Service\ShareWrapperService; +use OCA\Circles\Tools\Traits\TArrayTools; use Symfony\Component\Console\Exception\MissingInputException; use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputArgument; @@ -133,36 +133,36 @@ protected function execute(InputInterface $input, OutputInterface $output): int ); return 0; -// -// if ($input->getOption('to')) { -// $this->sharedToCircle( -// $input->getOption('to'), -// $input->getOption('with'), -// $input->getOption('by'), -// $input->getOption('all'), -// $json -// ); -// -// return 0; -// } -// -// if ($input->getOption('with')) { -// $this->sharedWith($input->getOption('with'), $json); -// -// return 0; -// } -// -// if ($input->getOption('by')) { -// $this->sharesBy($input->getOption('by'), $json); -// -// return 0; -// } -// -// if ($this->fileId > 0) { -// $this->sharedFile($json); -// -// return 0; -// } + // + // if ($input->getOption('to')) { + // $this->sharedToCircle( + // $input->getOption('to'), + // $input->getOption('with'), + // $input->getOption('by'), + // $input->getOption('all'), + // $json + // ); + // + // return 0; + // } + // + // if ($input->getOption('with')) { + // $this->sharedWith($input->getOption('with'), $json); + // + // return 0; + // } + // + // if ($input->getOption('by')) { + // $this->sharesBy($input->getOption('by'), $json); + // + // return 0; + // } + // + // if ($this->fileId > 0) { + // $this->sharedFile($json); + // + // return 0; + // } } diff --git a/lib/Controller/AdminController.php b/lib/Controller/AdminController.php index 2b7f6bb95..0ae9a15d9 100644 --- a/lib/Controller/AdminController.php +++ b/lib/Controller/AdminController.php @@ -31,8 +31,6 @@ namespace OCA\Circles\Controller; -use OCA\Circles\Tools\Traits\TDeserialize; -use OCA\Circles\Tools\Traits\TNCLogger; use Exception; use OCA\Circles\Exceptions\ContactAddressBookNotFoundException; use OCA\Circles\Exceptions\ContactFormatException; @@ -52,6 +50,8 @@ use OCA\Circles\Service\MemberService; use OCA\Circles\Service\MembershipService; use OCA\Circles\Service\SearchService; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TNCLogger; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSException; use OCP\AppFramework\OCSController; diff --git a/lib/Controller/EventWrapperController.php b/lib/Controller/EventWrapperController.php index fd2ca5a84..eb4b74d33 100644 --- a/lib/Controller/EventWrapperController.php +++ b/lib/Controller/EventWrapperController.php @@ -140,25 +140,25 @@ public function asyncBroadcast(string $token): DataResponse { } -// /** -// * Status Event. This is an event to check status of items between instances. -// * -// * @PublicPage -// * @NoCSRFRequired -// * -// * @return DataResponse -// */ -// public function status(): DataResponse { -// $data = file_get_contents('php://input'); -// -// try { -// $event = new GSEvent(); -// $event->importFromJson($data); -// $this->gsDownstreamService->statusEvent($event); -// -// return $this->success(['success' => $event]); -// } catch (Exception $e) { -// return $this->fail(['data' => $data, 'error' => $e->getMessage()]); -// } -// } + // /** + // * Status Event. This is an event to check status of items between instances. + // * + // * @PublicPage + // * @NoCSRFRequired + // * + // * @return DataResponse + // */ + // public function status(): DataResponse { + // $data = file_get_contents('php://input'); + // + // try { + // $event = new GSEvent(); + // $event->importFromJson($data); + // $this->gsDownstreamService->statusEvent($event); + // + // return $this->success(['success' => $event]); + // } catch (Exception $e) { + // return $this->fail(['data' => $data, 'error' => $e->getMessage()]); + // } + // } } diff --git a/lib/Db/AccountsRequest.php b/lib/Db/AccountsRequest.php index 55c327b27..df1000130 100644 --- a/lib/Db/AccountsRequest.php +++ b/lib/Db/AccountsRequest.php @@ -27,8 +27,8 @@ namespace OCA\Circles\Db; -use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\Exceptions\MemberDoesNotExistException; +use OCA\Circles\Tools\Traits\TStringTools; class AccountsRequest extends AccountsRequestBuilder { use TStringTools; diff --git a/lib/Db/CircleRequest.php b/lib/Db/CircleRequest.php index 05aa1f897..d05b3c53c 100644 --- a/lib/Db/CircleRequest.php +++ b/lib/Db/CircleRequest.php @@ -320,7 +320,7 @@ public function getCirclesByIds(array $circleIds): array { ); $qb->limitInArray('unique_id', $circleIds); -// $qb->filterCircles(CoreQueryBuilder::CIRCLE, $filter); + // $qb->filterCircles(CoreQueryBuilder::CIRCLE, $filter); $qb->leftJoinOwner(CoreQueryBuilder::CIRCLE); return $this->getItemsFromRequest($qb); @@ -361,12 +361,12 @@ public function getCircle( $qb->limitToUniqueId($id); $qb->filterCircles(CoreQueryBuilder::CIRCLE, $probe); $qb->leftJoinOwner(CoreQueryBuilder::CIRCLE); -// $qb->setOptions( -// [CoreRequestBuilder::CIRCLE, CoreRequestBuilder::INITIATOR], [ -// 'mustBeMember' => false, -// 'viewableAsVisitor' => true -// ] -// ); + // $qb->setOptions( + // [CoreRequestBuilder::CIRCLE, CoreRequestBuilder::INITIATOR], [ + // 'mustBeMember' => false, + // 'viewableAsVisitor' => true + // ] + // ); if (!is_null($initiator)) { $qb->limitToInitiator(CoreQueryBuilder::CIRCLE, $initiator); diff --git a/lib/Db/CircleRequestBuilder.php b/lib/Db/CircleRequestBuilder.php index e51294186..af5b80aa1 100644 --- a/lib/Db/CircleRequestBuilder.php +++ b/lib/Db/CircleRequestBuilder.php @@ -31,9 +31,9 @@ namespace OCA\Circles\Db; -use OCA\Circles\Tools\Exceptions\RowNotFoundException; use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\Circles\Model\Circle; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; /** * Class CircleRequestBuilder diff --git a/lib/Db/CoreQueryBuilder.php b/lib/Db/CoreQueryBuilder.php index 186677401..fa88b09a9 100644 --- a/lib/Db/CoreQueryBuilder.php +++ b/lib/Db/CoreQueryBuilder.php @@ -974,9 +974,9 @@ public function leftJoinInheritedMembers( $expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field) ); -// if (!$this->getBool('getData', $options, false)) { -// return; -// } + // if (!$this->getBool('getData', $options, false)) { + // return; + // } if ($aliasInheritedBy === '') { $aliasInheritedBy = $this->generateAlias($alias, self::INHERITED_BY); @@ -1331,8 +1331,8 @@ public function completeProbeWithInitiator( $this->exprLimitInt('level', Member::LEVEL_OWNER, $aliasInitiator) ) ); -// -// $this->leftJoinBasedOn($aliasInitiator); + // + // $this->leftJoinBasedOn($aliasInitiator); } /** @@ -1548,7 +1548,7 @@ public function leftJoinShareChild(string $aliasShare, string $aliasShareMembers [] ); -// $this->selectAlias($aliasShareParent . '.permissions', 'parent_perms'); + // $this->selectAlias($aliasShareParent . '.permissions', 'parent_perms'); } diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php index 2cc2ea9ab..ed2059f33 100644 --- a/lib/Db/CoreRequestBuilder.php +++ b/lib/Db/CoreRequestBuilder.php @@ -313,8 +313,8 @@ public function uninstallFromMigrations() { */ public function uninstallFromJobs() { $qb = $this->getQueryBuilder(); -// $qb->delete('jobs'); -// $qb->where($this->exprLimitToDBField($qb, 'class', 'OCA\Circles\', true, true)); -// $qb->execute(); + // $qb->delete('jobs'); + // $qb->where($this->exprLimitToDBField($qb, 'class', 'OCA\Circles\', true, true)); + // $qb->execute(); } } diff --git a/lib/Db/DeprecatedMembersRequest.php b/lib/Db/DeprecatedMembersRequest.php index 14caa8ff4..d9dddf7fa 100644 --- a/lib/Db/DeprecatedMembersRequest.php +++ b/lib/Db/DeprecatedMembersRequest.php @@ -27,13 +27,13 @@ namespace OCA\Circles\Db; -use OCA\Circles\Tools\Traits\TStringTools; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use Exception; use OCA\Circles\Exceptions\GSStatusException; use OCA\Circles\Exceptions\MemberAlreadyExistsException; use OCA\Circles\Exceptions\MemberDoesNotExistException; use OCA\Circles\Model\DeprecatedMember; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\IGroup; class DeprecatedMembersRequest extends DeprecatedMembersRequestBuilder { @@ -136,9 +136,9 @@ public function forceGetMembers( $cursor->closeCursor(); try { -// if ($this->configService->isLinkedGroupsAllowed() && $incGroup === true) { -// $this->includeGroupMembers($members, $circleUniqueId, $level); -// } + // if ($this->configService->isLinkedGroupsAllowed() && $incGroup === true) { + // $this->includeGroupMembers($members, $circleUniqueId, $level); + // } } catch (GSStatusException $e) { } @@ -348,14 +348,14 @@ public function getFreshNewMember($circleUniqueId, string $name, int $type, stri } catch (MemberDoesNotExistException $e) { $member = new DeprecatedMember($name, $type, $circleUniqueId); $member->setInstance($instance); -// $member->setMemberId($this->token(14)); + // $member->setMemberId($this->token(14)); } -// if ($member->alreadyExistOrJoining()) { -// throw new MemberAlreadyExistsException( -// $this->l10n->t('This account is already a member of the circle') -// ); -// } + // if ($member->alreadyExistOrJoining()) { + // throw new MemberAlreadyExistsException( + // $this->l10n->t('This account is already a member of the circle') + // ); + // } return $member; } diff --git a/lib/Db/DeprecatedRequestBuilder.php b/lib/Db/DeprecatedRequestBuilder.php index c5b12f527..1dbfc28c8 100644 --- a/lib/Db/DeprecatedRequestBuilder.php +++ b/lib/Db/DeprecatedRequestBuilder.php @@ -256,26 +256,26 @@ protected function limitToMountpointHash(IQueryBuilder $qb, string $hash) { $this->limitToDBField($qb, 'share_id', $hash); } -// -// /** -// * Limit the request to the Circle by its Shorten Unique Id. -// * -// * @param IQueryBuilder $qb -// * @param string $circleUniqueId -// * @param $length -// */ -// protected function limitToShortenUniqueId(IQueryBuilder $qb, $circleUniqueId, $length) { -// $expr = $qb->expr(); -// $pf = ($qb->getType() === QueryBuilder::SELECT) ? '`' . $this->default_select_alias . '`.' : ''; -// -// $qb->andWhere( -// $expr->eq( -// $qb->createNamedParameter($circleUniqueId), -// $qb->createFunction('SUBSTR(' . $pf . '`unique_id`' . ', 1, ' . $length . ')') -// ) -// ); -// -// } + // + // /** + // * Limit the request to the Circle by its Shorten Unique Id. + // * + // * @param IQueryBuilder $qb + // * @param string $circleUniqueId + // * @param $length + // */ + // protected function limitToShortenUniqueId(IQueryBuilder $qb, $circleUniqueId, $length) { + // $expr = $qb->expr(); + // $pf = ($qb->getType() === QueryBuilder::SELECT) ? '`' . $this->default_select_alias . '`.' : ''; + // + // $qb->andWhere( + // $expr->eq( + // $qb->createNamedParameter($circleUniqueId), + // $qb->createFunction('SUBSTR(' . $pf . '`unique_id`' . ', 1, ' . $length . ')') + // ) + // ); + // + // } /** diff --git a/lib/Db/EventWrapperRequestBuilder.php b/lib/Db/EventWrapperRequestBuilder.php index 3299d5d56..9b73ab2ef 100644 --- a/lib/Db/EventWrapperRequestBuilder.php +++ b/lib/Db/EventWrapperRequestBuilder.php @@ -31,9 +31,9 @@ namespace OCA\Circles\Db; -use OCA\Circles\Tools\Exceptions\RowNotFoundException; use OCA\Circles\Exceptions\EventWrapperNotFoundException; use OCA\Circles\Model\Federated\EventWrapper; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; /** * Class GSEventsRequestBuilder diff --git a/lib/Db/GSSharesRequest.php b/lib/Db/GSSharesRequest.php index 9fa9944f7..2d1027217 100644 --- a/lib/Db/GSSharesRequest.php +++ b/lib/Db/GSSharesRequest.php @@ -27,10 +27,10 @@ namespace OCA\Circles\Db; -use OCA\Circles\Tools\Traits\TStringTools; +use OCA\Circles\Model\DeprecatedMember; use OCA\Circles\Model\GlobalScale\GSShare; use OCA\Circles\Model\GlobalScale\GSShareMountpoint; -use OCA\Circles\Model\DeprecatedMember; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\Share\Exceptions\ShareNotFound; diff --git a/lib/Db/MemberRequest.php b/lib/Db/MemberRequest.php index f51a17c87..38344694b 100644 --- a/lib/Db/MemberRequest.php +++ b/lib/Db/MemberRequest.php @@ -415,14 +415,14 @@ public function getAlternateSingleId(IFederatedUser $federatedUser): array { $qb->limitToSingleId($federatedUser->getSingleId()); $qb->leftJoinRemoteInstance(CoreQueryBuilder::MEMBER); -// $expr = $qb->expr(); -// $orX = $expr->orX( -// $qb->exprFilter('user_id', $federatedUser->getUserId()), -// $qb->exprFilterInt('user_type', $federatedUser->getUserType()), -// $qb->exprFilter('instance', $qb->getInstance($federatedUser), '', false) -// ); -// -// $qb->andWhere($orX); + // $expr = $qb->expr(); + // $orX = $expr->orX( + // $qb->exprFilter('user_id', $federatedUser->getUserId()), + // $qb->exprFilterInt('user_type', $federatedUser->getUserType()), + // $qb->exprFilter('instance', $qb->getInstance($federatedUser), '', false) + // ); + // + // $qb->andWhere($orX); return $this->getItemsFromRequest($qb); } diff --git a/lib/Db/MembershipRequestBuilder.php b/lib/Db/MembershipRequestBuilder.php index 353df5c4f..198740cb3 100644 --- a/lib/Db/MembershipRequestBuilder.php +++ b/lib/Db/MembershipRequestBuilder.php @@ -31,9 +31,9 @@ namespace OCA\Circles\Db; -use OCA\Circles\Tools\Exceptions\RowNotFoundException; use OCA\Circles\Exceptions\MembershipNotFoundException; use OCA\Circles\Model\Membership; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; /** * Class MembershipRequestBuilder diff --git a/lib/Db/MountRequest.php b/lib/Db/MountRequest.php index af1ee0cc9..35ade52ae 100644 --- a/lib/Db/MountRequest.php +++ b/lib/Db/MountRequest.php @@ -31,10 +31,10 @@ namespace OCA\Circles\Db; -use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\Exceptions\RequestBuilderException; use OCA\Circles\IFederatedUser; use OCA\Circles\Model\Mount; +use OCA\Circles\Tools\Traits\TStringTools; /** * Class MountRequest @@ -88,198 +88,198 @@ public function getForUser(IFederatedUser $federatedUser): array { return $this->getItemsFromRequest($qb); -// FederatedUser $federatedUser, -// int $nodeId, -// int $offset, -// int $limit, -// bool $getData = false -// ): array { -// $qb = $this->getShareSelectSql(); -// $qb->setOptions([CoreRequestBuilder::SHARE], ['getData' => $getData]); -// if ($getData) { -// $qb->leftJoinCircle(CoreRequestBuilder::SHARE, null, 'share_with'); -// } -// -// $qb->limitToInitiator(CoreRequestBuilder::SHARE, $federatedUser, 'share_with'); -// -// $qb->leftJoinFileCache(CoreRequestBuilder::SHARE); -// $qb->limitToDBFieldEmpty('parent', true); -// $qb->leftJoinShareChild(CoreRequestBuilder::SHARE); -// -// if ($nodeId > 0) { -// $qb->limitToFileSource($nodeId); -// } -// -// $qb->chunk($offset, $limit); -// -// return $this->getItemsFromRequest($qb); + // FederatedUser $federatedUser, + // int $nodeId, + // int $offset, + // int $limit, + // bool $getData = false + // ): array { + // $qb = $this->getShareSelectSql(); + // $qb->setOptions([CoreRequestBuilder::SHARE], ['getData' => $getData]); + // if ($getData) { + // $qb->leftJoinCircle(CoreRequestBuilder::SHARE, null, 'share_with'); + // } + // + // $qb->limitToInitiator(CoreRequestBuilder::SHARE, $federatedUser, 'share_with'); + // + // $qb->leftJoinFileCache(CoreRequestBuilder::SHARE); + // $qb->limitToDBFieldEmpty('parent', true); + // $qb->leftJoinShareChild(CoreRequestBuilder::SHARE); + // + // if ($nodeId > 0) { + // $qb->limitToFileSource($nodeId); + // } + // + // $qb->chunk($offset, $limit); + // + // return $this->getItemsFromRequest($qb); -// $this->joinMembership($qb, $userId); -// $this->leftJoinMountPoint($qb, $userId); + // $this->joinMembership($qb, $userId); + // $this->leftJoinMountPoint($qb, $userId); -// $shares = []; -// $cursor = $qb->execute(); -// while ($data = $cursor->fetch()) { -// $shares[] = $this->parseGSSharesSelectSql($data); -// } -// $cursor->closeCursor(); -// -// return $shares; + // $shares = []; + // $cursor = $qb->execute(); + // while ($data = $cursor->fetch()) { + // $shares[] = $this->parseGSSharesSelectSql($data); + // } + // $cursor->closeCursor(); + // + // return $shares; } -// /** -// * @param string $userId -// * -// * @return Mount[] -// */ -// public function getForUser(string $userId): array { -// $qb = $this->getMountSelectSql(); -// -// $this-> -// $this->joinMembership($qb, $userId); -// $this->leftJoinMountPoint($qb, $userId); -// -// $shares = []; -// $cursor = $qb->execute(); -// while ($data = $cursor->fetch()) { -// $shares[] = $this->parseGSSharesSelectSql($data); -// } -// $cursor->closeCursor(); -// -// return $shares; -// } + // /** + // * @param string $userId + // * + // * @return Mount[] + // */ + // public function getForUser(string $userId): array { + // $qb = $this->getMountSelectSql(); + // + // $this-> + // $this->joinMembership($qb, $userId); + // $this->leftJoinMountPoint($qb, $userId); + // + // $shares = []; + // $cursor = $qb->execute(); + // while ($data = $cursor->fetch()) { + // $shares[] = $this->parseGSSharesSelectSql($data); + // } + // $cursor->closeCursor(); + // + // return $shares; + // } -// -// /** -// * @param DeprecatedMember $member -// */ -// public function removeGSSharesFromMember(DeprecatedMember $member) { -// $qb = $this->getMountDeleteSql(); -// $this->limitToCircleId($qb, $member->getCircleId()); -// $this->limitToInstance($qb, $member->getInstance()); -// $this->limitToOwner($qb, $member->getUserId()); -// -// $qb->execute(); -// } -// -// -// /** -// * @param IQueryBuilder $qb -// * @param string $userId -// */ -// private function joinMembership(IQueryBuilder $qb, string $userId) { -// $qb->from(DeprecatedRequestBuilder::TABLE_MEMBERS, 'm'); -// -// $expr = $qb->expr(); -// $andX = $expr->andX(); -// -// $andX->add($expr->eq('m.user_id', $qb->createNamedParameter($userId))); -// $andX->add($expr->eq('m.instance', $qb->createNamedParameter(''))); -// $andX->add($expr->gt('m.level', $qb->createNamedParameter(0))); -// $andX->add($expr->eq('m.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_USER))); -// $andX->add($expr->eq('m.circle_id', 'gsh.circle_id')); -// -// $qb->andWhere($andX); -// } -// -// -// private function leftJoinMountPoint(IQueryBuilder $qb, string $userId) { -// $expr = $qb->expr(); -// $pf = '' . $this->default_select_alias . '.'; -// -// $on = $expr->andX(); -// $on->add($expr->eq('mp.user_id', $qb->createNamedParameter($userId))); -// $on->add($expr->eq('mp.share_id', $pf . 'id')); -// -// /** @noinspection PhpMethodParametersCountMismatchInspection */ -// $qb->selectAlias('mp.mountPoint', 'gsshares_mountpoint') -// ->leftJoin($this->default_select_alias, DeprecatedRequestBuilder::TABLE_GSSHARES_MOUNTPOINT, 'mp', $on); -// } -// -// -// /** -// * @param string $userId -// * @param string $target -// * -// * @return GSShareMountpoint -// * @throws ShareNotFound -// */ -// public function getShareMountPointByPath(string $userId, string $target): GSShareMountpoint { -// $qb = $this->getMountMountpointSelectSql(); -// -// $targetHash = md5($target); -// $this->limitToUserId($qb, $userId); -// $this->limitToMountpointHash($qb, $targetHash); -// -// $shares = []; -// $cursor = $qb->execute(); -// $data = $cursor->fetch(); -// -// if ($data === false) { -// throw new ShareNotFound(); -// } -// -// return $this->parseGSSharesMountpointSelectSql($data); -// } -// -// -// /** -// * @param int $gsShareId -// * @param string $userId -// * -// * @return GSShareMountpoint -// * @throws ShareNotFound -// */ -// public function getShareMountPointById(int $gsShareId, string $userId): GSShareMountpoint { -// $qb = $this->getMountMountpointSelectSql(); -// -// $this->limitToShareId($qb, $gsShareId); -// $this->limitToUserId($qb, $userId); -// -// $shares = []; -// $cursor = $qb->execute(); -// $data = $cursor->fetch(); -// if ($data === false) { -// throw new ShareNotFound(); -// } -// -// return $this->parseGSSharesMountpointSelectSql($data); -// } -// -// -// /** -// * @param GSShareMountpoint $mountpoint -// */ -// public function generateShareMountPoint(GSShareMountpoint $mountpoint) { -// $qb = $this->getMountMountpointInsertSql(); -// -// $hash = ($mountpoint->getMountPoint() === '-') ? '' : md5($mountpoint->getMountPoint()); -// -// $qb->setValue('user_id', $qb->createNamedParameter($mountpoint->getUserId())) -// ->setValue('share_id', $qb->createNamedParameter($mountpoint->getShareId())) -// ->setValue('mountpoint', $qb->createNamedParameter($mountpoint->getMountPoint())) -// ->setValue('mountpoint_hash', $qb->createNamedParameter($hash)); -// $qb->execute(); -// } -// -// -// /** -// * @param GSShareMountpoint $mountpoint -// * -// * @return bool -// */ -// public function updateShareMountPoint(GSShareMountpoint $mountpoint) { -// $qb = $this->getMountMountpointUpdateSql(); -// -// $hash = ($mountpoint->getMountPoint() === '-') ? '' : md5($mountpoint->getMountPoint()); -// -// $qb->set('mountpoint', $qb->createNamedParameter($mountpoint->getMountPoint())) -// ->set('mountpoint_hash', $qb->createNamedParameter($hash)); -// -// $this->limitToShareId($qb, $mountpoint->getShareId()); -// $this->limitToUserId($qb, $mountpoint->getUserId()); -// $nb = $qb->execute(); -// -// return ($nb === 1); -// } -// + // + // /** + // * @param DeprecatedMember $member + // */ + // public function removeGSSharesFromMember(DeprecatedMember $member) { + // $qb = $this->getMountDeleteSql(); + // $this->limitToCircleId($qb, $member->getCircleId()); + // $this->limitToInstance($qb, $member->getInstance()); + // $this->limitToOwner($qb, $member->getUserId()); + // + // $qb->execute(); + // } + // + // + // /** + // * @param IQueryBuilder $qb + // * @param string $userId + // */ + // private function joinMembership(IQueryBuilder $qb, string $userId) { + // $qb->from(DeprecatedRequestBuilder::TABLE_MEMBERS, 'm'); + // + // $expr = $qb->expr(); + // $andX = $expr->andX(); + // + // $andX->add($expr->eq('m.user_id', $qb->createNamedParameter($userId))); + // $andX->add($expr->eq('m.instance', $qb->createNamedParameter(''))); + // $andX->add($expr->gt('m.level', $qb->createNamedParameter(0))); + // $andX->add($expr->eq('m.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_USER))); + // $andX->add($expr->eq('m.circle_id', 'gsh.circle_id')); + // + // $qb->andWhere($andX); + // } + // + // + // private function leftJoinMountPoint(IQueryBuilder $qb, string $userId) { + // $expr = $qb->expr(); + // $pf = '' . $this->default_select_alias . '.'; + // + // $on = $expr->andX(); + // $on->add($expr->eq('mp.user_id', $qb->createNamedParameter($userId))); + // $on->add($expr->eq('mp.share_id', $pf . 'id')); + // + // /** @noinspection PhpMethodParametersCountMismatchInspection */ + // $qb->selectAlias('mp.mountPoint', 'gsshares_mountpoint') + // ->leftJoin($this->default_select_alias, DeprecatedRequestBuilder::TABLE_GSSHARES_MOUNTPOINT, 'mp', $on); + // } + // + // + // /** + // * @param string $userId + // * @param string $target + // * + // * @return GSShareMountpoint + // * @throws ShareNotFound + // */ + // public function getShareMountPointByPath(string $userId, string $target): GSShareMountpoint { + // $qb = $this->getMountMountpointSelectSql(); + // + // $targetHash = md5($target); + // $this->limitToUserId($qb, $userId); + // $this->limitToMountpointHash($qb, $targetHash); + // + // $shares = []; + // $cursor = $qb->execute(); + // $data = $cursor->fetch(); + // + // if ($data === false) { + // throw new ShareNotFound(); + // } + // + // return $this->parseGSSharesMountpointSelectSql($data); + // } + // + // + // /** + // * @param int $gsShareId + // * @param string $userId + // * + // * @return GSShareMountpoint + // * @throws ShareNotFound + // */ + // public function getShareMountPointById(int $gsShareId, string $userId): GSShareMountpoint { + // $qb = $this->getMountMountpointSelectSql(); + // + // $this->limitToShareId($qb, $gsShareId); + // $this->limitToUserId($qb, $userId); + // + // $shares = []; + // $cursor = $qb->execute(); + // $data = $cursor->fetch(); + // if ($data === false) { + // throw new ShareNotFound(); + // } + // + // return $this->parseGSSharesMountpointSelectSql($data); + // } + // + // + // /** + // * @param GSShareMountpoint $mountpoint + // */ + // public function generateShareMountPoint(GSShareMountpoint $mountpoint) { + // $qb = $this->getMountMountpointInsertSql(); + // + // $hash = ($mountpoint->getMountPoint() === '-') ? '' : md5($mountpoint->getMountPoint()); + // + // $qb->setValue('user_id', $qb->createNamedParameter($mountpoint->getUserId())) + // ->setValue('share_id', $qb->createNamedParameter($mountpoint->getShareId())) + // ->setValue('mountpoint', $qb->createNamedParameter($mountpoint->getMountPoint())) + // ->setValue('mountpoint_hash', $qb->createNamedParameter($hash)); + // $qb->execute(); + // } + // + // + // /** + // * @param GSShareMountpoint $mountpoint + // * + // * @return bool + // */ + // public function updateShareMountPoint(GSShareMountpoint $mountpoint) { + // $qb = $this->getMountMountpointUpdateSql(); + // + // $hash = ($mountpoint->getMountPoint() === '-') ? '' : md5($mountpoint->getMountPoint()); + // + // $qb->set('mountpoint', $qb->createNamedParameter($mountpoint->getMountPoint())) + // ->set('mountpoint_hash', $qb->createNamedParameter($hash)); + // + // $this->limitToShareId($qb, $mountpoint->getShareId()); + // $this->limitToUserId($qb, $mountpoint->getUserId()); + // $nb = $qb->execute(); + // + // return ($nb === 1); + // } + // } diff --git a/lib/Db/MountRequestBuilder.php b/lib/Db/MountRequestBuilder.php index 4bcbaf073..c32f308fa 100644 --- a/lib/Db/MountRequestBuilder.php +++ b/lib/Db/MountRequestBuilder.php @@ -31,9 +31,9 @@ namespace OCA\Circles\Db; -use OCA\Circles\Tools\Exceptions\RowNotFoundException; use OCA\Circles\Exceptions\MountNotFoundException; use OCA\Circles\Model\Mount; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; /** * Class MountRequestBuilder diff --git a/lib/Db/RemoteRequestBuilder.php b/lib/Db/RemoteRequestBuilder.php index 74bc64f45..bd5741d3b 100644 --- a/lib/Db/RemoteRequestBuilder.php +++ b/lib/Db/RemoteRequestBuilder.php @@ -31,9 +31,9 @@ namespace OCA\Circles\Db; -use OCA\Circles\Tools\Exceptions\RowNotFoundException; use OCA\Circles\Exceptions\RemoteNotFoundException; use OCA\Circles\Model\Federated\RemoteInstance; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; /** * Class RemoteRequestBuilder diff --git a/lib/Db/ShareLockRequestBuilder.php b/lib/Db/ShareLockRequestBuilder.php index aca954c03..e5ca5fc65 100644 --- a/lib/Db/ShareLockRequestBuilder.php +++ b/lib/Db/ShareLockRequestBuilder.php @@ -31,9 +31,9 @@ namespace OCA\Circles\Db; -use OCA\Circles\Tools\Exceptions\RowNotFoundException; use OCA\Circles\Exceptions\FederatedShareNotFoundException; use OCA\Circles\Model\Federated\FederatedShare; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; /** * Class ShareRequestBuilder diff --git a/lib/Db/ShareTokenRequestBuilder.php b/lib/Db/ShareTokenRequestBuilder.php index 93dfef228..858f599cd 100644 --- a/lib/Db/ShareTokenRequestBuilder.php +++ b/lib/Db/ShareTokenRequestBuilder.php @@ -31,9 +31,9 @@ namespace OCA\Circles\Db; -use OCA\Circles\Tools\Exceptions\RowNotFoundException; use OCA\Circles\Exceptions\ShareTokenNotFoundException; use OCA\Circles\Model\ShareToken; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; /** * Class ShareTokenRequestBuilder diff --git a/lib/Db/ShareWrapperRequest.php b/lib/Db/ShareWrapperRequest.php index 8f84f3b55..a17c7870b 100644 --- a/lib/Db/ShareWrapperRequest.php +++ b/lib/Db/ShareWrapperRequest.php @@ -59,8 +59,8 @@ class ShareWrapperRequest extends ShareWrapperRequestBuilder { * @throws NotFoundException */ public function save(IShare $share, int $parentId = 0): int { -// $hasher = \OC::$server->getHasher(); -// $password = ($share->getPassword() !== null) ? $hasher->hash($share->getPassword()) : ''; + // $hasher = \OC::$server->getHasher(); + // $password = ($share->getPassword() !== null) ? $hasher->hash($share->getPassword()) : ''; $password = ''; $qb = $this->getShareInsertSql(); @@ -164,9 +164,9 @@ public function getSharesToCircle( $qb->generateAlias(CoreQueryBuilder::SHARE, CoreQueryBuilder::UPSTREAM_MEMBERSHIPS); $qb->limitToInheritedMemberships(CoreQueryBuilder::SHARE, $circleId, 'share_with'); -// if (!is_null($shareRecipient)) { -// $qb->limitToInitiator(CoreRequestBuilder::SHARE, $shareRecipient, 'share_with'); -// } + // if (!is_null($shareRecipient)) { + // $qb->limitToInitiator(CoreRequestBuilder::SHARE, $shareRecipient, 'share_with'); + // } // TODO: add shareInitiator and shareRecipient to filter the request if (!is_null($shareRecipient) || $completeDetails) { @@ -263,7 +263,7 @@ public function getSharesByFileId(int $fileId, bool $getData = false): array { if ($getData) { $qb->setOptions([CoreQueryBuilder::SHARE], ['getData' => $getData]); $qb->leftJoinCircle(CoreQueryBuilder::SHARE, null, 'share_with'); -// $qb->leftJoinFileCache(CoreRequestBuilder::SHARE); + // $qb->leftJoinFileCache(CoreRequestBuilder::SHARE); $qb->limitNull('parent', false); $aliasMembership = $qb->generateAlias(CoreQueryBuilder::SHARE, CoreQueryBuilder::MEMBERSHIPS); diff --git a/lib/Db/ShareWrapperRequestBuilder.php b/lib/Db/ShareWrapperRequestBuilder.php index df16a7624..4e09072db 100644 --- a/lib/Db/ShareWrapperRequestBuilder.php +++ b/lib/Db/ShareWrapperRequestBuilder.php @@ -31,10 +31,10 @@ namespace OCA\Circles\Db; -use OCA\Circles\Tools\Exceptions\RowNotFoundException; -use OCP\Share\IShare; use OCA\Circles\Exceptions\ShareWrapperNotFoundException; use OCA\Circles\Model\ShareWrapper; +use OCA\Circles\Tools\Exceptions\RowNotFoundException; +use OCP\Share\IShare; /** * Class ShareWrapperRequestBuilder diff --git a/lib/Events/CircleResultGenericEvent.php b/lib/Events/CircleResultGenericEvent.php index c3c337ae6..f73b5b93b 100644 --- a/lib/Events/CircleResultGenericEvent.php +++ b/lib/Events/CircleResultGenericEvent.php @@ -31,10 +31,10 @@ namespace OCA\Circles\Events; -use OCA\Circles\Tools\Model\SimpleDataStore; use OCA\Circles\Model\Circle; use OCA\Circles\Model\Federated\FederatedEvent; use OCA\Circles\Model\Member; +use OCA\Circles\Tools\Model\SimpleDataStore; use OCP\EventDispatcher\Event; /** diff --git a/lib/Events/Files/FileShareCreatedEvent.php b/lib/Events/Files/FileShareCreatedEvent.php index 47394086b..ef4c3f77b 100644 --- a/lib/Events/Files/FileShareCreatedEvent.php +++ b/lib/Events/Files/FileShareCreatedEvent.php @@ -31,9 +31,9 @@ namespace OCA\Circles\Events\Files; -use OCA\Circles\Tools\Model\SimpleDataStore; use OCA\Circles\Events\CircleResultGenericEvent; use OCA\Circles\Model\Federated\FederatedEvent; +use OCA\Circles\Tools\Model\SimpleDataStore; /** * Class CreatingFileShareEvent diff --git a/lib/FederatedItems/CircleCreate.php b/lib/FederatedItems/CircleCreate.php index 38f725f14..3627e67e9 100644 --- a/lib/FederatedItems/CircleCreate.php +++ b/lib/FederatedItems/CircleCreate.php @@ -31,7 +31,6 @@ namespace OCA\Circles\FederatedItems; -use OCA\Circles\Tools\Traits\TDeserialize; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Exceptions\CircleNotFoundException; @@ -47,6 +46,7 @@ use OCA\Circles\Service\CircleService; use OCA\Circles\Service\EventService; use OCA\Circles\Service\MembershipService; +use OCA\Circles\Tools\Traits\TDeserialize; /** * Class CircleCreate diff --git a/lib/FederatedItems/CircleEdit.php b/lib/FederatedItems/CircleEdit.php index cd45d969b..d787b428a 100644 --- a/lib/FederatedItems/CircleEdit.php +++ b/lib/FederatedItems/CircleEdit.php @@ -31,7 +31,6 @@ namespace OCA\Circles\FederatedItems; -use OCA\Circles\Tools\Traits\TDeserialize; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Exceptions\CircleNameTooShortException; @@ -41,6 +40,7 @@ use OCA\Circles\Model\Helpers\MemberHelper; use OCA\Circles\Service\CircleService; use OCA\Circles\Service\EventService; +use OCA\Circles\Tools\Traits\TDeserialize; /** * Class CircleEdit diff --git a/lib/FederatedItems/CircleJoin.php b/lib/FederatedItems/CircleJoin.php index 3b7abd46f..326ca9f5a 100644 --- a/lib/FederatedItems/CircleJoin.php +++ b/lib/FederatedItems/CircleJoin.php @@ -31,9 +31,6 @@ namespace OCA\Circles\FederatedItems; -use OCA\Circles\Tools\Traits\TDeserialize; -use OCA\Circles\Tools\Traits\TNCLogger; -use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Exceptions\FederatedItemBadRequestException; @@ -62,6 +59,9 @@ use OCA\Circles\Service\MemberService; use OCA\Circles\Service\MembershipService; use OCA\Circles\StatusCode; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\IUserManager; /** @@ -165,72 +165,72 @@ public function verify(FederatedEvent $event): void { return; -// -// -// $federatedId = $member->getUserId() . '@' . $member->getInstance(); -// try { -// $federatedUser = -// $this->federatedUserService->getFederatedUser($federatedId, $member->getUserType()); -// throw new MemberNotFoundException( -// ucfirst(Member::$DEF_TYPE[$member->getUserType()]) . ' \'%s\' not found', -// ['member' => $member->getUserId() . '@' . $member->getInstance()] -// ); -// } - -// $member->importFromIFederatedUser($federatedUser); -// -// try { -// $knownMember = $this->memberRequest->searchMember($member); -// // TODO: maybe member is requesting access -// throw new MemberAlreadyExistsException( -// ucfirst(Member::$DEF_TYPE[$member->getUserType()]) . ' %s is already a member', -// ['member' => $member->getUserId() . '@' . $member->getInstance()] -// ); -// } catch (MemberNotFoundException $e) { -// } - -// $member->setId($this->uuid(ManagedModel::ID_LENGTH)); -// -// // TODO: check Config on Circle to know if we set Level to 1 or just send an invitation -// $member->setLevel(Member::LEVEL_MEMBER); -// $member->setStatus(Member::STATUS_MEMBER); -// $event->setDataOutcome(['member' => $member]); -// -// // TODO: Managing cached name -// // $member->setCachedName($eventMember->getCachedName()); -// $this->circleService->confirmCircleNotFull($circle); -// -// // TODO: check if it is a member or a mail or a circle and fix the returned message -// -// return; - - -// $member = $this->membersRequest->getFreshNewMember( -// $circle->getUniqueId(), $ident, $eventMember->getType(), $eventMember->getInstance() -// ); -// $member->hasToBeInviteAble() -// -// $this->membersService->addMemberBasedOnItsType($circle, $member); -// -// $password = ''; -// $sendPasswordByMail = false; -// if ($this->configService->enforcePasswordProtection($circle)) { -// if ($circle->getSetting('password_single_enabled') === 'true') { -// $password = $circle->getPasswordSingle(); -// } else { -// $sendPasswordByMail = true; -// $password = $this->miscService->token(15); -// } -// } -// -// $event->setData( -// new SimpleDataStore( -// [ -// 'password' => $password, -// 'passwordByMail' => $sendPasswordByMail -// ] -// ) -// ); + // + // + // $federatedId = $member->getUserId() . '@' . $member->getInstance(); + // try { + // $federatedUser = + // $this->federatedUserService->getFederatedUser($federatedId, $member->getUserType()); + // throw new MemberNotFoundException( + // ucfirst(Member::$DEF_TYPE[$member->getUserType()]) . ' \'%s\' not found', + // ['member' => $member->getUserId() . '@' . $member->getInstance()] + // ); + // } + + // $member->importFromIFederatedUser($federatedUser); + // + // try { + // $knownMember = $this->memberRequest->searchMember($member); + // // TODO: maybe member is requesting access + // throw new MemberAlreadyExistsException( + // ucfirst(Member::$DEF_TYPE[$member->getUserType()]) . ' %s is already a member', + // ['member' => $member->getUserId() . '@' . $member->getInstance()] + // ); + // } catch (MemberNotFoundException $e) { + // } + + // $member->setId($this->uuid(ManagedModel::ID_LENGTH)); + // + // // TODO: check Config on Circle to know if we set Level to 1 or just send an invitation + // $member->setLevel(Member::LEVEL_MEMBER); + // $member->setStatus(Member::STATUS_MEMBER); + // $event->setDataOutcome(['member' => $member]); + // + // // TODO: Managing cached name + // // $member->setCachedName($eventMember->getCachedName()); + // $this->circleService->confirmCircleNotFull($circle); + // + // // TODO: check if it is a member or a mail or a circle and fix the returned message + // + // return; + + + // $member = $this->membersRequest->getFreshNewMember( + // $circle->getUniqueId(), $ident, $eventMember->getType(), $eventMember->getInstance() + // ); + // $member->hasToBeInviteAble() + // + // $this->membersService->addMemberBasedOnItsType($circle, $member); + // + // $password = ''; + // $sendPasswordByMail = false; + // if ($this->configService->enforcePasswordProtection($circle)) { + // if ($circle->getSetting('password_single_enabled') === 'true') { + // $password = $circle->getPasswordSingle(); + // } else { + // $sendPasswordByMail = true; + // $password = $this->miscService->token(15); + // } + // } + // + // $event->setData( + // new SimpleDataStore( + // [ + // 'password' => $password, + // 'passwordByMail' => $sendPasswordByMail + // ] + // ) + // ); } diff --git a/lib/FederatedItems/CircleLeave.php b/lib/FederatedItems/CircleLeave.php index 0cd94476f..02be35a5c 100644 --- a/lib/FederatedItems/CircleLeave.php +++ b/lib/FederatedItems/CircleLeave.php @@ -31,8 +31,6 @@ namespace OCA\Circles\FederatedItems; -use OCA\Circles\Tools\Traits\TDeserialize; -use OCA\Circles\Tools\Traits\TNCLogger; use OCA\Circles\AppInfo\Application; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Db\MemberRequest; @@ -55,6 +53,8 @@ use OCA\Circles\Service\EventService; use OCA\Circles\Service\MembershipService; use OCA\Circles\StatusCode; +use OCA\Circles\Tools\Traits\TDeserialize; +use OCA\Circles\Tools\Traits\TNCLogger; /** * Class CircleLeave diff --git a/lib/FederatedItems/CircleSettings.php b/lib/FederatedItems/CircleSettings.php index 0521c23f5..d7d334996 100644 --- a/lib/FederatedItems/CircleSettings.php +++ b/lib/FederatedItems/CircleSettings.php @@ -31,10 +31,10 @@ namespace OCA\Circles\FederatedItems; -use OCA\Circles\Tools\Traits\TDeserialize; use OCA\Circles\Db\CircleRequest; use OCA\Circles\IFederatedItem; use OCA\Circles\Model\Federated\FederatedEvent; +use OCA\Circles\Tools\Traits\TDeserialize; /** * Class CircleSettings diff --git a/lib/FederatedItems/Files/FileShare.php b/lib/FederatedItems/Files/FileShare.php index a498b8a71..4603e49a9 100644 --- a/lib/FederatedItems/Files/FileShare.php +++ b/lib/FederatedItems/Files/FileShare.php @@ -31,10 +31,6 @@ namespace OCA\Circles\FederatedItems\Files; -use OCA\Circles\Tools\Exceptions\InvalidItemException; -use OCA\Circles\Tools\Exceptions\UnknownTypeException; -use OCA\Circles\Tools\Traits\TNCLogger; -use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\Db\MountRequest; use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\Circles\IFederatedItem; @@ -46,6 +42,10 @@ use OCA\Circles\Model\ShareWrapper; use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\EventService; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Exceptions\UnknownTypeException; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; /** * Class FileShare diff --git a/lib/FederatedItems/Files/FileUnshare.php b/lib/FederatedItems/Files/FileUnshare.php index b98a6dc1e..9d03fe36b 100644 --- a/lib/FederatedItems/Files/FileUnshare.php +++ b/lib/FederatedItems/Files/FileUnshare.php @@ -31,11 +31,6 @@ namespace OCA\Circles\FederatedItems\Files; -use OCA\Circles\Tools\Exceptions\InvalidItemException; -use OCA\Circles\Tools\Exceptions\ItemNotFoundException; -use OCA\Circles\Tools\Exceptions\UnknownTypeException; -use OCA\Circles\Tools\Traits\TNCLogger; -use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\Db\MountRequest; use OCA\Circles\IFederatedItem; use OCA\Circles\IFederatedItemAsyncProcess; @@ -45,6 +40,11 @@ use OCA\Circles\Model\ShareWrapper; use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\EventService; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Exceptions\ItemNotFoundException; +use OCA\Circles\Tools\Exceptions\UnknownTypeException; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; /** * Class FileUnshare diff --git a/lib/FederatedItems/ItemLock.php b/lib/FederatedItems/ItemLock.php index f3254a66d..d77b78941 100644 --- a/lib/FederatedItems/ItemLock.php +++ b/lib/FederatedItems/ItemLock.php @@ -31,7 +31,6 @@ namespace OCA\Circles\FederatedItems; -use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\Db\ShareLockRequest; use OCA\Circles\Exceptions\FederatedShareNotFoundException; use OCA\Circles\Exceptions\InvalidIdException; @@ -39,6 +38,7 @@ use OCA\Circles\IFederatedItemDataRequestOnly; use OCA\Circles\Model\Federated\FederatedEvent; use OCA\Circles\Model\Federated\FederatedShare; +use OCA\Circles\Tools\Traits\TStringTools; /** * Class ItemLock @@ -115,9 +115,9 @@ public function verify(FederatedEvent $event): void { * @param FederatedEvent $event */ public function manage(FederatedEvent $event): void { -// $this->circleEventService->onSharedItemsSyncRequested($event); -// -// $event->setResult(new SimpleDataStore(['shares' => 'ok'])); + // $this->circleEventService->onSharedItemsSyncRequested($event); + // + // $event->setResult(new SimpleDataStore(['shares' => 'ok'])); } diff --git a/lib/FederatedItems/LoopbackTest.php b/lib/FederatedItems/LoopbackTest.php index 8b1a692fa..0c05b4c16 100644 --- a/lib/FederatedItems/LoopbackTest.php +++ b/lib/FederatedItems/LoopbackTest.php @@ -31,11 +31,11 @@ namespace OCA\Circles\FederatedItems; -use OCA\Circles\Tools\Model\SimpleDataStore; use OCA\Circles\IFederatedItem; use OCA\Circles\IFederatedItemAsyncProcess; use OCA\Circles\IFederatedItemLoopbackTest; use OCA\Circles\Model\Federated\FederatedEvent; +use OCA\Circles\Tools\Model\SimpleDataStore; /** * Class LoopbackTest diff --git a/lib/FederatedItems/MassiveMemberAdd.php b/lib/FederatedItems/MassiveMemberAdd.php index f5be80246..cb765f3e5 100644 --- a/lib/FederatedItems/MassiveMemberAdd.php +++ b/lib/FederatedItems/MassiveMemberAdd.php @@ -31,8 +31,6 @@ namespace OCA\Circles\FederatedItems; -use OCA\Circles\Tools\Traits\TNCLogger; -use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OCA\Circles\IFederatedItem; use OCA\Circles\IFederatedItemAsyncProcess; @@ -42,6 +40,8 @@ use OCA\Circles\Model\Federated\FederatedEvent; use OCA\Circles\Model\Helpers\MemberHelper; use OCA\Circles\Model\Member; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; /** * Class MemberAdd diff --git a/lib/FederatedItems/MemberLevel.php b/lib/FederatedItems/MemberLevel.php index c1a368176..4b957def2 100644 --- a/lib/FederatedItems/MemberLevel.php +++ b/lib/FederatedItems/MemberLevel.php @@ -31,7 +31,6 @@ namespace OCA\Circles\FederatedItems; -use OCA\Circles\Tools\Traits\TDeserialize; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Exceptions\FederatedItemBadRequestException; use OCA\Circles\Exceptions\FederatedItemException; @@ -47,6 +46,7 @@ use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\EventService; use OCA\Circles\Service\MembershipService; +use OCA\Circles\Tools\Traits\TDeserialize; /** * Class MemberLevel diff --git a/lib/FederatedItems/SharedItemsSync.php b/lib/FederatedItems/SharedItemsSync.php index 186f99954..fd35c7389 100644 --- a/lib/FederatedItems/SharedItemsSync.php +++ b/lib/FederatedItems/SharedItemsSync.php @@ -31,11 +31,11 @@ namespace OCA\Circles\FederatedItems; -use OCA\Circles\Tools\Model\SimpleDataStore; use OCA\Circles\IFederatedItem; use OCA\Circles\IFederatedItemLimitedToInstanceWithMembership; use OCA\Circles\Model\Federated\FederatedEvent; use OCA\Circles\Service\CircleEventService; +use OCA\Circles\Tools\Model\SimpleDataStore; /** * Class SharesSync diff --git a/lib/GlobalScale/AGlobalScaleEvent.php b/lib/GlobalScale/AGlobalScaleEvent.php index 1651879e3..f04105f28 100644 --- a/lib/GlobalScale/AGlobalScaleEvent.php +++ b/lib/GlobalScale/AGlobalScaleEvent.php @@ -32,17 +32,17 @@ namespace OCA\Circles\GlobalScale; use OCA\Circles\Db\DeprecatedCirclesRequest; -use OCA\Circles\Db\GSSharesRequest; use OCA\Circles\Db\DeprecatedMembersRequest; use OCA\Circles\Db\FileSharesRequest; +use OCA\Circles\Db\GSSharesRequest; use OCA\Circles\Db\TokensRequest; use OCA\Circles\Exceptions\CircleDoesNotExistException; use OCA\Circles\Exceptions\ConfigNoCircleAvailableException; use OCA\Circles\Exceptions\GlobalScaleDSyncException; use OCA\Circles\Exceptions\GlobalScaleEventException; use OCA\Circles\Model\DeprecatedCircle; -use OCA\Circles\Model\GlobalScale\GSEvent; use OCA\Circles\Model\DeprecatedMember; +use OCA\Circles\Model\GlobalScale\GSEvent; use OCA\Circles\Service\CirclesService; use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\EventsService; diff --git a/lib/GlobalScale/CircleStatus.php b/lib/GlobalScale/CircleStatus.php index dae3f36a2..11a2c4528 100644 --- a/lib/GlobalScale/CircleStatus.php +++ b/lib/GlobalScale/CircleStatus.php @@ -32,8 +32,8 @@ namespace OCA\Circles\GlobalScale; use OCA\Circles\Exceptions\CircleDoesNotExistException; -use OCA\Circles\Model\GlobalScale\GSEvent; use OCA\Circles\Model\DeprecatedMember; +use OCA\Circles\Model\GlobalScale\GSEvent; /** * Class CircleStatus diff --git a/lib/GlobalScale/FileShare.php b/lib/GlobalScale/FileShare.php index 4a1a089c2..6388fe97c 100644 --- a/lib/GlobalScale/FileShare.php +++ b/lib/GlobalScale/FileShare.php @@ -31,8 +31,6 @@ namespace OCA\Circles\GlobalScale; -use OCA\Circles\Tools\Model\SimpleDataStore; -use OCA\Circles\Tools\Traits\TArrayTools; use Exception; use OC; use OC\Share20\Share; @@ -41,12 +39,14 @@ use OCA\Circles\Exceptions\GSStatusException; use OCA\Circles\Exceptions\TokenDoesNotExistException; use OCA\Circles\Model\DeprecatedCircle; +use OCA\Circles\Model\DeprecatedMember; use OCA\Circles\Model\GlobalScale\GSEvent; use OCA\Circles\Model\GlobalScale\GSShare; -use OCA\Circles\Model\DeprecatedMember; use OCA\Circles\Model\SharesToken; use OCA\Circles\Model\SharingFrame; use OCA\Circles\Service\MiscService; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TArrayTools; use OCP\Files\NotFoundException; use OCP\IUser; use OCP\Mail\IEMailTemplate; @@ -198,14 +198,14 @@ private function sendShareToContact(GSEvent $event, DeprecatedCircle $circle, st $newCircle = $this->circlesRequest->forceGetCircle($circle->getUniqueId(), true); $password = ''; $sendPasswordByMail = true; -// if ($this->configService->enforcePasswordProtection($newCircle)) { -// if ($newCircle->getSetting('password_single_enabled') === 'true') { -// $password = $newCircle->getPasswordSingle(); -// $sendPasswordByMail = false; -// } else { -// $password = $this->miscService->token(15); -// } -// } + // if ($this->configService->enforcePasswordProtection($newCircle)) { + // if ($newCircle->getSetting('password_single_enabled') === 'true') { + // $password = $newCircle->getPasswordSingle(); + // $sendPasswordByMail = false; + // } else { + // $password = $this->miscService->token(15); + // } + // } try { $sharesToken = @@ -310,9 +310,9 @@ protected function sendMail($fileName, $link, $author, $circleName, $email) { * @throws Exception */ protected function sendPasswordByMail(IShare $share, $circleName, $email, $password) { -// if (!$this->configService->sendPasswordByMail() || $password === '') { -// return; -// } + // if (!$this->configService->sendPasswordByMail() || $password === '') { + // return; + // } $message = $this->mailer->createMessage(); diff --git a/lib/GlobalScale/GSMount/Mount.php b/lib/GlobalScale/GSMount/Mount.php index 21eae9738..7a06dee26 100644 --- a/lib/GlobalScale/GSMount/Mount.php +++ b/lib/GlobalScale/GSMount/Mount.php @@ -31,10 +31,10 @@ namespace OCA\Circles\GlobalScale\GSMount; -use OCA\Circles\Tools\Traits\TArrayTools; use Exception; use OC\Files\Mount\MountPoint; use OC\Files\Mount\MoveableMount; +use OCA\Circles\Tools\Traits\TArrayTools; /** * Class Mount diff --git a/lib/GlobalScale/GSMount/MountProvider.php b/lib/GlobalScale/GSMount/MountProvider.php index 947737292..1d82d96dd 100644 --- a/lib/GlobalScale/GSMount/MountProvider.php +++ b/lib/GlobalScale/GSMount/MountProvider.php @@ -31,13 +31,13 @@ namespace OCA\Circles\GlobalScale\GSMount; -use OCA\Circles\Tools\Traits\TArrayTools; use Exception; use OC; use OCA\Circles\Db\GSSharesRequest; use OCA\Circles\Model\GlobalScale\GSShare; use OCA\Circles\Model\GlobalScale\GSShareMountpoint; use OCA\Circles\Service\ConfigService; +use OCA\Circles\Tools\Traits\TArrayTools; use OCP\Federation\ICloudIdManager; use OCP\Files\Config\IMountProvider; use OCP\Files\Mount\IMountPoint; diff --git a/lib/GlobalScale/MemberAdd.php b/lib/GlobalScale/MemberAdd.php index db0c47583..8141c8458 100644 --- a/lib/GlobalScale/MemberAdd.php +++ b/lib/GlobalScale/MemberAdd.php @@ -31,7 +31,6 @@ namespace OCA\Circles\GlobalScale; -use OCA\Circles\Tools\Model\SimpleDataStore; use Exception; use OC\User\NoUserException; use OCA\Circles\Exceptions\CircleDoesNotExistException; @@ -46,9 +45,10 @@ use OCA\Circles\Exceptions\MembersLimitException; use OCA\Circles\Exceptions\TokenDoesNotExistException; use OCA\Circles\Model\DeprecatedCircle; -use OCA\Circles\Model\GlobalScale\GSEvent; use OCA\Circles\Model\DeprecatedMember; +use OCA\Circles\Model\GlobalScale\GSEvent; use OCA\Circles\Model\SharesToken; +use OCA\Circles\Tools\Model\SimpleDataStore; use OCP\IUser; use OCP\Mail\IEMailTemplate; use OCP\Util; @@ -109,14 +109,14 @@ public function verify(GSEvent $event, bool $localCheck = false, bool $mustBeChe $password = ''; $sendPasswordByMail = false; -// if ($this->configService->enforcePasswordProtection($circle)) { -// if ($circle->getSetting('password_single_enabled') === 'true') { -// $password = $circle->getPasswordSingle(); -// } else { -// $sendPasswordByMail = true; -// $password = $this->miscService->token(15); -// } -// } + // if ($this->configService->enforcePasswordProtection($circle)) { + // if ($circle->getSetting('password_single_enabled') === 'true') { + // $password = $circle->getPasswordSingle(); + // } else { + // $sendPasswordByMail = true; + // $password = $this->miscService->token(15); + // } + // } $event->setData( new SimpleDataStore( diff --git a/lib/GlobalScale/MemberJoin.php b/lib/GlobalScale/MemberJoin.php index 7da4aa732..b4b378931 100644 --- a/lib/GlobalScale/MemberJoin.php +++ b/lib/GlobalScale/MemberJoin.php @@ -39,8 +39,8 @@ use OCA\Circles\Exceptions\MemberCantJoinCircleException; use OCA\Circles\Exceptions\MemberIsBlockedException; use OCA\Circles\Exceptions\MembersLimitException; -use OCA\Circles\Model\GlobalScale\GSEvent; use OCA\Circles\Model\DeprecatedMember; +use OCA\Circles\Model\GlobalScale\GSEvent; /** * Class MemberJoin diff --git a/lib/GlobalScale/Test.php b/lib/GlobalScale/Test.php index b31d76b79..8ece1670b 100644 --- a/lib/GlobalScale/Test.php +++ b/lib/GlobalScale/Test.php @@ -31,8 +31,8 @@ namespace OCA\Circles\GlobalScale; -use OCA\Circles\Tools\Model\SimpleDataStore; use OCA\Circles\Model\GlobalScale\GSEvent; +use OCA\Circles\Tools\Model\SimpleDataStore; /** * Class Test diff --git a/lib/GlobalScale/UserDeleted.php b/lib/GlobalScale/UserDeleted.php index b024d3714..cb01c88a1 100644 --- a/lib/GlobalScale/UserDeleted.php +++ b/lib/GlobalScale/UserDeleted.php @@ -37,8 +37,8 @@ use OCA\Circles\Exceptions\GlobalScaleEventException; use OCA\Circles\Exceptions\MemberDoesNotExistException; use OCA\Circles\Model\DeprecatedCircle; -use OCA\Circles\Model\GlobalScale\GSEvent; use OCA\Circles\Model\DeprecatedMember; +use OCA\Circles\Model\GlobalScale\GSEvent; /** * Class MemberDelete diff --git a/lib/Handlers/WebfingerHandler.php b/lib/Handlers/WebfingerHandler.php index f3dbd56c6..d1703da70 100644 --- a/lib/Handlers/WebfingerHandler.php +++ b/lib/Handlers/WebfingerHandler.php @@ -31,14 +31,14 @@ namespace OCA\Circles\Handlers; -use OCA\Circles\Tools\Exceptions\SignatoryException; -use OCA\Circles\Tools\Traits\TArrayTools; use OC\URLGenerator; use OCA\Circles\AppInfo\Application; use OCA\Circles\Exceptions\UnknownInterfaceException; use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\InterfaceService; use OCA\Circles\Service\RemoteStreamService; +use OCA\Circles\Tools\Exceptions\SignatoryException; +use OCA\Circles\Tools\Traits\TArrayTools; use OCP\Http\WellKnown\IHandler; use OCP\Http\WellKnown\IRequestContext; use OCP\Http\WellKnown\IResponse; diff --git a/lib/Listeners/Examples/ExampleAddingCircleMember.php b/lib/Listeners/Examples/ExampleAddingCircleMember.php index e023f068f..be1e94176 100644 --- a/lib/Listeners/Examples/ExampleAddingCircleMember.php +++ b/lib/Listeners/Examples/ExampleAddingCircleMember.php @@ -31,13 +31,13 @@ namespace OCA\Circles\Listeners\Examples; -use OCA\Circles\Tools\Traits\TNCLogger; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\AddingCircleMemberEvent; use OCA\Circles\Events\CircleGenericEvent; use OCA\Circles\Model\Member; use OCA\Circles\Model\Membership; use OCA\Circles\Service\ConfigService; +use OCA\Circles\Tools\Traits\TNCLogger; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; diff --git a/lib/Listeners/Examples/ExampleMembershipsCreated.php b/lib/Listeners/Examples/ExampleMembershipsCreated.php index 6218ddaf6..cae2fed93 100644 --- a/lib/Listeners/Examples/ExampleMembershipsCreated.php +++ b/lib/Listeners/Examples/ExampleMembershipsCreated.php @@ -31,8 +31,6 @@ namespace OCA\Circles\Listeners\Examples; -use OCA\Circles\Tools\Traits\TNCLogger; -use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OCA\Circles\AppInfo\Application; use OCA\Circles\CirclesManager; @@ -40,6 +38,8 @@ use OCA\Circles\Model\Member; use OCA\Circles\Model\Membership; use OCA\Circles\Service\ConfigService; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; diff --git a/lib/Listeners/Examples/ExampleMembershipsRemoved.php b/lib/Listeners/Examples/ExampleMembershipsRemoved.php index 7458ece14..36daff76d 100644 --- a/lib/Listeners/Examples/ExampleMembershipsRemoved.php +++ b/lib/Listeners/Examples/ExampleMembershipsRemoved.php @@ -31,8 +31,6 @@ namespace OCA\Circles\Listeners\Examples; -use OCA\Circles\Tools\Traits\TNCLogger; -use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OCA\Circles\AppInfo\Application; use OCA\Circles\CirclesManager; @@ -40,6 +38,8 @@ use OCA\Circles\Model\Member; use OCA\Circles\Model\Membership; use OCA\Circles\Service\ConfigService; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; diff --git a/lib/Listeners/Examples/ExampleRequestingCircleMember.php b/lib/Listeners/Examples/ExampleRequestingCircleMember.php index aebe9260f..08959397c 100644 --- a/lib/Listeners/Examples/ExampleRequestingCircleMember.php +++ b/lib/Listeners/Examples/ExampleRequestingCircleMember.php @@ -31,12 +31,12 @@ namespace OCA\Circles\Listeners\Examples; -use OCA\Circles\Tools\Traits\TNCLogger; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\CircleGenericEvent; use OCA\Circles\Events\RequestingCircleMemberEvent; use OCA\Circles\Model\Member; use OCA\Circles\Service\ConfigService; +use OCA\Circles\Tools\Traits\TNCLogger; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; diff --git a/lib/Listeners/Files/AddingMemberSendMail.php b/lib/Listeners/Files/AddingMemberSendMail.php index 79445627b..7c8c050c7 100644 --- a/lib/Listeners/Files/AddingMemberSendMail.php +++ b/lib/Listeners/Files/AddingMemberSendMail.php @@ -31,8 +31,6 @@ namespace OCA\Circles\Listeners\Files; -use OCA\Circles\Tools\Traits\TNCLogger; -use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\AddingCircleMemberEvent; @@ -42,6 +40,8 @@ use OCA\Circles\Service\ContactService; use OCA\Circles\Service\ShareTokenService; use OCA\Circles\Service\ShareWrapperService; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; diff --git a/lib/Listeners/Files/CreatingShareSendMail.php b/lib/Listeners/Files/CreatingShareSendMail.php index 7369cad5c..b47c7d139 100644 --- a/lib/Listeners/Files/CreatingShareSendMail.php +++ b/lib/Listeners/Files/CreatingShareSendMail.php @@ -31,8 +31,6 @@ namespace OCA\Circles\Listeners\Files; -use OCA\Circles\Tools\Traits\TNCLogger; -use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\Files\CreatingFileShareEvent; @@ -49,6 +47,8 @@ use OCA\Circles\Service\ContactService; use OCA\Circles\Service\ShareTokenService; use OCA\Circles\Service\ShareWrapperService; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; diff --git a/lib/Listeners/Files/DestroyingCircle.php b/lib/Listeners/Files/DestroyingCircle.php index a9783ea69..a5e1c3718 100644 --- a/lib/Listeners/Files/DestroyingCircle.php +++ b/lib/Listeners/Files/DestroyingCircle.php @@ -31,12 +31,12 @@ namespace OCA\Circles\Listeners\Files; -use OCA\Circles\Tools\Traits\TNCLogger; -use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\DestroyingCircleEvent; use OCA\Circles\Exceptions\RequestBuilderException; use OCA\Circles\Service\ShareWrapperService; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; diff --git a/lib/Listeners/Files/MemberAddedSendMail.php b/lib/Listeners/Files/MemberAddedSendMail.php index 86a0a4947..6316c5407 100644 --- a/lib/Listeners/Files/MemberAddedSendMail.php +++ b/lib/Listeners/Files/MemberAddedSendMail.php @@ -31,15 +31,15 @@ namespace OCA\Circles\Listeners\Files; -use OCA\Circles\Tools\Model\SimpleDataStore; -use OCA\Circles\Tools\Traits\TNCLogger; -use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\CircleMemberAddedEvent; use OCA\Circles\Model\Member; use OCA\Circles\Model\ShareWrapper; use OCA\Circles\Service\SendMailService; use OCA\Circles\Service\ShareWrapperService; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; @@ -119,9 +119,9 @@ public function handle(Event $event): void { // TODO: is it safe to use $origin to compare getInstance() ? // TODO: do we need to check the $origin ? // TODO: Solution would be to check the origin based on aliases using RemoteInstanceService -// if ($member->getUserType() === Member::TYPE_CONTACT && $member->getInstance() === $origin) { + // if ($member->getUserType() === Member::TYPE_CONTACT && $member->getInstance() === $origin) { $mails = array_merge($mails, $data->gArray('mails')); -// } + // } } } diff --git a/lib/Listeners/Files/PreparingMemberSendMail.php b/lib/Listeners/Files/PreparingMemberSendMail.php index fa868a59d..b43654d95 100644 --- a/lib/Listeners/Files/PreparingMemberSendMail.php +++ b/lib/Listeners/Files/PreparingMemberSendMail.php @@ -31,8 +31,6 @@ namespace OCA\Circles\Listeners\Files; -use OCA\Circles\Tools\Traits\TNCLogger; -use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\PreparingCircleMemberEvent; use OCA\Circles\Exceptions\FederatedItemException; @@ -47,6 +45,8 @@ use OCA\Circles\Service\SendMailService; use OCA\Circles\Service\ShareTokenService; use OCA\Circles\Service\ShareWrapperService; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; diff --git a/lib/Listeners/Files/PreparingShareSendMail.php b/lib/Listeners/Files/PreparingShareSendMail.php index 660241abc..9b880b652 100644 --- a/lib/Listeners/Files/PreparingShareSendMail.php +++ b/lib/Listeners/Files/PreparingShareSendMail.php @@ -31,8 +31,6 @@ namespace OCA\Circles\Listeners\Files; -use OCA\Circles\Tools\Traits\TNCLogger; -use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\Files\PreparingFileShareEvent; use OCA\Circles\Exceptions\FederatedItemException; @@ -47,6 +45,8 @@ use OCA\Circles\Service\SendMailService; use OCA\Circles\Service\ShareTokenService; use OCA\Circles\Service\ShareWrapperService; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; use OCP\Security\IHasher; diff --git a/lib/Listeners/Files/ShareCreatedSendMail.php b/lib/Listeners/Files/ShareCreatedSendMail.php index b1e119f06..fe71ba45c 100644 --- a/lib/Listeners/Files/ShareCreatedSendMail.php +++ b/lib/Listeners/Files/ShareCreatedSendMail.php @@ -31,8 +31,6 @@ namespace OCA\Circles\Listeners\Files; -use OCA\Circles\Tools\Traits\TNCLogger; -use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\Files\FileShareCreatedEvent; @@ -50,6 +48,8 @@ use OCA\Circles\Service\SendMailService; use OCA\Circles\Service\ShareTokenService; use OCA\Circles\Service\ShareWrapperService; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; diff --git a/lib/Listeners/Notifications/RequestingMember.php b/lib/Listeners/Notifications/RequestingMember.php index 50a91c0cd..01d14361e 100644 --- a/lib/Listeners/Notifications/RequestingMember.php +++ b/lib/Listeners/Notifications/RequestingMember.php @@ -31,12 +31,12 @@ namespace OCA\Circles\Listeners\Notifications; -use OCA\Circles\Tools\Traits\TNCLogger; use OCA\Circles\AppInfo\Application; use OCA\Circles\Events\CircleGenericEvent; use OCA\Circles\Events\RequestingCircleMemberEvent; use OCA\Circles\Exceptions\RequestBuilderException; use OCA\Circles\Service\NotificationService; +use OCA\Circles\Tools\Traits\TNCLogger; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; diff --git a/lib/Migration/Migration.php b/lib/Migration/Migration.php index 75ad6adb6..781f910c8 100644 --- a/lib/Migration/Migration.php +++ b/lib/Migration/Migration.php @@ -31,11 +31,11 @@ namespace OCA\Circles\Migration; -use OCA\Circles\Tools\Traits\TNCLogger; use Exception; use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\MigrationService; use OCA\Circles\Service\OutputService; +use OCA\Circles\Tools\Traits\TNCLogger; use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; diff --git a/lib/Model/BaseCircle.php b/lib/Model/BaseCircle.php index 093b80a24..272a73ebd 100644 --- a/lib/Model/BaseCircle.php +++ b/lib/Model/BaseCircle.php @@ -544,33 +544,33 @@ public function getLinks() { } -// public function getRemote() { -// return $this->remote; -// } -// -// public function addRemote($link) { -// array_push($this->remote, $link); -// } -// -// public function getRemoteFromToken($token) { -// foreach ($this->links AS $link) { -// if ($link->getToken() === $token) { -// return $link; -// } -// } -// -// return null; -// } -// -// public function getRemoteFromAddressAndId($address, $id) { -// foreach ($this->links AS $link) { -// if ($link->getAddress() === $address && $link->getUniqueId() === $id) { -// return $link; -// } -// } -// -// return null; -// } + // public function getRemote() { + // return $this->remote; + // } + // + // public function addRemote($link) { + // array_push($this->remote, $link); + // } + // + // public function getRemoteFromToken($token) { + // foreach ($this->links AS $link) { + // if ($link->getToken() === $token) { + // return $link; + // } + // } + // + // return null; + // } + // + // public function getRemoteFromAddressAndId($address, $id) { + // foreach ($this->links AS $link) { + // if ($link->getAddress() === $address && $link->getUniqueId() === $id) { + // return $link; + // } + // } + // + // return null; + // } /** * @param integer|string $type diff --git a/lib/Model/Circle.php b/lib/Model/Circle.php index 471b5874a..1a83cb8fa 100644 --- a/lib/Model/Circle.php +++ b/lib/Model/Circle.php @@ -223,8 +223,8 @@ class Circle extends ManagedModel implements IEntity, IDeserializable, IQueryRow /** @var int */ private $populationInherited = 0; -// /** @var bool */ -// private $hidden = false; + // /** @var bool */ + // private $hidden = false; /** @var int */ private $creation = 0; diff --git a/lib/Model/DavCard.php b/lib/Model/DavCard.php index bcad4192a..e988c8543 100644 --- a/lib/Model/DavCard.php +++ b/lib/Model/DavCard.php @@ -29,8 +29,8 @@ namespace OCA\Circles\Model; -use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; +use OCA\Circles\Tools\Traits\TArrayTools; /** * Class DavCard @@ -43,7 +43,7 @@ class DavCard implements JsonSerializable { public const TYPE_CONTACT = 1; public const TYPE_LOCAL = 2; -// const TYPE_FEDERATED = 3; + // const TYPE_FEDERATED = 3; /** @var int */ diff --git a/lib/Model/DeprecatedCircle.php b/lib/Model/DeprecatedCircle.php index 821762aa7..9c76437b0 100644 --- a/lib/Model/DeprecatedCircle.php +++ b/lib/Model/DeprecatedCircle.php @@ -26,10 +26,10 @@ namespace OCA\Circles\Model; -use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\Exceptions\CircleTypeNotValidException; use OCA\Circles\Exceptions\FederatedCircleNotAllowedException; +use OCA\Circles\Tools\Traits\TArrayTools; class DeprecatedCircle extends BaseCircle implements JsonSerializable { use TArrayTools; diff --git a/lib/Model/Federated/EventWrapper.php b/lib/Model/Federated/EventWrapper.php index 7338941df..c32e27599 100644 --- a/lib/Model/Federated/EventWrapper.php +++ b/lib/Model/Federated/EventWrapper.php @@ -31,11 +31,11 @@ namespace OCA\Circles\Model\Federated; +use JsonSerializable; use OCA\Circles\Tools\Db\IQueryRow; use OCA\Circles\Tools\Exceptions\InvalidItemException; use OCA\Circles\Tools\Model\SimpleDataStore; use OCA\Circles\Tools\Traits\TArrayTools; -use JsonSerializable; /** * Class EventWrapper diff --git a/lib/Model/Federated/FederatedEvent.php b/lib/Model/Federated/FederatedEvent.php index 8443f67c9..3df851fba 100644 --- a/lib/Model/Federated/FederatedEvent.php +++ b/lib/Model/Federated/FederatedEvent.php @@ -31,12 +31,12 @@ namespace OCA\Circles\Model\Federated; -use OCA\Circles\Tools\Exceptions\InvalidItemException; -use OCA\Circles\Tools\Model\SimpleDataStore; -use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\Model\Circle; use OCA\Circles\Model\Member; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TArrayTools; /** * Class FederatedEvent diff --git a/lib/Model/Federated/FederatedShare.php b/lib/Model/Federated/FederatedShare.php index 8b049441c..a0d80d8a1 100644 --- a/lib/Model/Federated/FederatedShare.php +++ b/lib/Model/Federated/FederatedShare.php @@ -31,13 +31,13 @@ namespace OCA\Circles\Model\Federated; +use JsonSerializable; +use OCA\Circles\IFederatedModel; +use OCA\Circles\Model\ManagedModel; use OCA\Circles\Tools\Db\IQueryRow; use OCA\Circles\Tools\IDeserializable; use OCA\Circles\Tools\Model\SimpleDataStore; use OCA\Circles\Tools\Traits\TArrayTools; -use JsonSerializable; -use OCA\Circles\IFederatedModel; -use OCA\Circles\Model\ManagedModel; /** * Class FederatedShare diff --git a/lib/Model/Federated/RemoteInstance.php b/lib/Model/Federated/RemoteInstance.php index 34eab92c1..6159c02c3 100644 --- a/lib/Model/Federated/RemoteInstance.php +++ b/lib/Model/Federated/RemoteInstance.php @@ -31,12 +31,12 @@ namespace OCA\Circles\Model\Federated; -use OCA\Circles\Tools\Db\IQueryRow; -use OCA\Circles\Tools\Model\NCSignatory; -use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\Exceptions\RemoteNotFoundException; use OCA\Circles\Exceptions\RemoteUidException; +use OCA\Circles\Tools\Db\IQueryRow; +use OCA\Circles\Tools\Model\NCSignatory; +use OCA\Circles\Tools\Traits\TArrayTools; /** * Class AppService diff --git a/lib/Model/FederatedUser.php b/lib/Model/FederatedUser.php index ac6a7ca2e..bfcf25e29 100644 --- a/lib/Model/FederatedUser.php +++ b/lib/Model/FederatedUser.php @@ -31,19 +31,19 @@ namespace OCA\Circles\Model; -use OCA\Circles\Tools\Db\IQueryRow; -use OCA\Circles\Tools\Exceptions\InvalidItemException; -use OCA\Circles\Tools\IDeserializable; -use OCA\Circles\Tools\Traits\TDeserialize; -use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\Exceptions\FederatedUserNotFoundException; use OCA\Circles\Exceptions\MembershipNotFoundException; use OCA\Circles\Exceptions\OwnerNotFoundException; use OCA\Circles\Exceptions\RequestBuilderException; use OCA\Circles\Exceptions\UnknownInterfaceException; -use OCA\Circles\IFederatedUser; use OCA\Circles\IEntity; +use OCA\Circles\IFederatedUser; +use OCA\Circles\Tools\Db\IQueryRow; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\IDeserializable; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TDeserialize; /** * Class FederatedUser diff --git a/lib/Model/GlobalScale/GSShare.php b/lib/Model/GlobalScale/GSShare.php index 5a0c3cd0a..ad3fb707d 100644 --- a/lib/Model/GlobalScale/GSShare.php +++ b/lib/Model/GlobalScale/GSShare.php @@ -31,8 +31,8 @@ namespace OCA\Circles\Model\GlobalScale; -use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; +use OCA\Circles\Tools\Traits\TArrayTools; /** * Class GSShare diff --git a/lib/Model/GlobalScale/GSShareMountpoint.php b/lib/Model/GlobalScale/GSShareMountpoint.php index d4e8326d4..0bd24dfa4 100644 --- a/lib/Model/GlobalScale/GSShareMountpoint.php +++ b/lib/Model/GlobalScale/GSShareMountpoint.php @@ -31,8 +31,8 @@ namespace OCA\Circles\Model\GlobalScale; -use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; +use OCA\Circles\Tools\Traits\TArrayTools; /** * Class GSShare diff --git a/lib/Model/GlobalScale/GSWrapper.php b/lib/Model/GlobalScale/GSWrapper.php index c9bbbb7f5..e14125e0d 100644 --- a/lib/Model/GlobalScale/GSWrapper.php +++ b/lib/Model/GlobalScale/GSWrapper.php @@ -31,10 +31,10 @@ namespace OCA\Circles\Model\GlobalScale; -use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\Exceptions\JsonException; use OCA\Circles\Exceptions\ModelException; +use OCA\Circles\Tools\Traits\TArrayTools; /** * Class GSEvent diff --git a/lib/Model/Helpers/MemberHelper.php b/lib/Model/Helpers/MemberHelper.php index 5e81e0e58..4406addfe 100644 --- a/lib/Model/Helpers/MemberHelper.php +++ b/lib/Model/Helpers/MemberHelper.php @@ -31,11 +31,11 @@ namespace OCA\Circles\Model\Helpers; -use OCA\Circles\Tools\Traits\TArrayTools; use OCA\Circles\Exceptions\MemberHelperException; use OCA\Circles\Exceptions\MemberLevelException; use OCA\Circles\Exceptions\ParseMemberLevelException; use OCA\Circles\Model\Member; +use OCA\Circles\Tools\Traits\TArrayTools; /** * Class MemberHelper diff --git a/lib/Model/Mount.php b/lib/Model/Mount.php index 6a09132e6..647a79f35 100644 --- a/lib/Model/Mount.php +++ b/lib/Model/Mount.php @@ -31,12 +31,12 @@ namespace OCA\Circles\Model; -use OCA\Circles\Tools\Db\IQueryRow; -use OCA\Circles\Tools\IDeserializable; -use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\Circles\MountManager\CircleMountManager; +use OCA\Circles\Tools\Db\IQueryRow; +use OCA\Circles\Tools\IDeserializable; +use OCA\Circles\Tools\Traits\TArrayTools; use OCP\Federation\ICloudIdManager; use OCP\Http\Client\IClientService; @@ -57,9 +57,9 @@ class Mount extends ManagedModel implements IDeserializable, IQueryRow, JsonSeri /** @var string */ private $circleId = ''; -// -// /** @var string */ -// private $singleId = ''; + // + // /** @var string */ + // private $singleId = ''; /** @var Member */ private $owner; @@ -155,25 +155,25 @@ public function setCircleId(string $circleId): self { return $this; } -// -// /** -// * -// * @return string -// */ -// public function getSingleId(): string { -// return $this->singleId; -// } -// -// /** -// * @param string $singleId -// * -// * @return Mount -// */ -// public function setSingleId(string $singleId): self { -// $this->singleId = $singleId; -// -// return $this; -// } + // + // /** + // * + // * @return string + // */ + // public function getSingleId(): string { + // return $this->singleId; + // } + // + // /** + // * @param string $singleId + // * + // * @return Mount + // */ + // public function setSingleId(string $singleId): self { + // $this->singleId = $singleId; + // + // return $this; + // } /** @@ -379,24 +379,24 @@ public function getMountManager(): CircleMountManager { } -// -// /** -// * @param string $storage -// * -// * @return Mount -// */ -// public function setStorage(string $storage): self { -// $this->storage = $storage; -// -// return $this; -// } -// -// /** -// * @return string -// */ -// public function getStorage(): string { -// return $this->storage; -// } + // + // /** + // * @param string $storage + // * + // * @return Mount + // */ + // public function setStorage(string $storage): self { + // $this->storage = $storage; + // + // return $this; + // } + // + // /** + // * @return string + // */ + // public function getStorage(): string { + // return $this->storage; + // } /** @@ -466,7 +466,7 @@ public function importFromDatabase(array $data, string $prefix = ''): IQueryRow $this->setMountPoint($this->get('mountpoint', $data)); $this->setMountPointHash($this->get('mountpoint_hash', $data)); -// $this->setDefaultMountPoint($this->get('mountpoint', $data)); + // $this->setDefaultMountPoint($this->get('mountpoint', $data)); $this->getManager()->manageImportFromDatabase($this, $data, $prefix); diff --git a/lib/Model/Mountpoint.php b/lib/Model/Mountpoint.php index 231d4bf78..67efaf431 100644 --- a/lib/Model/Mountpoint.php +++ b/lib/Model/Mountpoint.php @@ -31,8 +31,8 @@ namespace OCA\Circles\Model; -use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; +use OCA\Circles\Tools\Traits\TArrayTools; /** * Class Mountpoint diff --git a/lib/Model/Report.php b/lib/Model/Report.php index c799ec5ca..bb8921813 100644 --- a/lib/Model/Report.php +++ b/lib/Model/Report.php @@ -31,9 +31,9 @@ namespace OCA\Circles\Model; +use JsonSerializable; use OCA\Circles\Tools\IDeserializable; use OCA\Circles\Tools\Traits\TArrayTools; -use JsonSerializable; /** * Class Report diff --git a/lib/Model/ShareToken.php b/lib/Model/ShareToken.php index 7ef3bc3a4..276404092 100644 --- a/lib/Model/ShareToken.php +++ b/lib/Model/ShareToken.php @@ -31,12 +31,12 @@ namespace OCA\Circles\Model; +use JsonSerializable; +use OCA\Circles\Exceptions\ShareTokenNotFoundException; use OCA\Circles\Tools\Db\IQueryRow; use OCA\Circles\Tools\Exceptions\InvalidItemException; use OCA\Circles\Tools\IDeserializable; use OCA\Circles\Tools\Traits\TArrayTools; -use JsonSerializable; -use OCA\Circles\Exceptions\ShareTokenNotFoundException; use OCP\Share\IShare; class ShareToken implements IDeserializable, IQueryRow, JsonSerializable { diff --git a/lib/Model/ShareWrapper.php b/lib/Model/ShareWrapper.php index 78b66d9e5..9a97ee0eb 100644 --- a/lib/Model/ShareWrapper.php +++ b/lib/Model/ShareWrapper.php @@ -458,22 +458,22 @@ private function setShareDisplay(IShare $share, IURLGenerator $urlGenerator): vo $share->setSharedWithAvatar($icon); -// if (array_key_exists('circle_type', $data) -// && method_exists($share, 'setSharedWithDisplayName')) { -// $name = $data['circle_name']; -// if ($data['circle_alt_name'] !== '') { -// $name = $data['circle_alt_name']; -// } -// -// $share->setSharedWithAvatar(CirclesService::getCircleIcon($data['circle_type'])) -// ->setSharedWithDisplayName( -// sprintf( -// ' % s(%s, %s)', $name, -// $this->l10n->t(DeprecatedCircle::TypeLongString($data['circle_type'])), -// $this->miscService->getDisplayName($data['circle_owner'], true) -// ) -// ); -// } + // if (array_key_exists('circle_type', $data) + // && method_exists($share, 'setSharedWithDisplayName')) { + // $name = $data['circle_name']; + // if ($data['circle_alt_name'] !== '') { + // $name = $data['circle_alt_name']; + // } + // + // $share->setSharedWithAvatar(CirclesService::getCircleIcon($data['circle_type'])) + // ->setSharedWithDisplayName( + // sprintf( + // ' % s(%s, %s)', $name, + // $this->l10n->t(DeprecatedCircle::TypeLongString($data['circle_type'])), + // $this->miscService->getDisplayName($data['circle_owner'], true) + // ) + // ); + // } } @@ -569,11 +569,11 @@ public function importFromDatabase(array $data, string $prefix = ''): IQueryRow $this->importAttributesFromDatabase($this->get('attributes', $data)); -// if (($password = $this->get('personal_password', $data, '')) !== '') { -// $share->setPassword($this->get('personal_password', $data, '')); -// } else if (($password = $this->get('password', $data, '')) !== '') { -// $share->setPassword($this->get('password', $data, '')); -// } + // if (($password = $this->get('personal_password', $data, '')) !== '') { + // $share->setPassword($this->get('personal_password', $data, '')); + // } else if (($password = $this->get('password', $data, '')) !== '') { + // $share->setPassword($this->get('password', $data, '')); + // } $this->setChildId($this->getInt($prefix . 'child_id', $data)) ->setChildFileTarget($this->get($prefix . 'child_file_target', $data)) diff --git a/lib/Model/SharesToken.php b/lib/Model/SharesToken.php index ab807b031..cd3dd9e0b 100644 --- a/lib/Model/SharesToken.php +++ b/lib/Model/SharesToken.php @@ -26,8 +26,8 @@ namespace OCA\Circles\Model; -use OCA\Circles\Tools\Traits\TArrayTools; use JsonSerializable; +use OCA\Circles\Tools\Traits\TArrayTools; use OCP\Share\IShare; /** diff --git a/lib/MountManager/CircleMount.php b/lib/MountManager/CircleMount.php index 33de496e6..90b3bf655 100644 --- a/lib/MountManager/CircleMount.php +++ b/lib/MountManager/CircleMount.php @@ -31,13 +31,13 @@ namespace OCA\Circles\MountManager; -use OCA\Circles\Tools\Traits\TArrayTools; use Exception; use JsonSerializable; use OC\Files\Mount\MountPoint; use OC\Files\Mount\MoveableMount; use OCA\Circles\Exceptions\MountPointConstructionException; use OCA\Circles\Model\Mount; +use OCA\Circles\Tools\Traits\TArrayTools; use OCP\Files\Storage\IStorageFactory; /** diff --git a/lib/MountManager/CircleMountProvider.php b/lib/MountManager/CircleMountProvider.php index a205e461a..466edc625 100644 --- a/lib/MountManager/CircleMountProvider.php +++ b/lib/MountManager/CircleMountProvider.php @@ -31,7 +31,6 @@ namespace OCA\Circles\MountManager; -use OCA\Circles\Tools\Traits\TArrayTools; use Exception; use OCA\Circles\Db\MountRequest; use OCA\Circles\Exceptions\FederatedUserException; @@ -45,6 +44,7 @@ use OCA\Circles\Model\Mount; use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\FederatedUserService; +use OCA\Circles\Tools\Traits\TArrayTools; use OCA\Files_Sharing\External\Storage as ExternalStorage; use OCP\Federation\ICloudIdManager; use OCP\Files\Config\IMountProvider; @@ -62,7 +62,7 @@ class CircleMountProvider implements IMountProvider { use TArrayTools; -// const LOCAL_STORAGE = ::class; + // const LOCAL_STORAGE = ::class; public const EXTERNAL_STORAGE = ExternalStorage::class; @@ -130,10 +130,10 @@ public function getMountsForUser(IUser $user, IStorageFactory $loader): array { $mounts = []; foreach ($items as $item) { try { -// if ($share->getMountPoint() !== '-') { -// $this->fixDuplicateFile($user->getUID(), $gss.share); + // if ($share->getMountPoint() !== '-') { + // $this->fixDuplicateFile($user->getUID(), $gss.share); $mounts[] = $this->generateCircleMount($item, $loader); -// } + // } } catch (Exception $e) { } } @@ -179,23 +179,23 @@ public function generateCircleMount(Mount $mount, IStorageFactory $storageFactor * @return bool */ public function renameShare(int $gsShareId, string $target) { -// try { -// if ($target !== '-') { -// $target = $this->stripPath($target); -// $this->gsSharesRequest->getShareMountPointByPath($this->userId, $target); -// -// return false; -// } -// } catch (ShareNotFound $e) { -// } -// -// $mountPoint = new GSShareMountpoint($gsShareId, $this->userId, $target); -// try { -// $this->gsSharesRequest->getShareMountPointById($gsShareId, $this->userId); -// $this->gsSharesRequest->updateShareMountPoint($mountPoint); -// } catch (ShareNotFound $e) { -// $this->gsSharesRequest->generateShareMountPoint($mountPoint); -// } + // try { + // if ($target !== '-') { + // $target = $this->stripPath($target); + // $this->gsSharesRequest->getShareMountPointByPath($this->userId, $target); + // + // return false; + // } + // } catch (ShareNotFound $e) { + // } + // + // $mountPoint = new GSShareMountpoint($gsShareId, $this->userId, $target); + // try { + // $this->gsSharesRequest->getShareMountPointById($gsShareId, $this->userId); + // $this->gsSharesRequest->updateShareMountPoint($mountPoint); + // } catch (ShareNotFound $e) { + // $this->gsSharesRequest->generateShareMountPoint($mountPoint); + // } return true; } @@ -234,8 +234,8 @@ public function unshare(int $gsShareId) { */ protected function stripPath($path) { return $path; -// $prefix = '/' . $this->userId . '/files'; -// -// return rtrim(substr($path, strlen($prefix)), '/'); + // $prefix = '/' . $this->userId . '/files'; + // + // return rtrim(substr($path, strlen($prefix)), '/'); } } diff --git a/lib/Search/GlobalScaleUsers.php b/lib/Search/GlobalScaleUsers.php index 18a563a37..52218a387 100644 --- a/lib/Search/GlobalScaleUsers.php +++ b/lib/Search/GlobalScaleUsers.php @@ -26,18 +26,18 @@ namespace OCA\Circles\Search; -use OCA\Circles\Tools\Exceptions\RequestNetworkException; -use OCA\Circles\Tools\Exceptions\RequestResultNotJsonException; -use OCA\Circles\Tools\Model\NCRequest; -use OCA\Circles\Tools\Model\Request; -use OCA\Circles\Tools\Traits\TNCRequest; -use OCA\Circles\Tools\Traits\TArrayTools; use OCA\Circles\Exceptions\GSStatusException; use OCA\Circles\ISearch; use OCA\Circles\Model\DeprecatedMember; use OCA\Circles\Model\SearchResult; use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\MiscService; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\RequestResultNotJsonException; +use OCA\Circles\Tools\Model\NCRequest; +use OCA\Circles\Tools\Model\Request; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TNCRequest; /** * Class GlobalScaleUsers diff --git a/lib/Service/CirclesService.php b/lib/Service/CirclesService.php index 85a1d1121..acc029d34 100644 --- a/lib/Service/CirclesService.php +++ b/lib/Service/CirclesService.php @@ -29,7 +29,6 @@ namespace OCA\Circles\Service; -use OCA\Circles\Tools\Traits\TArrayTools; use Exception; use OC; use OCA\Circles\AppInfo\Application; @@ -49,6 +48,7 @@ use OCA\Circles\Model\DeprecatedCircle; use OCA\Circles\Model\DeprecatedMember; use OCA\Circles\Model\GlobalScale\GSEvent; +use OCA\Circles\Tools\Traits\TArrayTools; use OCP\IGroupManager; use OCP\IL10N; use OCP\IUserSession; @@ -189,11 +189,11 @@ public function createCircle($type, $name, string $ownerId = '') { ); } -// if (!$this->configService->isCircleAllowed($type)) { -// throw new CircleTypeDisabledException( -// $this->l10n->t('You cannot create this type of circle') -// ); -// } + // if (!$this->configService->isCircleAllowed($type)) { + // throw new CircleTypeDisabledException( + // $this->l10n->t('You cannot create this type of circle') + // ); + // } $circle = new DeprecatedCircle($type, $name); if ($ownerId === '') { @@ -246,11 +246,11 @@ public function listCircles($userId, $type, $name = '', $level = 0, $forceAll = throw new Exception('UserID cannot be null'); } -// if (!$this->configService->isCircleAllowed((int)$type)) { -// throw new CircleTypeDisabledException( -// $this->l10n->t('You cannot display this type of circle') -// ); -// } + // if (!$this->configService->isCircleAllowed((int)$type)) { + // throw new CircleTypeDisabledException( + // $this->l10n->t('You cannot display this type of circle') + // ); + // } $data = []; $result = $this->circlesRequest->getCircles($userId, $type, $name, $level, $forceAll); @@ -325,15 +325,15 @@ private function detailsCircleMembers(Circle $circle, $forceAll = false) { * @throws GSStatusException */ private function detailsCircleLinkedGroups(DeprecatedCircle $circle) { -// $groups = []; -// if ($this->configService->isLinkedGroupsAllowed()) { -// $groups = -// $this->membersRequest->getGroupsFromCircle( -// $circle->getUniqueId(), $circle->getHigherViewer() -// ); -// } -// -// $circle->setGroups($groups); + // $groups = []; + // if ($this->configService->isLinkedGroupsAllowed()) { + // $groups = + // $this->membersRequest->getGroupsFromCircle( + // $circle->getUniqueId(), $circle->getHigherViewer() + // ); + // } + // + // $circle->setGroups($groups); } diff --git a/lib/Service/ContactService.php b/lib/Service/ContactService.php index 73153997d..141553849 100644 --- a/lib/Service/ContactService.php +++ b/lib/Service/ContactService.php @@ -31,15 +31,15 @@ namespace OCA\Circles\Service; -use OCA\Circles\Tools\Traits\TNCLogger; -use OCA\Circles\Tools\Traits\TArrayTools; -use OCA\Circles\Tools\Traits\TStringTools; use Exception; use OC; use OCA\Circles\Exceptions\ContactAddressBookNotFoundException; use OCA\Circles\Exceptions\ContactFormatException; use OCA\Circles\Exceptions\ContactNotFoundException; use OCA\Circles\Model\Member; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCA\DAV\CardDAV\ContactsManager; use OCP\Contacts\IManager; use OCP\IAddressBook; diff --git a/lib/Service/DavService.php b/lib/Service/DavService.php index 6258ecdac..82ec251ce 100644 --- a/lib/Service/DavService.php +++ b/lib/Service/DavService.php @@ -38,8 +38,8 @@ use OCA\Circles\Exceptions\MemberAlreadyExistsException; use OCA\Circles\Exceptions\MemberDoesNotExistException; use OCA\Circles\Exceptions\NotLocalMemberException; -use OCA\Circles\Model\DeprecatedCircle; use OCA\Circles\Model\DavCard; +use OCA\Circles\Model\DeprecatedCircle; use OCA\Circles\Model\DeprecatedMember; use OCA\DAV\CardDAV\CardDavBackend; use OCP\App\ManagerEvent; @@ -130,7 +130,7 @@ public function onAppEnabled(ManagerEvent $event) { } try { -// $this->migration(); + // $this->migration(); } catch (Exception $e) { } } @@ -243,9 +243,9 @@ private function manageContact(DavCard $davCard) { $this->manageLocalContact($davCard); break; -// case DavCard::TYPE_FEDERATED: -// $this->manageFederatedContact($davCard); -// break; + // case DavCard::TYPE_FEDERATED: + // $this->manageFederatedContact($davCard); + // break; } } @@ -327,9 +327,9 @@ private function manageMember(DeprecatedCircle $circle, DavCard $davCard, int $t try { $this->membersRequest->createMember($member); -// if ($type === Member::TYPE_CONTACT) { -// $this->fileSharingBroadcaster->sendMailAboutExistingShares($circle, $member); -// } + // if ($type === Member::TYPE_CONTACT) { + // $this->fileSharingBroadcaster->sendMailAboutExistingShares($circle, $member); + // } } catch (MemberAlreadyExistsException $e) { $this->membersRequest->checkMember($member, false); } diff --git a/lib/Service/EventsService.php b/lib/Service/EventsService.php index 69c6a7985..8e2513614 100644 --- a/lib/Service/EventsService.php +++ b/lib/Service/EventsService.php @@ -31,8 +31,8 @@ use OCA\Circles\Db\DeprecatedCirclesRequest; use OCA\Circles\Db\DeprecatedMembersRequest; use OCA\Circles\Model\DeprecatedCircle; -use OCA\Circles\Model\FederatedLink; use OCA\Circles\Model\DeprecatedMember; +use OCA\Circles\Model\FederatedLink; use OCP\Activity\IEvent; use OCP\Activity\IManager as IActivityManager; use OCP\AppFramework\Utility\ITimeFactory; diff --git a/lib/Service/FederatedEventService.php b/lib/Service/FederatedEventService.php index 2bf3e7752..04a0de109 100644 --- a/lib/Service/FederatedEventService.php +++ b/lib/Service/FederatedEventService.php @@ -201,9 +201,9 @@ public function newEvent(FederatedEvent $event): array { return $event->getOutcome(); } -// if (!$event->isAsync()) { -// $federatedItem->manage($event); -// } + // if (!$event->isAsync()) { + // $federatedItem->manage($event); + // } } return $event->getOutcome(); @@ -281,7 +281,7 @@ public function getFederatedItem(FederatedEvent $event, bool $checkLocalOnly = t $this->confirmRequiredCondition($event, $item, $checkLocalOnly); $this->configureEvent($event, $item); -// $this->confirmSharedItem($event, $item); + // $this->confirmSharedItem($event, $item); return $item; } diff --git a/lib/Service/GSUpstreamService.php b/lib/Service/GSUpstreamService.php index 2e0de8491..89e35f463 100644 --- a/lib/Service/GSUpstreamService.php +++ b/lib/Service/GSUpstreamService.php @@ -31,15 +31,6 @@ namespace OCA\Circles\Service; -use OCA\Circles\Tools\Exceptions\RequestContentException; -use OCA\Circles\Tools\Exceptions\RequestNetworkException; -use OCA\Circles\Tools\Exceptions\RequestResultNotJsonException; -use OCA\Circles\Tools\Exceptions\RequestResultSizeException; -use OCA\Circles\Tools\Exceptions\RequestServerException; -use OCA\Circles\Tools\Model\NCRequest; -use OCA\Circles\Tools\Model\Request; -use OCA\Circles\Tools\Model\SimpleDataStore; -use OCA\Circles\Tools\Traits\TNCRequest; use Exception; use OCA\Circles\Db\DeprecatedCirclesRequest; use OCA\Circles\Db\DeprecatedMembersRequest; @@ -52,6 +43,15 @@ use OCA\Circles\Model\DeprecatedCircle; use OCA\Circles\Model\GlobalScale\GSEvent; use OCA\Circles\Model\GlobalScale\GSWrapper; +use OCA\Circles\Tools\Exceptions\RequestContentException; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\RequestResultNotJsonException; +use OCA\Circles\Tools\Exceptions\RequestResultSizeException; +use OCA\Circles\Tools\Exceptions\RequestServerException; +use OCA\Circles\Tools\Model\NCRequest; +use OCA\Circles\Tools\Model\Request; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TNCRequest; use OCP\IURLGenerator; /** @@ -385,7 +385,7 @@ public function confirmCircleStatus(DeprecatedCircle $circle): bool { try { $result = $this->retrieveJson($request); -// $this->miscService->log('result: ' . json_encode($result)); + // $this->miscService->log('result: ' . json_encode($result)); if ($this->getInt('status', $result, 0) !== 1) { throw new RequestContentException('result status is not good'); } @@ -452,6 +452,6 @@ public function syncEvents() { * */ private function removeDeprecatedEvents() { -// $this->deprecatedEvents(); + // $this->deprecatedEvents(); } } diff --git a/lib/Service/GlobalScaleService.php b/lib/Service/GlobalScaleService.php index a37253146..b2cab178f 100644 --- a/lib/Service/GlobalScaleService.php +++ b/lib/Service/GlobalScaleService.php @@ -31,14 +31,14 @@ namespace OCA\Circles\Service; +use OC\Security\IdentityProof\Signer; +use OCA\Circles\Db\EventWrapperRequest; +use OCA\Circles\Exceptions\GSStatusException; use OCA\Circles\Tools\Exceptions\RequestNetworkException; use OCA\Circles\Tools\Model\NCRequest; use OCA\Circles\Tools\Model\Request; use OCA\Circles\Tools\Traits\TNCRequest; use OCA\Circles\Tools\Traits\TStringTools; -use OC\Security\IdentityProof\Signer; -use OCA\Circles\Db\EventWrapperRequest; -use OCA\Circles\Exceptions\GSStatusException; use OCP\IURLGenerator; use OCP\IUserManager; use OCP\IUserSession; @@ -134,131 +134,131 @@ public function getGlobalScaleInstances(): array { -// /** -// * @param GSEvent $event -// * -// * @return string -// */ -// public function asyncBroadcast(GSEvent $event): string { -// $wrapper = new GSWrapper(); -// $wrapper->setEvent($event); -// $wrapper->setToken($this->uuid()); -// $wrapper->setCreation(time()); -// $wrapper->setSeverity($event->getSeverity()); -// -// foreach ($this->getInstances($event->isAsync()) as $instance) { -// $wrapper->setInstance($instance); -// $wrapper = $this->eventWrapperRequest->create($wrapper); -// } -// -// $request = new NC22Request('', Request::TYPE_POST); -// $this->configService->configureRequest( -// $request, 'circles.EventWrapper.asyncBroadcast', ['token' => $wrapper->getToken()] -// ); -// -// try { -// $this->doRequest($request); -// } catch (RequestContentException | RequestNetworkException | RequestResultSizeException | RequestServerException $e) { -// $this->miscService->e($e); -// } -// -// return $wrapper->getToken(); -// } -// -// -// /** -// * @param GSEvent $event -// * -// * @return AGlobalScaleEvent -// * @throws GlobalScaleEventException -// */ -// public function getGlobalScaleEvent(GSEvent $event): AGlobalScaleEvent { -// $class = $this->getClassNameFromEvent($event); -// try { -// $gs = OC::$server->query($class); -// if (!$gs instanceof AGlobalScaleEvent) { -// throw new GlobalScaleEventException($class . ' not an AGlobalScaleEvent'); -// } -// -// return $gs; -// } catch (QueryException $e) { -// throw new GlobalScaleEventException('AGlobalScaleEvent ' . $class . ' not found'); -// } -// } -// -// -// /** -// * @return string -// */ -// public function getKey(): string { -// try { -// $key = $this->configService->getGSStatus(ConfigService::GS_KEY); -// } catch (GSStatusException $e) { -// $key = $this->configService->getAppValue(ConfigService::CIRCLES_LOCAL_GSKEY); -// if ($key === '') { -// $key = $this->token(31); -// $this->configService->setAppValue(ConfigService::CIRCLES_LOCAL_GSKEY, $key); -// } -// } -// -// return md5('gskey:' . $key); -// } -// -// /** -// * @param string $key -// * -// * @throws GSKeyException -// */ -// public function checkKey(string $key) { -// if ($key !== $this->getKey()) { -// throw new GSKeyException('invalid key'); -// } -// } -// -// -// /** -// * @param GSEvent $event -// * -// * @throws GSKeyException -// */ -// public function checkEvent(GSEvent $event): void { -// $this->checkKey($event->getKey()); -// } -// -// -// /** -// * @param GSEvent $event -// * -// * @return string -// * @throws GlobalScaleEventException -// */ -// private function getClassNameFromEvent(GSEvent $event): string { -// $className = $event->getType(); -// if (substr($className, 0, 25) !== '\OCA\Circles\GlobalScale\\' || strpos($className, '.')) { -// throw new GlobalScaleEventException( -// $className . ' does not seems to be a secured AGlobalScaleEvent' -// ); -// } -// -// return $className; -// } -// -// -// /** -// * @return IUser -// * @throws NoUserException -// */ -// private function getRandomUser(): IUser { -// $user = $this->userSession->getUser(); -// if ($user !== null) { -// return $user; -// } -// -// $random = $this->userManager->search('', 1); -// if (sizeof($random) > 0) { -// return array_shift($random); -// } -// -// throw new NoUserException(); -// } + // /** + // * @param GSEvent $event + // * + // * @return string + // */ + // public function asyncBroadcast(GSEvent $event): string { + // $wrapper = new GSWrapper(); + // $wrapper->setEvent($event); + // $wrapper->setToken($this->uuid()); + // $wrapper->setCreation(time()); + // $wrapper->setSeverity($event->getSeverity()); + // + // foreach ($this->getInstances($event->isAsync()) as $instance) { + // $wrapper->setInstance($instance); + // $wrapper = $this->eventWrapperRequest->create($wrapper); + // } + // + // $request = new NC22Request('', Request::TYPE_POST); + // $this->configService->configureRequest( + // $request, 'circles.EventWrapper.asyncBroadcast', ['token' => $wrapper->getToken()] + // ); + // + // try { + // $this->doRequest($request); + // } catch (RequestContentException | RequestNetworkException | RequestResultSizeException | RequestServerException $e) { + // $this->miscService->e($e); + // } + // + // return $wrapper->getToken(); + // } + // + // + // /** + // * @param GSEvent $event + // * + // * @return AGlobalScaleEvent + // * @throws GlobalScaleEventException + // */ + // public function getGlobalScaleEvent(GSEvent $event): AGlobalScaleEvent { + // $class = $this->getClassNameFromEvent($event); + // try { + // $gs = OC::$server->query($class); + // if (!$gs instanceof AGlobalScaleEvent) { + // throw new GlobalScaleEventException($class . ' not an AGlobalScaleEvent'); + // } + // + // return $gs; + // } catch (QueryException $e) { + // throw new GlobalScaleEventException('AGlobalScaleEvent ' . $class . ' not found'); + // } + // } + // + // + // /** + // * @return string + // */ + // public function getKey(): string { + // try { + // $key = $this->configService->getGSStatus(ConfigService::GS_KEY); + // } catch (GSStatusException $e) { + // $key = $this->configService->getAppValue(ConfigService::CIRCLES_LOCAL_GSKEY); + // if ($key === '') { + // $key = $this->token(31); + // $this->configService->setAppValue(ConfigService::CIRCLES_LOCAL_GSKEY, $key); + // } + // } + // + // return md5('gskey:' . $key); + // } + // + // /** + // * @param string $key + // * + // * @throws GSKeyException + // */ + // public function checkKey(string $key) { + // if ($key !== $this->getKey()) { + // throw new GSKeyException('invalid key'); + // } + // } + // + // + // /** + // * @param GSEvent $event + // * + // * @throws GSKeyException + // */ + // public function checkEvent(GSEvent $event): void { + // $this->checkKey($event->getKey()); + // } + // + // + // /** + // * @param GSEvent $event + // * + // * @return string + // * @throws GlobalScaleEventException + // */ + // private function getClassNameFromEvent(GSEvent $event): string { + // $className = $event->getType(); + // if (substr($className, 0, 25) !== '\OCA\Circles\GlobalScale\\' || strpos($className, '.')) { + // throw new GlobalScaleEventException( + // $className . ' does not seems to be a secured AGlobalScaleEvent' + // ); + // } + // + // return $className; + // } + // + // + // /** + // * @return IUser + // * @throws NoUserException + // */ + // private function getRandomUser(): IUser { + // $user = $this->userSession->getUser(); + // if ($user !== null) { + // return $user; + // } + // + // $random = $this->userManager->search('', 1); + // if (sizeof($random) > 0) { + // return array_shift($random); + // } + // + // throw new NoUserException(); + // } } diff --git a/lib/Service/GroupsService.php b/lib/Service/GroupsService.php index 548928883..2073c2606 100644 --- a/lib/Service/GroupsService.php +++ b/lib/Service/GroupsService.php @@ -185,7 +185,7 @@ private function getFreshNewMember($circleId, $groupId) { } catch (MemberDoesNotExistException $e) { $member = new DeprecatedMember($groupId, DeprecatedMember::TYPE_GROUP, $circleId); $this->membersRequest->createMember($member); -// $this->membersRequest->insertGroup($member); + // $this->membersRequest->insertGroup($member); } if ($member->getLevel() > DeprecatedMember::LEVEL_NONE) { diff --git a/lib/Service/InterfaceService.php b/lib/Service/InterfaceService.php index d72fdf5f0..569863cb7 100644 --- a/lib/Service/InterfaceService.php +++ b/lib/Service/InterfaceService.php @@ -31,13 +31,13 @@ namespace OCA\Circles\Service; -use OCA\Circles\Tools\Traits\TNCLogger; -use OCA\Circles\Tools\Traits\TArrayTools; -use OCA\Circles\Tools\Traits\TStringTools; use OCA\Circles\AppInfo\Application; use OCA\Circles\Db\RemoteRequest; use OCA\Circles\Exceptions\RemoteNotFoundException; use OCA\Circles\Exceptions\UnknownInterfaceException; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\IRequest; use OCP\IURLGenerator; diff --git a/lib/Service/MaintenanceService.php b/lib/Service/MaintenanceService.php index a96f24b24..e7f19232a 100644 --- a/lib/Service/MaintenanceService.php +++ b/lib/Service/MaintenanceService.php @@ -341,15 +341,15 @@ private function removeCirclesWithNoOwner(): void { * */ private function removeMembersWithNoCircles(): void { -// $members = $this->membersRequest->forceGetAllMembers(); -// -// foreach ($members as $member) { -// try { -// $this->circlesRequest->forceGetCircle($member->getCircleId()); -// } catch (CircleDoesNotExistException $e) { -// $this->membersRequest->removeMember($member); -// } -// } + // $members = $this->membersRequest->forceGetAllMembers(); + // + // foreach ($members as $member) { + // try { + // $this->circlesRequest->forceGetCircle($member->getCircleId()); + // } catch (CircleDoesNotExistException $e) { + // $this->membersRequest->removeMember($member); + // } + // } } diff --git a/lib/Service/MemberService.php b/lib/Service/MemberService.php index 138816ba0..be0c60a73 100644 --- a/lib/Service/MemberService.php +++ b/lib/Service/MemberService.php @@ -120,17 +120,17 @@ public function __construct( $this->remoteStreamService = $remoteStreamService; } -// -// /** -// * @param Member $member -// * -// * @throws MemberAlreadyExistsException -// */ -// public function saveMember(Member $member) { -// $member->setId($this->token(Member::ID_LENGTH)); -// $this->memberRequest->save($member); -// } -// + // + // /** + // * @param Member $member + // * + // * @throws MemberAlreadyExistsException + // */ + // public function saveMember(Member $member) { + // $member->setId($this->token(Member::ID_LENGTH)); + // $this->memberRequest->save($member); + // } + // /** diff --git a/lib/Service/MembersService.php b/lib/Service/MembersService.php index 68c661cd6..a8e702be2 100644 --- a/lib/Service/MembersService.php +++ b/lib/Service/MembersService.php @@ -26,12 +26,6 @@ namespace OCA\Circles\Service; -use OCA\Circles\Tools\Exceptions\RequestNetworkException; -use OCA\Circles\Tools\Exceptions\RequestResultNotJsonException; -use OCA\Circles\Tools\Model\NCRequest; -use OCA\Circles\Tools\Model\Request; -use OCA\Circles\Tools\Traits\TNCRequest; -use OCA\Circles\Tools\Traits\TArrayTools; use Exception; use OC; use OC\User\NoUserException; @@ -54,6 +48,12 @@ use OCA\Circles\Model\DeprecatedCircle; use OCA\Circles\Model\DeprecatedMember; use OCA\Circles\Model\GlobalScale\GSEvent; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\RequestResultNotJsonException; +use OCA\Circles\Tools\Model\NCRequest; +use OCA\Circles\Tools\Model\Request; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TNCRequest; use OCP\IL10N; use OCP\IUserManager; @@ -217,10 +217,10 @@ private function addSingleMember( $new = $event->getMember(); $new->setJoined($this->l10n->t('now')); if ($circle->getType() === DeprecatedCircle::CIRCLES_CLOSED) { -// $new->setLevel(Member::LEVEL_MEMBER); + // $new->setLevel(Member::LEVEL_MEMBER); $new->setStatus(DeprecatedMember::STATUS_INVITED); } else { -// $new->setLevel(Member::LEVEL_MEMBER); + // $new->setLevel(Member::LEVEL_MEMBER); $new->setStatus(DeprecatedMember::STATUS_MEMBER); } @@ -339,7 +339,7 @@ public function verifyIdentBasedOnItsType(&$ident, $type, string $instance = '') $this->verifyIdentLocalMember($ident, $type, $instance); $this->verifyIdentEmailAddress($ident, $type); -// $this->verifyIdentContact($ident, $type); + // $this->verifyIdentContact($ident, $type); } diff --git a/lib/Service/MigrationService.php b/lib/Service/MigrationService.php index a5067b103..090daadb6 100644 --- a/lib/Service/MigrationService.php +++ b/lib/Service/MigrationService.php @@ -189,7 +189,7 @@ public function migration(bool $force = false): void { if ($force) { $this->configService->setAppValue(ConfigService::MIGRATION_22, '0'); $this->configService->setAppValue(ConfigService::MIGRATION_22_1, '0'); -// $this->configService->setAppValue(ConfigService::MIGRATION_23, '0'); + // $this->configService->setAppValue(ConfigService::MIGRATION_23, '0'); } $this->appCircle = $this->federatedUserService->getAppInitiator( diff --git a/lib/Service/MiscService.php b/lib/Service/MiscService.php index f7e59d06e..956dced9c 100644 --- a/lib/Service/MiscService.php +++ b/lib/Service/MiscService.php @@ -26,13 +26,13 @@ namespace OCA\Circles\Service; -use OCA\Circles\Tools\Traits\TArrayTools; use Exception; use OC; use OC\User\NoUserException; use OCA\Circles\AppInfo\Application; use OCA\Circles\Exceptions\MissingKeyInArrayException; use OCA\Circles\Model\DeprecatedMember; +use OCA\Circles\Tools\Traits\TArrayTools; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; use OCP\Contacts\ContactsMenu\IContactsStore; diff --git a/lib/Service/NotificationService.php b/lib/Service/NotificationService.php index 6853c68cf..a9342311f 100644 --- a/lib/Service/NotificationService.php +++ b/lib/Service/NotificationService.php @@ -34,11 +34,11 @@ namespace OCA\Circles\Service; -use OCA\Circles\Tools\Traits\TNCLogger; use OCA\Circles\AppInfo\Application; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Exceptions\RequestBuilderException; use OCA\Circles\Model\Member; +use OCA\Circles\Tools\Traits\TNCLogger; use OCP\IURLGenerator; use OCP\Notification\IManager as INotificationManager; use OCP\Notification\INotification; @@ -125,9 +125,9 @@ public function notificationInvited(Member $member): void { * @throws RequestBuilderException */ public function notificationRequested(Member $member): void { -// if ($member->getUserType() !== Member::TYPE_USER || !$member->isLocal()) { -// return; -// } + // if ($member->getUserType() !== Member::TYPE_USER || !$member->isLocal()) { + // return; + // } $this->deleteNotification('member', $member->getId()); @@ -182,15 +182,15 @@ public function notificationRequested(Member $member): void { * @param string $objectId */ public function deleteNotification(string $object, string $objectId) { -// if ($objectId === '') { -// return; -// } -// -// $notification = $this->notificationManager->createNotification(); -// $notification->setApp('circles') -// ->setObject($object, $objectId); -// -// $this->notificationManager->markProcessed($notification); + // if ($objectId === '') { + // return; + // } + // + // $notification = $this->notificationManager->createNotification(); + // $notification->setApp('circles') + // ->setObject($object, $objectId); + // + // $this->notificationManager->markProcessed($notification); } diff --git a/lib/Service/RemoteDownstreamService.php b/lib/Service/RemoteDownstreamService.php index ad37b906a..fdf969986 100644 --- a/lib/Service/RemoteDownstreamService.php +++ b/lib/Service/RemoteDownstreamService.php @@ -31,11 +31,6 @@ namespace OCA\Circles\Service; -use OCA\Circles\Tools\Exceptions\InvalidItemException; -use OCA\Circles\Tools\Exceptions\RequestNetworkException; -use OCA\Circles\Tools\Exceptions\SignatoryException; -use OCA\Circles\Tools\Traits\TAsync; -use OCA\Circles\Tools\Traits\TNCLogger; use Exception; use OCA\Circles\Db\CircleRequest; use OCA\Circles\Db\MemberRequest; @@ -54,6 +49,11 @@ use OCA\Circles\Exceptions\UnknownRemoteException; use OCA\Circles\Model\Federated\FederatedEvent; use OCA\Circles\Model\Probes\CircleProbe; +use OCA\Circles\Tools\Exceptions\InvalidItemException; +use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Exceptions\SignatoryException; +use OCA\Circles\Tools\Traits\TAsync; +use OCA\Circles\Tools\Traits\TNCLogger; /** * Class RemoteDownstreamService @@ -106,25 +106,25 @@ public function __construct( } -// -// -// /** -// * @param GSEvent $event -// * -// * @throws CircleDoesNotExistException -// * @throws ConfigNoCircleAvailableException -// * @throws GSKeyException -// * @throws GlobalScaleDSyncException -// * @throws GlobalScaleEventException -// */ -// public function statusEvent(GSEvent $event) { -// $this->globalScaleService->checkEvent($event); -// -// $gs = $this->globalScaleService->getGlobalScaleEvent($event); -// $gs->verify($event, false); -// $gs->manage($event); -// } -// + // + // + // /** + // * @param GSEvent $event + // * + // * @throws CircleDoesNotExistException + // * @throws ConfigNoCircleAvailableException + // * @throws GSKeyException + // * @throws GlobalScaleDSyncException + // * @throws GlobalScaleEventException + // */ + // public function statusEvent(GSEvent $event) { + // $this->globalScaleService->checkEvent($event); + // + // $gs = $this->globalScaleService->getGlobalScaleEvent($event); + // $gs->verify($event, false); + // $gs->manage($event); + // } + // /** diff --git a/lib/Service/RemoteService.php b/lib/Service/RemoteService.php index cd4bba13c..59ee843bf 100644 --- a/lib/Service/RemoteService.php +++ b/lib/Service/RemoteService.php @@ -288,11 +288,11 @@ public function getMembershipsFromInstance(string $circleId, string $instance, a * @throws RemoteInstanceException */ public function syncCircle(Circle $circle): void { -// if ($this->configService->isLocalInstance($circle->getInstance())) { -// $this->syncLocalCircle($circle); -// } else { + // if ($this->configService->isLocalInstance($circle->getInstance())) { + // $this->syncLocalCircle($circle); + // } else { $this->syncRemoteCircle($circle->getSingleId(), $circle->getInstance()); -// } + // } } diff --git a/lib/Service/RemoteStreamService.php b/lib/Service/RemoteStreamService.php index 4c49f2c27..c2ad25edf 100644 --- a/lib/Service/RemoteStreamService.php +++ b/lib/Service/RemoteStreamService.php @@ -283,7 +283,7 @@ private function requestRemoteInstance( try { $app = $this->getAppSignatory(); -// $app->setAlgorithm(NCSignatory::SHA512); + // $app->setAlgorithm(NCSignatory::SHA512); $signedRequest = $this->signOutgoingRequest($request, $app); $this->doRequest($signedRequest->getOutgoingRequest(), false); } catch (RequestNetworkException | SignatoryException $e) { diff --git a/lib/Service/RemoteUpstreamService.php b/lib/Service/RemoteUpstreamService.php index e5346e845..8473d959a 100644 --- a/lib/Service/RemoteUpstreamService.php +++ b/lib/Service/RemoteUpstreamService.php @@ -31,9 +31,6 @@ namespace OCA\Circles\Service; -use OCA\Circles\Tools\Model\Request; -use OCA\Circles\Tools\Model\SimpleDataStore; -use OCA\Circles\Tools\Traits\TNCRequest; use OCA\Circles\Db\EventWrapperRequest; use OCA\Circles\Exceptions\FederatedItemException; use OCA\Circles\Exceptions\OwnerNotFoundException; @@ -44,6 +41,9 @@ use OCA\Circles\Model\Federated\EventWrapper; use OCA\Circles\Model\Federated\FederatedEvent; use OCA\Circles\Model\Federated\RemoteInstance; +use OCA\Circles\Tools\Model\Request; +use OCA\Circles\Tools\Model\SimpleDataStore; +use OCA\Circles\Tools\Traits\TNCRequest; /** * Class RemoteUpstreamService @@ -151,166 +151,166 @@ public function confirmEvent(FederatedEvent $event): void { // // -// /** -// * @param array $sync -// * -// * @throws GSStatusException -// */ -// public function synchronize(array $sync) { -// $this->configService->getGSStatus(); -// -// $this->synchronizeCircles($sync); -// $this->removeDeprecatedCircles(); -// $this->removeDeprecatedEvents(); -// } + // /** + // * @param array $sync + // * + // * @throws GSStatusException + // */ + // public function synchronize(array $sync) { + // $this->configService->getGSStatus(); + // + // $this->synchronizeCircles($sync); + // $this->removeDeprecatedCircles(); + // $this->removeDeprecatedEvents(); + // } -// /** -// * @param array $circles -// */ -// public function synchronizeCircles(array $circles): void { -// $event = new GSEvent(GSEvent::GLOBAL_SYNC, true); -// $event->setSource($this->configService->getLocalInstance()); -// $event->setData(new SimpleDataStore($circles)); -// -// foreach ($this->federatedEventService->getInstances() as $instance) { -// try { -// $this->broadcastEvent($event, $instance); -// } catch (RequestContentException | RequestNetworkException | RequestResultSizeException | RequestServerException | RequestResultNotJsonException $e) { -// } -// } -// } -// -// -// /** -// * -// */ -// private function removeDeprecatedCircles() { -// $knownCircles = $this->circlesRequest->forceGetCircles(); -// foreach ($knownCircles as $knownItem) { -// if ($knownItem->getOwner() -// ->getInstance() === '') { -// continue; -// } -// -// try { -// $this->checkCircle($knownItem); -// } catch (GSStatusException $e) { -// } -// } -// } -// -// -// /** -// * @param DeprecatedCircle $circle -// * -// * @throws GSStatusException -// */ -// private function checkCircle(DeprecatedCircle $circle): void { -// $status = $this->confirmCircleStatus($circle); -// -// if (!$status) { -// $this->circlesRequest->destroyCircle($circle->getUniqueId()); -// $this->membersRequest->removeAllFromCircle($circle->getUniqueId()); -// } -// } -// -// -// /** -// * @param DeprecatedCircle $circle -// * -// * @return bool -// * @throws GSStatusException -// */ -// public function confirmCircleStatus(DeprecatedCircle $circle): bool { -// $event = new GSEvent(GSEvent::CIRCLE_STATUS, true); -// $event->setSource($this->configService->getLocalInstance()); -// $event->setDeprecatedCircle($circle); -// -// $this->signEvent($event); -// -// $path = $this->urlGenerator->linkToRoute('circles.EventWrapper.status'); -// $request = new NC22Request($path, Request::TYPE_POST); -// $this->configService->configureRequest($request); -// $request->setDataSerialize($event); -// -// $requestIssue = false; -// $notFound = false; -// $foundWithNoOwner = false; -// foreach ($this->federatedEventService->getInstances() as $instance) { -// $request->setHost($instance); -// -// try { -// $result = $this->retrieveJson($request); -// if ($this->getInt('status', $result, 0) !== 1) { -// throw new RequestContentException('result status is not good'); -// } -// -// $status = $this->getInt('success.data.status', $result); -// -// // if error, we assume the circle might still exist. -// if ($status === CircleStatus::STATUS_ERROR) { -// return true; -// } -// -// if ($status === CircleStatus::STATUS_OK) { -// return true; -// } -// -// // TODO: check the data.supposedOwner entry. -// if ($status === CircleStatus::STATUS_NOT_OWNER) { -// $foundWithNoOwner = true; -// } -// -// if ($status === CircleStatus::STATUS_NOT_FOUND) { -// $notFound = true; -// } -// -// } catch (RequestContentException -// | RequestNetworkException -// | RequestResultNotJsonException -// | RequestResultSizeException -// | RequestServerException $e) { -// $requestIssue = true; -// // TODO: log instances that have network issue, after too many tries (7d), remove this circle. -// continue; -// } -// } -// -// // if no request issue, we can imagine that the instance that owns the circle is down. -// // We'll wait for more information (cf request exceptions management); -// if ($requestIssue) { -// return true; -// } -// -// // circle were not found in any other instances, we can easily says that the circle does not exists anymore -// if ($notFound && !$foundWithNoOwner) { -// return false; -// } -// -// // circle were found everywhere but with no owner on every instance. we need to assign a new owner. -// // This should be done by checking admin rights. if no admin rights, let's assume that circle should be removed. -// if (!$notFound && $foundWithNoOwner) { -// // TODO: assign a new owner and check that when changing owner, we do check that the destination instance is updated FOR SURE! -// return true; -// } -// -// // some instances returned notFound, some returned circle with no owner. let's assume the circle is deprecated. -// return false; -// } -// -// /** -// * @throws GSStatusException -// */ -// public function syncEvents() { -// -// } -// -// /** -// * -// */ -// private function removeDeprecatedEvents() { -//// $this->deprecatedEvents(); -// -// } + // /** + // * @param array $circles + // */ + // public function synchronizeCircles(array $circles): void { + // $event = new GSEvent(GSEvent::GLOBAL_SYNC, true); + // $event->setSource($this->configService->getLocalInstance()); + // $event->setData(new SimpleDataStore($circles)); + // + // foreach ($this->federatedEventService->getInstances() as $instance) { + // try { + // $this->broadcastEvent($event, $instance); + // } catch (RequestContentException | RequestNetworkException | RequestResultSizeException | RequestServerException | RequestResultNotJsonException $e) { + // } + // } + // } + // + // + // /** + // * + // */ + // private function removeDeprecatedCircles() { + // $knownCircles = $this->circlesRequest->forceGetCircles(); + // foreach ($knownCircles as $knownItem) { + // if ($knownItem->getOwner() + // ->getInstance() === '') { + // continue; + // } + // + // try { + // $this->checkCircle($knownItem); + // } catch (GSStatusException $e) { + // } + // } + // } + // + // + // /** + // * @param DeprecatedCircle $circle + // * + // * @throws GSStatusException + // */ + // private function checkCircle(DeprecatedCircle $circle): void { + // $status = $this->confirmCircleStatus($circle); + // + // if (!$status) { + // $this->circlesRequest->destroyCircle($circle->getUniqueId()); + // $this->membersRequest->removeAllFromCircle($circle->getUniqueId()); + // } + // } + // + // + // /** + // * @param DeprecatedCircle $circle + // * + // * @return bool + // * @throws GSStatusException + // */ + // public function confirmCircleStatus(DeprecatedCircle $circle): bool { + // $event = new GSEvent(GSEvent::CIRCLE_STATUS, true); + // $event->setSource($this->configService->getLocalInstance()); + // $event->setDeprecatedCircle($circle); + // + // $this->signEvent($event); + // + // $path = $this->urlGenerator->linkToRoute('circles.EventWrapper.status'); + // $request = new NC22Request($path, Request::TYPE_POST); + // $this->configService->configureRequest($request); + // $request->setDataSerialize($event); + // + // $requestIssue = false; + // $notFound = false; + // $foundWithNoOwner = false; + // foreach ($this->federatedEventService->getInstances() as $instance) { + // $request->setHost($instance); + // + // try { + // $result = $this->retrieveJson($request); + // if ($this->getInt('status', $result, 0) !== 1) { + // throw new RequestContentException('result status is not good'); + // } + // + // $status = $this->getInt('success.data.status', $result); + // + // // if error, we assume the circle might still exist. + // if ($status === CircleStatus::STATUS_ERROR) { + // return true; + // } + // + // if ($status === CircleStatus::STATUS_OK) { + // return true; + // } + // + // // TODO: check the data.supposedOwner entry. + // if ($status === CircleStatus::STATUS_NOT_OWNER) { + // $foundWithNoOwner = true; + // } + // + // if ($status === CircleStatus::STATUS_NOT_FOUND) { + // $notFound = true; + // } + // + // } catch (RequestContentException + // | RequestNetworkException + // | RequestResultNotJsonException + // | RequestResultSizeException + // | RequestServerException $e) { + // $requestIssue = true; + // // TODO: log instances that have network issue, after too many tries (7d), remove this circle. + // continue; + // } + // } + // + // // if no request issue, we can imagine that the instance that owns the circle is down. + // // We'll wait for more information (cf request exceptions management); + // if ($requestIssue) { + // return true; + // } + // + // // circle were not found in any other instances, we can easily says that the circle does not exists anymore + // if ($notFound && !$foundWithNoOwner) { + // return false; + // } + // + // // circle were found everywhere but with no owner on every instance. we need to assign a new owner. + // // This should be done by checking admin rights. if no admin rights, let's assume that circle should be removed. + // if (!$notFound && $foundWithNoOwner) { + // // TODO: assign a new owner and check that when changing owner, we do check that the destination instance is updated FOR SURE! + // return true; + // } + // + // // some instances returned notFound, some returned circle with no owner. let's assume the circle is deprecated. + // return false; + // } + // + // /** + // * @throws GSStatusException + // */ + // public function syncEvents() { + // + // } + // + // /** + // * + // */ + // private function removeDeprecatedEvents() { + //// $this->deprecatedEvents(); + // + // } } diff --git a/lib/Service/SearchService.php b/lib/Service/SearchService.php index 1d2d17858..15e0c4f10 100644 --- a/lib/Service/SearchService.php +++ b/lib/Service/SearchService.php @@ -38,9 +38,9 @@ use OCA\Circles\IFederatedUser; use OCA\Circles\ISearch; use OCA\Circles\Model\Circle; -use OCA\Circles\Model\SearchResult; use OCA\Circles\Model\Member; use OCA\Circles\Model\Probes\CircleProbe; +use OCA\Circles\Model\SearchResult; use OCA\Circles\Search\FederatedUsers; use OCA\Circles\Search\UnifiedSearchResult; use OCA\Circles\Tools\Traits\TArrayTools; diff --git a/lib/Service/SendMailService.php b/lib/Service/SendMailService.php index 0662578f6..d141e5ea9 100644 --- a/lib/Service/SendMailService.php +++ b/lib/Service/SendMailService.php @@ -276,12 +276,12 @@ private function sendMailPassword( ] ); $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]); -// if ($initiatorEmailAddress !== null) { -// $message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]); -// $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan()); -// } else { + // if ($initiatorEmailAddress !== null) { + // $message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]); + // $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan()); + // } else { $emailTemplate->addFooter(); -// } + // } $message->setTo([$email]); $message->useTemplate($emailTemplate); diff --git a/lib/Service/ShareService.php b/lib/Service/ShareService.php index 5f5b1bf3a..3a857aa00 100644 --- a/lib/Service/ShareService.php +++ b/lib/Service/ShareService.php @@ -63,8 +63,8 @@ public function __construct(FederatedEventService $federatedEventService, Config * @param Circle $circle */ public function syncRemoteShares(Circle $circle) { -// $event = new FederatedEvent(SharedItemsSync::class); -// $event->setCircle($circle); -// $this->federatedEventService->newEvent($event); + // $event = new FederatedEvent(SharedItemsSync::class); + // $event->setCircle($circle); + // $this->federatedEventService->newEvent($event); } } diff --git a/lib/Service/ShareWrapperService.php b/lib/Service/ShareWrapperService.php index a6ffe2528..9f1a2141e 100644 --- a/lib/Service/ShareWrapperService.php +++ b/lib/Service/ShareWrapperService.php @@ -41,11 +41,11 @@ use OCA\Circles\Tools\Exceptions\InvalidItemException; use OCA\Circles\Tools\Traits\TDeserialize; use OCA\Circles\Tools\Traits\TStringTools; +use OCP\Files\Folder; use OCP\Files\NotFoundException; use OCP\ICache; use OCP\ICacheFactory; use OCP\Share\IShare; -use OCP\Files\Folder; /** * Class ShareWrapperService diff --git a/lib/ShareByCircleProvider.php b/lib/ShareByCircleProvider.php index 5a837a2a7..3ba5109fc 100644 --- a/lib/ShareByCircleProvider.php +++ b/lib/ShareByCircleProvider.php @@ -676,26 +676,26 @@ public function getChildren(IShare $parent): array { * @return iterable */ public function getAllShares(): iterable { -// $qb = $this->dbConnection->getQueryBuilder(); -// -// $qb->select(' * ') -// ->from('share') -// ->where( -// $qb->expr() -// ->orX( -// $qb->expr() -// ->eq('share_type', $qb->createNamedParameter(IShare::TYPE_CIRCLE)) -// ) -// ); -// -// $cursor = $qb->execute(); -// while ($data = $cursor->fetch()) { -// try { -// yield $this->createShareObject($data); -// } catch (IllegalIDChangeException $e) { -// }; -// } -// $cursor->closeCursor(); + // $qb = $this->dbConnection->getQueryBuilder(); + // + // $qb->select(' * ') + // ->from('share') + // ->where( + // $qb->expr() + // ->orX( + // $qb->expr() + // ->eq('share_type', $qb->createNamedParameter(IShare::TYPE_CIRCLE)) + // ) + // ); + // + // $cursor = $qb->execute(); + // while ($data = $cursor->fetch()) { + // try { + // yield $this->createShareObject($data); + // } catch (IllegalIDChangeException $e) { + // }; + // } + // $cursor->closeCursor(); return []; } } diff --git a/lib/Tools/Traits/TNCRequest.php b/lib/Tools/Traits/TNCRequest.php index 1528fb2d1..e1d949b46 100644 --- a/lib/Tools/Traits/TNCRequest.php +++ b/lib/Tools/Traits/TNCRequest.php @@ -31,11 +31,11 @@ namespace OCA\Circles\Tools\Traits; -use OCA\Circles\Tools\Model\NCRequest; use Exception; use GuzzleHttp\Exception\ClientException; use OC; use OCA\Circles\Tools\Exceptions\RequestNetworkException; +use OCA\Circles\Tools\Model\NCRequest; use OCA\Circles\Tools\Model\NCRequestResult; use OCA\Circles\Tools\Model\Request; use OCP\Http\Client\IClientService; diff --git a/lib/UnifiedSearch/UnifiedSearchProvider.php b/lib/UnifiedSearch/UnifiedSearchProvider.php index a8df02cf9..8077c015e 100644 --- a/lib/UnifiedSearch/UnifiedSearchProvider.php +++ b/lib/UnifiedSearch/UnifiedSearchProvider.php @@ -31,13 +31,13 @@ namespace OCA\Circles\UnifiedSearch; -use OCA\Circles\Tools\Traits\TNCLogger; use Exception; use OCA\Circles\AppInfo\Application; use OCA\Circles\Model\Circle; use OCA\Circles\Model\Probes\CircleProbe; use OCA\Circles\Service\CircleService; use OCA\Circles\Service\FederatedUserService; +use OCA\Circles\Tools\Traits\TNCLogger; use OCP\IL10N; use OCP\IURLGenerator; use OCP\IUser; diff --git a/tests/TestSuiteListener.php b/tests/TestSuiteListener.php index a6c873ad0..1248112e8 100644 --- a/tests/TestSuiteListener.php +++ b/tests/TestSuiteListener.php @@ -28,10 +28,10 @@ namespace OCA\Circles\Tests; use OCA\Circles\Model\DeprecatedCircle; -use PHPUnit\Framework\TestListener; +use PHPUnit\Framework\AssertionFailedError; use PHPUnit\Framework\Test; +use PHPUnit\Framework\TestListener; use PHPUnit\Framework\TestSuite; -use PHPUnit\Framework\AssertionFailedError; use PHPUnit\Framework\Warning; use Throwable;