diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ce3478e..2f0f35b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [7.2, 7.3, 7.4, 8.0] + php-versions: [7.3, 7.4, 8.0] name: php${{ matrix.php-versions }} lint steps: - name: Checkout diff --git a/.github/workflows/php-test.yml b/.github/workflows/php-test.yml index e28b913..a1696e4 100644 --- a/.github/workflows/php-test.yml +++ b/.github/workflows/php-test.yml @@ -12,12 +12,7 @@ jobs: strategy: matrix: php-versions: ['7.4', '8'] - nextcloud-versions: ['stable22', 'stable23', 'stable24'] - include: - - php-versions: '7.3' - nextcloud-versions: 'stable22' - - php-versions: '7.3' - nextcloud-versions: 'stable23' + nextcloud-versions: ['stable23', 'stable24', 'stable25'] name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests env: CI: true @@ -39,7 +34,7 @@ jobs: path: nextcloud/apps/bbb - name: Update test stub working-directory: nextcloud/apps/bbb - run: composer update friendsofphp/php-cs-fixer christophwurst/nextcloud -W + run: composer update friendsofphp/php-cs-fixer nextcloud/ocp -W - name: Install dependencies working-directory: nextcloud/apps/bbb run: composer install diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 9505423..7be4899 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ocp-version: [ 'dev-stable24', 'dev-stable23', 'dev-stable22' ] + ocp-version: [ 'dev-stable25', 'dev-stable24', 'dev-stable23' ] name: Nextcloud ${{ matrix.ocp-version }} steps: - name: Checkout @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: composer i - name: Install dependencies - run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }} + run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} - name: Run coding standards check run: composer run psalm diff --git a/.gitignore b/.gitignore index 40b76e7..47d1685 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ node_modules/ /archives/ .phpunit.result.cache .vscode/settings.json +.php-cs-fixer.cache \ No newline at end of file diff --git a/.php_cs.dist b/.php-cs-fixer.dist.php similarity index 100% rename from .php_cs.dist rename to .php-cs-fixer.dist.php diff --git a/appinfo/info.xml b/appinfo/info.xml index 199667f..78d1ab1 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -22,7 +22,7 @@ Developer wanted! If you have time it would be awesome if you could help to enha *This app integrates BigBlueButton and is not endorsed or certified by BigBlueButton Inc. BigBlueButton and the BigBlueButton Logo are trademarks of BigBlueButton Inc.* ]]> - 2.3.1 + 2.4.0-alpha agpl Klaus Herberth BigBlueButton @@ -43,7 +43,7 @@ Developer wanted! If you have time it would be awesome if you could help to enha curl mbstring SimpleXML - + OCA\BigBlueButton\Command\ClearAvatarCache diff --git a/composer.json b/composer.json index fe084d6..7ec05e8 100644 --- a/composer.json +++ b/composer.json @@ -14,10 +14,10 @@ }, "require-dev": { "phpunit/phpunit": "^8.5 || ^9.3", - "friendsofphp/php-cs-fixer": "^2.16", - "nextcloud/coding-standard": "^0.5.0", + "friendsofphp/php-cs-fixer": "^3", + "nextcloud/coding-standard": "^1.0.0", "phpstan/phpstan": "^0.12.29", - "christophwurst/nextcloud": "^22.0 || ^23.0 || ^24.0", + "nextcloud/ocp": "^23.0 || ^24.0 || ^25.0", "vimeo/psalm": "^4.5" }, "config": { diff --git a/composer.lock b/composer.lock index e3fc72d..c9aa7b9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b534c93074ca28389a328b1fa90949d8", + "content-hash": "434f3b95fbfba97b03d130cd3fb92140", "packages": [ { "name": "littleredbutton/bigbluebutton-api-php", - "version": "4.2.0", + "version": "4.3.0", "source": { "type": "git", "url": "https://github.com/littleredbutton/bigbluebutton-api-php.git", - "reference": "2023fe0d6e88a3f7a969a9a06124ef31331c992f" + "reference": "ea8c6fa7676d9876b13d12be496b6f5b5a6cf4d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/littleredbutton/bigbluebutton-api-php/zipball/2023fe0d6e88a3f7a969a9a06124ef31331c992f", - "reference": "2023fe0d6e88a3f7a969a9a06124ef31331c992f", + "url": "https://api.github.com/repos/littleredbutton/bigbluebutton-api-php/zipball/ea8c6fa7676d9876b13d12be496b6f5b5a6cf4d9", + "reference": "ea8c6fa7676d9876b13d12be496b6f5b5a6cf4d9", "shasum": "" }, "require": { @@ -28,22 +28,14 @@ "php": ">=7.2" }, "require-dev": { - "brainmaestro/composer-git-hooks": "^2.8", - "composer/composer": "^1.10.0", - "fakerphp/faker": "^1.14", - "friendsofphp/php-cs-fixer": "2.*", "nyholm/psr7": "^1.4", - "php-coveralls/php-coveralls": "^2.4.0", - "phpunit/phpunit": "^8", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", "psr/http-message": "^1.0", - "squizlabs/php_codesniffer": "3.*", "symfony/dotenv": "^3.4|^4.0|^5.0", "symfony/http-client": "^4.4|^5.0", "symfony/http-client-contracts": "^1.1|^2.0", - "symfony/process": "^3.4|^4.0|^5.0", - "vimeo/psalm": "^4.5" + "symfony/process": "^3.4|^4.0|^5.0" }, "suggest": { "psr/http-client-implementation": "To use the PsrHttpClientTransport.", @@ -56,14 +48,26 @@ "extra": { "hooks": { "pre-commit": [ - "vendor/bin/php-cs-fixer fix --dry-run --allow-risky=yes" + "tools/php-cs-fixer fix --dry-run --allow-risky=yes" ], "pre-push": [ - "vendor/bin/phpunit --testsuite=\"BigBlueButton unit test suite,BigBlueButton integration test suite\"", - "vendor/bin/psalm --threads=1" + "tools/phpunit --testsuite=\"BigBlueButton unit test suite,BigBlueButton integration test suite\"", + "tools/psalm --threads=1" ], "post-merge": "composer install", "post-checkout": "composer install" + }, + "cotor": { + "brainmaestro/composer-git-hooks": "^2.8", + "extensions": { + "phpunit/phpunit": { + "fakerphp/faker": "^1.14" + } + }, + "friendsofphp/php-cs-fixer": "^3.3", + "php-coveralls/php-coveralls": "^2.4", + "phpunit/phpunit": "^8", + "vimeo/psalm": "^4.22" } }, "autoload": { @@ -81,7 +85,7 @@ "authors": [ { "name": "Ghazi Triki", - "email": "ghazi.nocturne@gmail.com", + "email": "ghazi.triki@riadvice.tn", "role": "Developer" }, { @@ -127,7 +131,7 @@ "issues": "https://github.com/littleredbutton/bigbluebutton-api-php/issues", "source": "https://github.com/littleredbutton/bigbluebutton-api-php/" }, - "time": "2022-03-16T18:28:56+00:00" + "time": "2022-06-10T18:50:51+00:00" } ], "packages-dev": [ @@ -297,49 +301,6 @@ ], "time": "2021-03-30T17:13:30+00:00" }, - { - "name": "christophwurst/nextcloud", - "version": "v24.0.1", - "source": { - "type": "git", - "url": "https://github.com/ChristophWurst/nextcloud_composer.git", - "reference": "f032acdff1502a7323f95a6524d163290f43b446" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/f032acdff1502a7323f95a6524d163290f43b446", - "reference": "f032acdff1502a7323f95a6524d163290f43b446", - "shasum": "" - }, - "require": { - "php": "^7.4 || ~8.0 || ~8.1", - "psr/container": "^1.1.1", - "psr/event-dispatcher": "^1.0", - "psr/log": "^1.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "24.0.0-dev" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "AGPL-3.0-or-later" - ], - "authors": [ - { - "name": "Christoph Wurst", - "email": "christoph@winzerhof-wurst.at" - } - ], - "description": "Composer package containing Nextcloud's public API (classes, interfaces)", - "support": { - "issues": "https://github.com/ChristophWurst/nextcloud_composer/issues", - "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/v24.0.1" - }, - "time": "2022-06-02T14:16:47+00:00" - }, { "name": "composer/package-versions-deprecated", "version": "1.11.99.5", @@ -415,30 +376,30 @@ }, { "name": "composer/pcre", - "version": "1.0.1", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560" + "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560", - "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560", + "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd", + "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "phpstan/phpstan": "^1.3", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^4.2 || ^5" + "symfony/phpunit-bridge": "^5" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.x-dev" + "dev-main": "3.x-dev" } }, "autoload": { @@ -466,7 +427,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/1.0.1" + "source": "https://github.com/composer/pcre/tree/3.0.0" }, "funding": [ { @@ -482,7 +443,7 @@ "type": "tidelift" } ], - "time": "2022-01-21T20:24:37+00:00" + "time": "2022-02-25T20:21:48+00:00" }, { "name": "composer/semver", @@ -567,27 +528,27 @@ }, { "name": "composer/xdebug-handler", - "version": "2.0.5", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a" + "reference": "ced299686f41dce890debac69273b47ffe98a40c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a", - "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", + "reference": "ced299686f41dce890debac69273b47ffe98a40c", "shasum": "" }, "require": { - "composer/pcre": "^1", - "php": "^5.3.2 || ^7.0 || ^8.0", + "composer/pcre": "^1 || ^2 || ^3", + "php": "^7.2.5 || ^8.0", "psr/log": "^1 || ^2 || ^3" }, "require-dev": { "phpstan/phpstan": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0" + "symfony/phpunit-bridge": "^6.0" }, "type": "library", "autoload": { @@ -613,7 +574,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/2.0.5" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" }, "funding": [ { @@ -629,7 +590,7 @@ "type": "tidelift" } ], - "time": "2022-02-24T20:20:32+00:00" + "time": "2022-02-25T21:32:43+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -990,85 +951,65 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.19.3", + "version": "v3.12.0", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8" + "reference": "eae11d945e2885d86e1c080eec1bb30a2aa27998" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/75ac86f33fab4714ea5a39a396784d83ae3b5ed8", - "reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/eae11d945e2885d86e1c080eec1bb30a2aa27998", + "reference": "eae11d945e2885d86e1c080eec1bb30a2aa27998", "shasum": "" }, "require": { - "composer/semver": "^1.4 || ^2.0 || ^3.0", - "composer/xdebug-handler": "^1.2 || ^2.0", - "doctrine/annotations": "^1.2", + "composer/semver": "^3.2", + "composer/xdebug-handler": "^3.0.3", + "doctrine/annotations": "^1.13", "ext-json": "*", "ext-tokenizer": "*", - "php": "^5.6 || ^7.0 || ^8.0", - "php-cs-fixer/diff": "^1.3", - "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0", - "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0", - "symfony/filesystem": "^3.0 || ^4.0 || ^5.0", - "symfony/finder": "^3.0 || ^4.0 || ^5.0", - "symfony/options-resolver": "^3.0 || ^4.0 || ^5.0", - "symfony/polyfill-php70": "^1.0", - "symfony/polyfill-php72": "^1.4", - "symfony/process": "^3.0 || ^4.0 || ^5.0", - "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0" + "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.23", + "symfony/polyfill-php80": "^1.25", + "symfony/polyfill-php81": "^1.25", + "symfony/process": "^5.4 || ^6.0", + "symfony/stopwatch": "^5.4 || ^6.0" }, "require-dev": { - "justinrainbow/json-schema": "^5.0", - "keradus/cli-executor": "^1.4", - "mikey179/vfsstream": "^1.6", - "php-coveralls/php-coveralls": "^2.4.2", - "php-cs-fixer/accessible-object": "^1.0", + "justinrainbow/json-schema": "^5.2", + "keradus/cli-executor": "^1.5", + "mikey179/vfsstream": "^1.6.10", + "php-coveralls/php-coveralls": "^2.5.2", + "php-cs-fixer/accessible-object": "^1.1", "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", - "phpspec/prophecy-phpunit": "^1.1 || ^2.0", - "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.5", - "phpunitgoodpractices/polyfill": "^1.5", - "phpunitgoodpractices/traits": "^1.9.1", - "sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1", - "symfony/phpunit-bridge": "^5.2.1", - "symfony/yaml": "^3.0 || ^4.0 || ^5.0" + "phpspec/prophecy": "^1.15", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.5", + "phpunitgoodpractices/polyfill": "^1.6", + "phpunitgoodpractices/traits": "^1.9.2", + "symfony/phpunit-bridge": "^6.0", + "symfony/yaml": "^5.4 || ^6.0" }, "suggest": { "ext-dom": "For handling output formats in XML", - "ext-mbstring": "For handling non-UTF8 characters.", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.", - "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." + "ext-mbstring": "For handling non-UTF8 characters." }, "bin": [ "php-cs-fixer" ], "type": "application", - "extra": { - "branch-alias": { - "dev-master": "2.19-dev" - } - }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" - }, - "classmap": [ - "tests/Test/AbstractFixerTestCase.php", - "tests/Test/AbstractIntegrationCaseFactory.php", - "tests/Test/AbstractIntegrationTestCase.php", - "tests/Test/Assert/AssertTokensTrait.php", - "tests/Test/IntegrationCase.php", - "tests/Test/IntegrationCaseFactory.php", - "tests/Test/IntegrationCaseFactoryInterface.php", - "tests/Test/InternalIntegrationCaseFactory.php", - "tests/Test/IsIdenticalConstraint.php", - "tests/Test/TokensWithObservedTransformers.php", - "tests/TestCase.php" - ] + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1087,7 +1028,7 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.3" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.12.0" }, "funding": [ { @@ -1095,7 +1036,7 @@ "type": "github" } ], - "time": "2021-11-15T17:17:55+00:00" + "time": "2022-10-12T14:20:51+00:00" }, { "name": "myclabs/deep-copy", @@ -1209,21 +1150,21 @@ }, { "name": "nextcloud/coding-standard", - "version": "v0.5.0", + "version": "v1.0.0", "source": { "type": "git", "url": "https://github.com/nextcloud/coding-standard.git", - "reference": "742ed895ae76c10daf95e08488cfb3f554199f40" + "reference": "f3d1f9375e89c605deb1734f59a9f51ecbe80578" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/742ed895ae76c10daf95e08488cfb3f554199f40", - "reference": "742ed895ae76c10daf95e08488cfb3f554199f40", + "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/f3d1f9375e89c605deb1734f59a9f51ecbe80578", + "reference": "f3d1f9375e89c605deb1734f59a9f51ecbe80578", "shasum": "" }, "require": { - "friendsofphp/php-cs-fixer": "^2.17", - "php": "^7.2|^8.0" + "friendsofphp/php-cs-fixer": "^3.2", + "php": "^7.3|^8.0" }, "type": "library", "autoload": { @@ -1244,22 +1185,64 @@ "description": "Nextcloud coding standards for the php cs fixer", "support": { "issues": "https://github.com/nextcloud/coding-standard/issues", - "source": "https://github.com/nextcloud/coding-standard/tree/v0.5.0" + "source": "https://github.com/nextcloud/coding-standard/tree/v1.0.0" }, - "time": "2021-01-11T14:15:58+00:00" + "time": "2021-11-10T08:44:10+00:00" }, { - "name": "nikic/php-parser", - "version": "v4.14.0", + "name": "nextcloud/ocp", + "version": "v24.0.1", "source": { "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1" + "url": "https://github.com/nextcloud-deps/ocp.git", + "reference": "f032acdff1502a7323f95a6524d163290f43b446" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1", - "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/f032acdff1502a7323f95a6524d163290f43b446", + "reference": "f032acdff1502a7323f95a6524d163290f43b446", + "shasum": "" + }, + "require": { + "php": "^7.4 || ~8.0 || ~8.1", + "psr/container": "^1.1.1", + "psr/event-dispatcher": "^1.0", + "psr/log": "^1.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "24.0.0-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "AGPL-3.0-or-later" + ], + "authors": [ + { + "name": "Christoph Wurst", + "email": "christoph@winzerhof-wurst.at" + } + ], + "description": "Composer package containing Nextcloud's public API (classes, interfaces)", + "support": { + "source": "https://github.com/nextcloud-deps/ocp/tree/v24.0.1" + }, + "time": "2022-06-02T14:16:47+00:00" + }, + { + "name": "nikic/php-parser", + "version": "v4.15.1", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", + "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", "shasum": "" }, "require": { @@ -1300,9 +1283,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1" }, - "time": "2022-05-31T20:59:12+00:00" + "time": "2022-09-04T07:30:47+00:00" }, { "name": "openlss/lib-array2xml", @@ -1468,61 +1451,6 @@ }, "time": "2022-02-21T01:04:05+00:00" }, - { - "name": "php-cs-fixer/diff", - "version": "v1.3.1", - "source": { - "type": "git", - "url": "https://github.com/PHP-CS-Fixer/diff.git", - "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759", - "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", - "symfony/process": "^3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - }, - { - "name": "SpacePossum" - } - ], - "description": "sebastian/diff v2 backport support for PHP5.6", - "homepage": "https://github.com/PHP-CS-Fixer", - "keywords": [ - "diff" - ], - "support": { - "issues": "https://github.com/PHP-CS-Fixer/diff/issues", - "source": "https://github.com/PHP-CS-Fixer/diff/tree/v1.3.1" - }, - "time": "2020-10-14T08:39:05+00:00" - }, { "name": "phpdocumentor/reflection-common", "version": "2.2.0", @@ -1635,25 +1563,30 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.1", + "version": "1.6.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "77a32518733312af16a44300404e945338981de3" + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", - "reference": "77a32518733312af16a44300404e945338981de3", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d", + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { "ext-tokenizer": "*", - "psalm/phar": "^4.8" + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^9.5", + "rector/rector": "^0.13.9", + "vimeo/psalm": "^4.25" }, "type": "library", "extra": { @@ -1679,76 +1612,9 @@ "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.1" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2" }, - "time": "2022-03-15T21:29:03+00:00" - }, - { - "name": "phpspec/prophecy", - "version": "v1.15.0", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.2", - "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" - }, - "require-dev": { - "phpspec/phpspec": "^6.0 || ^7.0", - "phpunit/phpunit": "^8.0 || ^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Prophecy\\": "src/Prophecy" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "support": { - "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.15.0" - }, - "time": "2021-12-08T12:19:24+00:00" + "time": "2022-10-14T12:47:21+00:00" }, { "name": "phpstan/phpstan", @@ -1816,23 +1682,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.15", + "version": "9.2.17", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f" + "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f", - "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8", + "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.13.0", + "nikic/php-parser": "^4.14", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -1881,7 +1747,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17" }, "funding": [ { @@ -1889,7 +1755,7 @@ "type": "github" } ], - "time": "2022-03-07T09:28:20+00:00" + "time": "2022-08-30T12:24:04+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2134,16 +2000,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.21", + "version": "9.5.25", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1" + "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1", - "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", + "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", "shasum": "" }, "require": { @@ -2158,7 +2024,6 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpspec/prophecy": "^1.12.1", "phpunit/php-code-coverage": "^9.2.13", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", @@ -2166,19 +2031,16 @@ "phpunit/php-timer": "^5.0.2", "sebastian/cli-parser": "^1.0.1", "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", + "sebastian/comparator": "^4.0.8", "sebastian/diff": "^4.0.3", "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", + "sebastian/exporter": "^4.0.5", "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.0", + "sebastian/type": "^3.2", "sebastian/version": "^3.0.2" }, - "require-dev": { - "phpspec/prophecy-phpunit": "^2.0.1" - }, "suggest": { "ext-soap": "*", "ext-xdebug": "*" @@ -2220,7 +2082,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25" }, "funding": [ { @@ -2230,9 +2092,13 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" } ], - "time": "2022-06-19T12:14:25+00:00" + "time": "2022-09-25T03:44:45+00:00" }, { "name": "psr/cache", @@ -2600,16 +2466,16 @@ }, { "name": "sebastian/comparator", - "version": "4.0.6", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382" + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", "shasum": "" }, "require": { @@ -2662,7 +2528,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" }, "funding": [ { @@ -2670,7 +2536,7 @@ "type": "github" } ], - "time": "2020-10-26T15:49:45+00:00" + "time": "2022-09-14T12:41:17+00:00" }, { "name": "sebastian/complexity", @@ -2860,16 +2726,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9" + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", "shasum": "" }, "require": { @@ -2925,7 +2791,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" }, "funding": [ { @@ -2933,7 +2799,7 @@ "type": "github" } ], - "time": "2021-11-11T14:18:36+00:00" + "time": "2022-09-14T06:03:37+00:00" }, { "name": "sebastian/global-state", @@ -3288,16 +3154,16 @@ }, { "name": "sebastian/type", - "version": "3.0.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad" + "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", - "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", "shasum": "" }, "require": { @@ -3309,7 +3175,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -3332,7 +3198,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.0.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.0" }, "funding": [ { @@ -3340,7 +3206,7 @@ "type": "github" } ], - "time": "2022-03-15T09:54:48+00:00" + "time": "2022-09-12T14:47:03+00:00" }, { "name": "sebastian/version", @@ -3397,46 +3263,42 @@ }, { "name": "symfony/console", - "version": "v5.4.10", + "version": "v6.0.14", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4d671ab4ddac94ee439ea73649c69d9d200b5000" + "reference": "1f89cab8d52c84424f798495b3f10342a7b1a070" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4d671ab4ddac94ee439ea73649c69d9d200b5000", - "reference": "4d671ab4ddac94ee439ea73649c69d9d200b5000", + "url": "https://api.github.com/repos/symfony/console/zipball/1f89cab8d52c84424f798495b3f10342a7b1a070", + "reference": "1f89cab8d52c84424f798495b3f10342a7b1a070", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", + "php": ">=8.0.2", "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/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" + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/event-dispatcher": "^5.4|^6.0", + "symfony/lock": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0", + "symfony/var-dumper": "^5.4|^6.0" }, "suggest": { "psr/log": "For using the console logger", @@ -3476,7 +3338,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.10" + "source": "https://github.com/symfony/console/tree/v6.0.14" }, "funding": [ { @@ -3492,7 +3354,7 @@ "type": "tidelift" } ], - "time": "2022-06-26T13:00:04+00:00" + "time": "2022-10-07T08:02:12+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3563,40 +3425,38 @@ }, { "name": "symfony/event-dispatcher", - "version": "v5.4.9", + "version": "v6.0.9", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc" + "reference": "5c85b58422865d42c6eb46f7693339056db098a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc", - "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5c85b58422865d42c6eb46f7693339056db098a8", + "reference": "5c85b58422865d42c6eb46f7693339056db098a8", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/event-dispatcher-contracts": "^2|^3", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.0.2", + "symfony/event-dispatcher-contracts": "^2|^3" }, "conflict": { - "symfony/dependency-injection": "<4.4" + "symfony/dependency-injection": "<5.4" }, "provide": { "psr/event-dispatcher-implementation": "1.0", - "symfony/event-dispatcher-implementation": "2.0" + "symfony/event-dispatcher-implementation": "2.0|3.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/config": "^5.4|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/error-handler": "^5.4|^6.0", + "symfony/expression-language": "^5.4|^6.0", + "symfony/http-foundation": "^5.4|^6.0", "symfony/service-contracts": "^1.1|^2|^3", - "symfony/stopwatch": "^4.4|^5.0|^6.0" + "symfony/stopwatch": "^5.4|^6.0" }, "suggest": { "symfony/dependency-injection": "", @@ -3628,7 +3488,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.9" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.0.9" }, "funding": [ { @@ -3644,7 +3504,7 @@ "type": "tidelift" } ], - "time": "2022-05-05T16:45:39+00:00" + "time": "2022-05-05T16:45:52+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -3727,23 +3587,22 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.9", + "version": "v6.0.13", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba" + "reference": "3adca49133bd055ebe6011ed1e012be3c908af79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/36a017fa4cce1eff1b8e8129ff53513abcef05ba", - "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/3adca49133bd055ebe6011ed1e012be3c908af79", + "reference": "3adca49133bd055ebe6011ed1e012be3c908af79", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.0.2", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.8", - "symfony/polyfill-php80": "^1.16" + "symfony/polyfill-mbstring": "~1.8" }, "type": "library", "autoload": { @@ -3771,7 +3630,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.9" + "source": "https://github.com/symfony/filesystem/tree/v6.0.13" }, "funding": [ { @@ -3787,26 +3646,24 @@ "type": "tidelift" } ], - "time": "2022-05-20T13:55:35+00:00" + "time": "2022-09-21T20:25:27+00:00" }, { "name": "symfony/finder", - "version": "v5.4.8", + "version": "v6.0.11", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9" + "reference": "09cb683ba5720385ea6966e5e06be2a34f2568b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9", - "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9", + "url": "https://api.github.com/repos/symfony/finder/zipball/09cb683ba5720385ea6966e5e06be2a34f2568b1", + "reference": "09cb683ba5720385ea6966e5e06be2a34f2568b1", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.0.2" }, "type": "library", "autoload": { @@ -3834,7 +3691,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.8" + "source": "https://github.com/symfony/finder/tree/v6.0.11" }, "funding": [ { @@ -3850,27 +3707,25 @@ "type": "tidelift" } ], - "time": "2022-04-15T08:07:45+00:00" + "time": "2022-07-29T07:39:48+00:00" }, { "name": "symfony/options-resolver", - "version": "v5.4.3", + "version": "v6.0.3", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8" + "reference": "51f7006670febe4cbcbae177cbffe93ff833250d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/cc1147cb11af1b43f503ac18f31aa3bec213aba8", - "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/51f7006670febe4cbcbae177cbffe93ff833250d", + "reference": "51f7006670febe4cbcbae177cbffe93ff833250d", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php73": "~1.0", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.0.2", + "symfony/deprecation-contracts": "^2.1|^3" }, "type": "library", "autoload": { @@ -3903,7 +3758,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.3" + "source": "https://github.com/symfony/options-resolver/tree/v6.0.3" }, "funding": [ { @@ -3919,7 +3774,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-01-02T09:55:41+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4251,229 +4106,6 @@ ], "time": "2022-05-24T11:49:31+00:00" }, - { - "name": "symfony/polyfill-php70", - "version": "v1.20.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644", - "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "metapackage", - "extra": { - "branch-alias": { - "dev-main": "1.20-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "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.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php70/tree/v1.20.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": "2020-10-23T14:02:19+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.26.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.26-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - } - }, - "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.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.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-05-24T11:49:31+00:00" - }, - { - "name": "symfony/polyfill-php73", - "version": "v1.26.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.26-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.26.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-05-24T11:49:31+00:00" - }, { "name": "symfony/polyfill-php80", "version": "v1.26.0", @@ -4558,22 +4190,100 @@ "time": "2022-05-10T07:21:04+00:00" }, { - "name": "symfony/process", - "version": "v5.4.8", + "name": "symfony/polyfill-php81", + "version": "v1.26.0", "source": { "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3" + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3", - "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1", + "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/polyfill-php80": "^1.16" + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.26-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.26.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-05-24T11:49:31+00:00" + }, + { + "name": "symfony/process", + "version": "v6.0.11", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "44270a08ccb664143dede554ff1c00aaa2247a43" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/44270a08ccb664143dede554ff1c00aaa2247a43", + "reference": "44270a08ccb664143dede554ff1c00aaa2247a43", + "shasum": "" + }, + "require": { + "php": ">=8.0.2" }, "type": "library", "autoload": { @@ -4601,7 +4311,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.8" + "source": "https://github.com/symfony/process/tree/v6.0.11" }, "funding": [ { @@ -4617,7 +4327,7 @@ "type": "tidelift" } ], - "time": "2022-04-08T05:07:18+00:00" + "time": "2022-06-27T17:10:44+00:00" }, { "name": "symfony/service-contracts", @@ -4704,20 +4414,20 @@ }, { "name": "symfony/stopwatch", - "version": "v5.4.5", + "version": "v6.0.13", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30" + "reference": "7554fde6848af5ef1178f8ccbdbdb8ae1092c70a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/4d04b5c24f3c9a1a168a131f6cbe297155bc0d30", - "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/7554fde6848af5ef1178f8ccbdbdb8ae1092c70a", + "reference": "7554fde6848af5ef1178f8ccbdbdb8ae1092c70a", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.0.2", "symfony/service-contracts": "^1|^2|^3" }, "type": "library", @@ -4746,7 +4456,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.5" + "source": "https://github.com/symfony/stopwatch/tree/v6.0.13" }, "funding": [ { @@ -4762,20 +4472,20 @@ "type": "tidelift" } ], - "time": "2022-02-18T16:06:09+00:00" + "time": "2022-09-28T15:52:47+00:00" }, { "name": "symfony/string", - "version": "v6.0.10", + "version": "v6.0.14", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "1b3adf02a0fc814bd9118d7fd68a097a599ebc27" + "reference": "3db7da820a6e4a584b714b3933c34c6a7db4d86c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/1b3adf02a0fc814bd9118d7fd68a097a599ebc27", - "reference": "1b3adf02a0fc814bd9118d7fd68a097a599ebc27", + "url": "https://api.github.com/repos/symfony/string/zipball/3db7da820a6e4a584b714b3933c34c6a7db4d86c", + "reference": "3db7da820a6e4a584b714b3933c34c6a7db4d86c", "shasum": "" }, "require": { @@ -4831,7 +4541,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.0.10" + "source": "https://github.com/symfony/string/tree/v6.0.14" }, "funding": [ { @@ -4847,7 +4557,7 @@ "type": "tidelift" } ], - "time": "2022-06-26T16:34:50+00:00" + "time": "2022-10-10T09:34:08+00:00" }, { "name": "theseer/tokenizer", @@ -4901,16 +4611,16 @@ }, { "name": "vimeo/psalm", - "version": "4.24.0", + "version": "4.29.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "06dd975cb55d36af80f242561738f16c5f58264f" + "reference": "7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/06dd975cb55d36af80f242561738f16c5f58264f", - "reference": "06dd975cb55d36af80f242561738f16c5f58264f", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3", + "reference": "7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3", "shasum": "" }, "require": { @@ -4949,6 +4659,7 @@ "phpdocumentor/reflection-docblock": "^5", "phpmyadmin/sql-parser": "5.1.0||dev-master", "phpspec/prophecy": ">=1.9.0", + "phpstan/phpdoc-parser": "1.2.* || 1.6.4", "phpunit/phpunit": "^9.0", "psalm/plugin-phpunit": "^0.16", "slevomat/coding-standard": "^7.0", @@ -5002,9 +4713,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.24.0" + "source": "https://github.com/vimeo/psalm/tree/4.29.0" }, - "time": "2022-06-26T11:47:54+00:00" + "time": "2022-10-11T17:09:17+00:00" }, { "name": "webmozart/assert", diff --git a/l10n/de.js b/l10n/de.js index bf8b109..e098713 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -115,7 +115,7 @@ OC.L10N.register( "admin" : "Administrator", "Share" : "Teilen", "Loading" : "Lade", - "You are not allowed to change this option, because this room is shared with you." : "Du kannst diese Einstellung nicht ändern, da dieser Raum mit dir geteilt wurde.", + "You are not allowed to change this option, because this room is shared with you." : "Du bist nicht berechtigt, diese Einstellung zu ändern, da dieser Raum mit dir geteilt wurde.", "Max. rooms" : "Max. Räume", "Max. participants" : "Max. Teilnehmer", "Group …" : "Gruppe …", diff --git a/l10n/de.json b/l10n/de.json index 130f053..643d08c 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -113,7 +113,7 @@ "admin" : "Administrator", "Share" : "Teilen", "Loading" : "Lade", - "You are not allowed to change this option, because this room is shared with you." : "Du kannst diese Einstellung nicht ändern, da dieser Raum mit dir geteilt wurde.", + "You are not allowed to change this option, because this room is shared with you." : "Du bist nicht berechtigt, diese Einstellung zu ändern, da dieser Raum mit dir geteilt wurde.", "Max. rooms" : "Max. Räume", "Max. participants" : "Max. Teilnehmer", "Group …" : "Gruppe …", diff --git a/l10n/fr.js b/l10n/fr.js index b365f87..838d7fd 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -49,7 +49,7 @@ OC.L10N.register( "Name, group …" : "Nom, groupe, ...", "Group" : "Groupe", "Searching" : "Recherche en cours", - "No matches" : "Pas de résultas", + "No matches" : "Pas de résultats", "Public" : "Publique", "Internal + Password protection for guests" : "Protection interne + mot de passe pour les invités", "Internal + Waiting room for guests" : "Interne + Salle d'attente pour les invités", diff --git a/l10n/fr.json b/l10n/fr.json index e510a65..c1ac12a 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -47,7 +47,7 @@ "Name, group …" : "Nom, groupe, ...", "Group" : "Groupe", "Searching" : "Recherche en cours", - "No matches" : "Pas de résultas", + "No matches" : "Pas de résultats", "Public" : "Publique", "Internal + Password protection for guests" : "Protection interne + mot de passe pour les invités", "Internal + Waiting room for guests" : "Interne + Salle d'attente pour les invités", diff --git a/lib/Activity/MeetingListener.php b/lib/Activity/MeetingListener.php index 323a8c5..1134d8a 100644 --- a/lib/Activity/MeetingListener.php +++ b/lib/Activity/MeetingListener.php @@ -12,7 +12,6 @@ use OCP\EventDispatcher\IEventListener; use OCP\IUserSession; class MeetingListener implements IEventListener { - /** @var IActivityManager */ private $activityManager; diff --git a/lib/Activity/Provider.php b/lib/Activity/Provider.php index 4c8d431..ad98e0b 100644 --- a/lib/Activity/Provider.php +++ b/lib/Activity/Provider.php @@ -15,7 +15,6 @@ use OCP\IUserManager; use OCP\L10N\IFactory; class Provider implements IProvider { - /** @var string */ public const ROOM_CREATED = 'room_created'; diff --git a/lib/Activity/RoomListener.php b/lib/Activity/RoomListener.php index cf95129..41b7ee1 100644 --- a/lib/Activity/RoomListener.php +++ b/lib/Activity/RoomListener.php @@ -10,7 +10,6 @@ use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; class RoomListener implements IEventListener { - /** @var IActivityManager */ private $activityManager; diff --git a/lib/Activity/RoomShareListener.php b/lib/Activity/RoomShareListener.php index b4695cf..7f7abe4 100644 --- a/lib/Activity/RoomShareListener.php +++ b/lib/Activity/RoomShareListener.php @@ -14,7 +14,6 @@ use OCP\EventDispatcher\IEventListener; use OCP\IGroupManager; class RoomShareListener implements IEventListener { - /** @var IActivityManager */ private $activityManager; diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 2bb9f3b..a9d2589 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -17,19 +17,15 @@ use \OCA\BigBlueButton\Middleware\HookMiddleware; use \OCA\BigBlueButton\Middleware\JoinMiddleware; use \OCA\BigBlueButton\Search\Provider; use \OCP\AppFramework\App; -use \OCP\AppFramework\QueryException; -use \OCP\AppFramework\Bootstrap\IBootContext; -use \OCP\AppFramework\Bootstrap\IBootstrap; -use \OCP\AppFramework\Bootstrap\IRegistrationContext; -use \OCP\EventDispatcher\IEventDispatcher; use \OCP\IConfig; use \OCP\Settings\IManager as ISettingsManager; use \OCP\User\Events\UserDeletedEvent; -use \OCP\Util; - -if ((@include_once __DIR__ . '/../../vendor/autoload.php') === false) { - throw new \Exception('Cannot include autoload. Did you run install dependencies using composer?'); -} +use OCP\AppFramework\Bootstrap\IBootContext; +use OCP\AppFramework\Bootstrap\IBootstrap; +use OCP\AppFramework\Bootstrap\IRegistrationContext; +use OCP\INavigationManager; +use OCP\IURLGenerator; +use OCP\Util; class Application extends App implements IBootstrap { public const ID = 'bbb'; @@ -37,79 +33,60 @@ class Application extends App implements IBootstrap { public function __construct(array $urlParams = []) { parent::__construct(self::ID, $urlParams); + } - $container = $this->getContainer(); - - /* @var IEventDispatcher $dispatcher */ - $dispatcher = $container->query(IEventDispatcher::class); - $this->registerServiceListener($dispatcher); - - $container->registerMiddleWare(JoinMiddleware::class); - $container->registerMiddleWare(HookMiddleware::class); - - $config = $container->query(IConfig::class); - - if ($config->getAppValue(self::ID, 'app.navigation') === 'true') { - $name = $config->getAppValue(self::ID, 'app.navigation.name', 'BBB'); - - $this->registerAsNavigationEntry($name); - } else { - $this->registerAsPersonalSetting(); + public function register(IRegistrationContext $context): void { + if ((@include_once __DIR__ . '/../../vendor/autoload.php') === false) { + throw new \Exception('Cannot include autoload. Did you run install dependencies using composer?'); } + $context->registerEventListener(RoomCreatedEvent::class, RoomListener::class); + $context->registerEventListener(RoomDeletedEvent::class, RoomListener::class); + + $context->registerEventListener(RoomShareCreatedEvent::class, RoomShareListener::class); + $context->registerEventListener(RoomShareDeletedEvent::class, RoomShareListener::class); + + $context->registerEventListener(MeetingStartedEvent::class, MeetingListener::class); + $context->registerEventListener(MeetingEndedEvent::class, MeetingListener::class); + $context->registerEventListener(RecordingReadyEvent::class, MeetingListener::class); + + $context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class); + + $context->registerSearchProvider(Provider::class); + + $context->registerMiddleware(JoinMiddleware::class); + $context->registerMiddleware(HookMiddleware::class); + } + + public function boot(IBootContext $context): void { + $context->injectFn([$this, 'registerAdminPage']); + Util::addScript('bbb', 'filelist'); } - public function boot(IBootContext $context): void {} - - public function register(IRegistrationContext $context): void { - $context->registerSearchProvider(Provider::class); + public function registerAdminPage(ISettingsManager $settingsManager, INavigationManager $navigationManager, IURLGenerator $urlGenerator, IConfig $config):void { + if ($config->getAppValue(self::ID, 'app.navigation') === 'true') { + $this->registerAsNavigationEntry($navigationManager, $urlGenerator, $config); + } else { + $this->registerAsPersonalSetting($settingsManager); + } } - private function registerAsPersonalSetting(): void { - try { - /** @var ISettingsManager */ - $settingsManager = $this->getContainer()->query(ISettingsManager::class); - } catch (QueryException $exception) { - // Workaround for Nextcloud 19 - $server = $this->getContainer()->getServer(); - - if (method_exists($server, 'getSettingsManager')) { - $settingsManager = $server->getSettingsManager(); - } else { - return; - } - } - - + private function registerAsPersonalSetting(ISettingsManager $settingsManager): void { $settingsManager->registerSetting(ISettingsManager::KEY_PERSONAL_SETTINGS, \OCA\BigBlueButton\Settings\Personal::class); } - private function registerAsNavigationEntry(string $name): void { - $server = $this->getContainer()->getServer(); + private function registerAsNavigationEntry(INavigationManager $navigationManager, IURLGenerator $urlGenerator, IConfig $config): void { + $name = $config->getAppValue(self::ID, 'app.navigation.name', 'BBB'); - $server->getNavigationManager()->add(function () use ($server, $name) { + $navigationManager->add(function () use ($urlGenerator, $name) { return [ 'id' => self::ID, - 'order' => self::ORDER, - 'href' => $server->getURLGenerator()->linkToRoute('bbb.page.index'), - 'icon' => $server->getURLGenerator()->imagePath('bbb', 'app.svg'), + 'order' => 80, + 'href' => $urlGenerator->linkToRoute('bbb.page.index'), + 'icon' => $urlGenerator->imagePath('bbb', 'app.svg'), 'name' => $name, ]; }); } - - private function registerServiceListener(IEventDispatcher $dispatcher): void { - $dispatcher->addServiceListener(RoomCreatedEvent::class, RoomListener::class); - $dispatcher->addServiceListener(RoomDeletedEvent::class, RoomListener::class); - - $dispatcher->addServiceListener(RoomShareCreatedEvent::class, RoomShareListener::class); - $dispatcher->addServiceListener(RoomShareDeletedEvent::class, RoomShareListener::class); - - $dispatcher->addServiceListener(MeetingStartedEvent::class, MeetingListener::class); - $dispatcher->addServiceListener(MeetingEndedEvent::class, MeetingListener::class); - $dispatcher->addServiceListener(RecordingReadyEvent::class, MeetingListener::class); - - $dispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedListener::class); - } } diff --git a/lib/BackgroundJob/IsRunningJob.php b/lib/BackgroundJob/IsRunningJob.php index d069eb2..823248a 100644 --- a/lib/BackgroundJob/IsRunningJob.php +++ b/lib/BackgroundJob/IsRunningJob.php @@ -10,7 +10,6 @@ use OCP\BackgroundJob\IJobList; use OCP\BackgroundJob\TimedJob; class IsRunningJob extends TimedJob { - /** @var IJobList */ private $jobList; diff --git a/lib/BigBlueButton/Presentation.php b/lib/BigBlueButton/Presentation.php index 39e629b..cd27af2 100644 --- a/lib/BigBlueButton/Presentation.php +++ b/lib/BigBlueButton/Presentation.php @@ -9,7 +9,7 @@ class Presentation { public function __construct(string $url, string $filename) { $this->url = $url; - $this->filename = preg_replace('/[^\x20-\x7E]+/','#', $filename); + $this->filename = preg_replace('/[^\x20-\x7E]+/', '#', $filename); } public function getUrl(): string { diff --git a/lib/Command/ClearAvatarCache.php b/lib/Command/ClearAvatarCache.php index aa743d9..3aecaf7 100644 --- a/lib/Command/ClearAvatarCache.php +++ b/lib/Command/ClearAvatarCache.php @@ -8,7 +8,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class ClearAvatarCache extends Command { - /** * @var AvatarRepository */ diff --git a/lib/Event/RoomEvent.php b/lib/Event/RoomEvent.php index 64331cb..a0f28f1 100644 --- a/lib/Event/RoomEvent.php +++ b/lib/Event/RoomEvent.php @@ -6,7 +6,6 @@ use OCA\BigBlueButton\Db\Room; use OCP\EventDispatcher\Event; abstract class RoomEvent extends Event { - /** @var Room */ private $room; diff --git a/lib/Event/RoomShareEvent.php b/lib/Event/RoomShareEvent.php index c6ec959..0935f6c 100644 --- a/lib/Event/RoomShareEvent.php +++ b/lib/Event/RoomShareEvent.php @@ -6,7 +6,6 @@ use OCA\BigBlueButton\Db\RoomShare; use OCP\EventDispatcher\Event; abstract class RoomShareEvent extends Event { - /** @var RoomShare */ private $roomShare; diff --git a/lib/Listener/UserDeletedListener.php b/lib/Listener/UserDeletedListener.php index 0f77c9c..fddfc80 100644 --- a/lib/Listener/UserDeletedListener.php +++ b/lib/Listener/UserDeletedListener.php @@ -10,7 +10,6 @@ use OCP\EventDispatcher\IEventListener; use OCP\User\Events\UserDeletedEvent; class UserDeletedListener implements IEventListener { - /** @var IActivityManager */ private $activityManager; diff --git a/lib/Migration/Version000000Date20200416124731.php b/lib/Migration/Version000000Date20200416124731.php index 3f536bb..6cfa8fa 100644 --- a/lib/Migration/Version000000Date20200416124731.php +++ b/lib/Migration/Version000000Date20200416124731.php @@ -10,7 +10,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version000000Date20200416124731 extends SimpleMigrationStep { - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/lib/Migration/Version000000Date20200613111242.php b/lib/Migration/Version000000Date20200613111242.php index f562345..c9c44a9 100644 --- a/lib/Migration/Version000000Date20200613111242.php +++ b/lib/Migration/Version000000Date20200613111242.php @@ -10,7 +10,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version000000Date20200613111242 extends SimpleMigrationStep { - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/lib/Migration/Version000000Date20200617055735.php b/lib/Migration/Version000000Date20200617055735.php index 5ae3a71..306213a 100644 --- a/lib/Migration/Version000000Date20200617055735.php +++ b/lib/Migration/Version000000Date20200617055735.php @@ -10,7 +10,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version000000Date20200617055735 extends SimpleMigrationStep { - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/lib/Migration/Version000000Date20200826100844.php b/lib/Migration/Version000000Date20200826100844.php index 4840d44..64ef330 100644 --- a/lib/Migration/Version000000Date20200826100844.php +++ b/lib/Migration/Version000000Date20200826100844.php @@ -13,7 +13,6 @@ use OCP\Migration\SimpleMigrationStep; * Auto-generated migration step: Please modify to your needs! */ class Version000000Date20200826100844 extends SimpleMigrationStep { - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/lib/Migration/Version000000Date20200829112301.php b/lib/Migration/Version000000Date20200829112301.php index a1e5c71..a92dab3 100644 --- a/lib/Migration/Version000000Date20200829112301.php +++ b/lib/Migration/Version000000Date20200829112301.php @@ -13,7 +13,6 @@ use OCP\Migration\SimpleMigrationStep; * Auto-generated migration step: Please modify to your needs! */ class Version000000Date20200829112301 extends SimpleMigrationStep { - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/lib/Migration/Version000000Date20210122164501.php b/lib/Migration/Version000000Date20210122164501.php index 18fc098..65d4c96 100644 --- a/lib/Migration/Version000000Date20210122164501.php +++ b/lib/Migration/Version000000Date20210122164501.php @@ -13,7 +13,6 @@ use OCP\Migration\SimpleMigrationStep; * Auto-generated migration step: Please modify to your needs! */ class Version000000Date20210122164501 extends SimpleMigrationStep { - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/lib/Migration/Version000000Date20210419132000.php b/lib/Migration/Version000000Date20210419132000.php index 4c851d0..5e4911c 100644 --- a/lib/Migration/Version000000Date20210419132000.php +++ b/lib/Migration/Version000000Date20210419132000.php @@ -13,7 +13,6 @@ use OCP\Migration\SimpleMigrationStep; * Auto-generated migration step: Please modify to your needs! */ class Version000000Date20210419132000 extends SimpleMigrationStep { - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/lib/Migration/Version000000Date20210729200144.php b/lib/Migration/Version000000Date20210729200144.php index fbe989b..35d4d74 100644 --- a/lib/Migration/Version000000Date20210729200144.php +++ b/lib/Migration/Version000000Date20210729200144.php @@ -13,8 +13,6 @@ use OCP\Migration\SimpleMigrationStep; * Auto-generated migration step: Please modify to your needs! */ class Version000000Date20210729200144 extends SimpleMigrationStep { - - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/lib/Migration/Version000000Date20220316151400.php b/lib/Migration/Version000000Date20220316151400.php index 551b4ae..d70ac96 100644 --- a/lib/Migration/Version000000Date20220316151400.php +++ b/lib/Migration/Version000000Date20220316151400.php @@ -13,8 +13,6 @@ use OCP\Migration\SimpleMigrationStep; * Auto-generated migration step: Please modify to your needs! */ class Version000000Date20220316151400 extends SimpleMigrationStep { - - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/lib/Migration/Version000000Date20220728083700.php b/lib/Migration/Version000000Date20220728083700.php index 3b8858f..c05ab14 100644 --- a/lib/Migration/Version000000Date20220728083700.php +++ b/lib/Migration/Version000000Date20220728083700.php @@ -13,8 +13,6 @@ use OCP\Migration\SimpleMigrationStep; * Auto-generated migration step: Please modify to your needs! */ class Version000000Date20220728083700 extends SimpleMigrationStep { - - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/lib/Permission.php b/lib/Permission.php index ef89698..b185b99 100644 --- a/lib/Permission.php +++ b/lib/Permission.php @@ -13,7 +13,6 @@ use OCP\IGroupManager; use OCP\IUserManager; class Permission { - /** @var IUserManager */ private $userManager; diff --git a/lib/Service/RoomService.php b/lib/Service/RoomService.php index 181a24e..061e1ff 100644 --- a/lib/Service/RoomService.php +++ b/lib/Service/RoomService.php @@ -18,7 +18,6 @@ use OCP\Security\ISecureRandom; use OCP\Search\ISearchQuery; class RoomService { - /** @var RoomMapper */ private $mapper; @@ -63,9 +62,9 @@ class RoomService { return $this->mapper->find($id); // in order to be able to plug in different storage backends like files - // for instance it is a good idea to turn storage related exceptions - // into service related exceptions so controllers and service users - // have to deal with only one type of exception + // for instance it is a good idea to turn storage related exceptions + // into service related exceptions so controllers and service users + // have to deal with only one type of exception } catch (Exception $e) { $this->handleException($e); } diff --git a/lib/Service/RoomShareService.php b/lib/Service/RoomShareService.php index fbb8ba0..68c5bb9 100644 --- a/lib/Service/RoomShareService.php +++ b/lib/Service/RoomShareService.php @@ -14,7 +14,6 @@ use OCP\AppFramework\Db\MultipleObjectsReturnedException; use OCP\EventDispatcher\IEventDispatcher; class RoomShareService { - /** @var RoomShareMapper */ private $mapper; diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index ec37973..0fbc203 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -7,7 +7,6 @@ use OCP\IConfig; use OCP\Settings\ISettings; class Admin implements ISettings { - /** @var IConfig */ private $config; diff --git a/templates/forward.php b/templates/forward.php index 7bb3dfb..7ba0df1 100644 --- a/templates/forward.php +++ b/templates/forward.php @@ -2,7 +2,7 @@ /** @var $_ array */ /** @var $l \OCP\IL10N */ style('core', 'guest'); -?> + ?>

diff --git a/templates/join.php b/templates/join.php index 7d1c5df..7eec0de 100644 --- a/templates/join.php +++ b/templates/join.php @@ -3,7 +3,7 @@ /** @var $l \OCP\IL10N */ style('core', 'guest'); script('bbb', 'join'); -?> + ?>

diff --git a/templates/waiting.php b/templates/waiting.php index e4134d2..0221de5 100644 --- a/templates/waiting.php +++ b/templates/waiting.php @@ -3,7 +3,7 @@ /** @var $l \OCP\IL10N */ style('core', 'guest'); script('bbb', 'waiting'); -?> + ?>

diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml index fb1b933..ffc4dd9 100644 --- a/tests/psalm-baseline.xml +++ b/tests/psalm-baseline.xml @@ -12,14 +12,6 @@ addServiceListener - - - InsertDocumentParameters - - - insertDocument - - \OCA\Circles\Api\v1\Circles diff --git a/ts/Manager/App.scss b/ts/Manager/App.scss index 7b1f295..38e8d9d 100644 --- a/ts/Manager/App.scss +++ b/ts/Manager/App.scss @@ -37,6 +37,7 @@ #bbb-root, #bbb-app { width: 100%; + background-color: var(--color-main-background); } pre { diff --git a/ts/filelist.ts b/ts/filelist.ts index 0c71863..7e30283 100644 --- a/ts/filelist.ts +++ b/ts/filelist.ts @@ -92,9 +92,6 @@ async function openDialog(fileId: number, filename: string) { const row = $(''); const button = $('