From 896d9fd3ad752a5ec9b8784bfb18814007ec8eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D?= Date: Mon, 7 Dec 2020 19:37:00 +0100 Subject: [PATCH] * [MOD] Deprecate PHP versions below 7.2 since they are no longer supported by PHP and Travis CI tests are not performed for them. https://www.php.net/supported-versions.php * [MOD] Improve internal config handling. No more properties visibility tweaks. * [MOD] Updated dependencies. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rubén D --- .travis.yml | 5 +- .../web/Controllers/BootstrapController.php | 2 +- .../views/config/general-site.inc | 2 +- composer.json | 2 +- composer.lock | 1714 +++++++++++------ lib/SP/Config/Config.php | 18 +- lib/SP/Config/ConfigData.php | 688 ++++--- lib/SP/Config/ConfigUtil.php | 2 +- lib/SP/Http/Request.php | 10 +- lib/SP/Providers/Auth/Ldap/LdapParams.php | 2 +- lib/SP/Services/Backup/FileBackupService.php | 7 +- lib/SP/Storage/File/XmlHandler.php | 17 +- lib/SP/Util/Checks.php | 4 +- lib/SP/Util/Util.php | 2 +- tests/SP/Config/ConfigTest.php | 11 +- .../Config/ConfigBackupServiceTest.php | 6 +- tests/SP/Services/Import/XmlImportTest.php | 2 + tests/SP/bootstrap.php | 2 + tests/res/config/config.xml | 95 +- tests/res/scripts/reset_db.sh | 2 +- 20 files changed, 1640 insertions(+), 953 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d617d21..26bab09e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,13 @@ -dist: xenial +dist: bionic language: php sudo: false php: - - '7.0' - - '7.1' - '7.2' - '7.3' + - '7.4' branches: only: diff --git a/app/modules/web/Controllers/BootstrapController.php b/app/modules/web/Controllers/BootstrapController.php index 953a00bc..0756df0a 100644 --- a/app/modules/web/Controllers/BootstrapController.php +++ b/app/modules/web/Controllers/BootstrapController.php @@ -63,7 +63,7 @@ final class BootstrapController extends SimpleControllerBase 'app_root' => Bootstrap::$WEBURI, 'max_file_size' => $this->configData->getFilesAllowedSize(), 'check_updates' => $checkStatus && $this->configData->isCheckUpdates(), - 'check_notices' => $checkStatus && $this->configData->isChecknotices(), + 'check_notices' => $checkStatus && $this->configData->isCheckNotices(), 'check_notifications' => $this->getNotificationsEnabled(), 'timezone' => date_default_timezone_get(), 'debug' => DEBUG || $this->configData->isDebug(), diff --git a/app/modules/web/themes/material-blue/views/config/general-site.inc b/app/modules/web/themes/material-blue/views/config/general-site.inc index c35b9565..177ccb70 100644 --- a/app/modules/web/themes/material-blue/views/config/general-site.inc +++ b/app/modules/web/themes/material-blue/views/config/general-site.inc @@ -198,7 +198,7 @@ use SP\Mvc\View\Template; for="check_notices_enabled"> isChecknotices() ? 'checked' : ''; ?>/> + name="check_notices_enabled" isCheckNotices() ? 'checked' : ''; ?>/> diff --git a/composer.json b/composer.json index 5edeffae..eb360617 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ }, "require": { "roave/security-advisories": "dev-master", - "php": "~7.0 || ~7.1 || ~7.2 || ~7.3", + "php": "~7.2 || ~7.3 || ~7.4", "defuse/php-encryption": "^2.1", "phpmailer/phpmailer": "^6.0", "ademarre/binary-to-text-php": "dev-master", diff --git a/composer.lock b/composer.lock index 6da8bbf6..2b4794a7 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": "a7cb7dc0ecb4a9646f39707655662075", + "content-hash": "f890eef8505f6f5076f9335cfc8cd82f", "packages": [ { "name": "ademarre/binary-to-text-php", @@ -116,30 +116,33 @@ }, { "name": "doctrine/annotations", - "version": "v1.8.0", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc" + "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/904dca4eb10715b92569fbcd79e201d5c349b6bc", - "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/ce77a7ba1770462cd705a91a151b6c3746f9c6ad", + "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad", "shasum": "" }, "require": { "doctrine/lexer": "1.*", - "php": "^7.1" + "ext-tokenizer": "*", + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/cache": "1.*", - "phpunit/phpunit": "^7.5" + "doctrine/coding-standard": "^6.0 || ^8.1", + "phpstan/phpstan": "^0.12.20", + "phpunit/phpunit": "^7.5 || ^9.1.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7.x-dev" + "dev-master": "1.11.x-dev" } }, "autoload": { @@ -174,30 +177,30 @@ } ], "description": "Docblock Annotations Parser", - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org/projects/annotations.html", "keywords": [ "annotations", "docblock", "parser" ], - "time": "2019-10-01T18:55:10+00:00" + "time": "2020-10-26T10:28:16+00:00" }, { "name": "doctrine/cache", - "version": "1.10.0", + "version": "1.10.2", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62" + "reference": "13e3381b25847283a91948d04640543941309727" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62", - "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62", + "url": "https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727", + "reference": "13e3381b25847283a91948d04640543941309727", "shasum": "" }, "require": { - "php": "~7.1" + "php": "~7.1 || ^8.0" }, "conflict": { "doctrine/common": ">2.2,<2.4" @@ -262,37 +265,46 @@ "redis", "xcache" ], - "time": "2019-11-29T15:36:20+00:00" + "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%2Fcache", + "type": "tidelift" + } + ], + "time": "2020-07-07T18:54:01+00:00" }, { "name": "doctrine/collections", - "version": "1.6.4", + "version": "1.6.7", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "6b1e4b2b66f6d6e49983cebfe23a21b7ccc5b0d7" + "reference": "55f8b799269a1a472457bd1a41b4f379d4cfba4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/6b1e4b2b66f6d6e49983cebfe23a21b7ccc5b0d7", - "reference": "6b1e4b2b66f6d6e49983cebfe23a21b7ccc5b0d7", + "url": "https://api.github.com/repos/doctrine/collections/zipball/55f8b799269a1a472457bd1a41b4f379d4cfba4a", + "reference": "55f8b799269a1a472457bd1a41b4f379d4cfba4a", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.1.3 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^6.0", "phpstan/phpstan-shim": "^0.9.2", "phpunit/phpunit": "^7.0", - "vimeo/psalm": "^3.2.2" + "vimeo/psalm": "^3.8.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.6.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections" @@ -332,20 +344,20 @@ "iterators", "php" ], - "time": "2019-11-13T13:07:11+00:00" + "time": "2020-07-27T17:53:49+00:00" }, { "name": "doctrine/common", - "version": "v2.11.0", + "version": "2.13.3", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "b8ca1dcf6b0dc8a2af7a09baac8d0c48345df4ff" + "reference": "f3812c026e557892c34ef37f6ab808a6b567da7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/b8ca1dcf6b0dc8a2af7a09baac8d0c48345df4ff", - "reference": "b8ca1dcf6b0dc8a2af7a09baac8d0c48345df4ff", + "url": "https://api.github.com/repos/doctrine/common/zipball/f3812c026e557892c34ef37f6ab808a6b567da7f", + "reference": "f3812c026e557892c34ef37f6ab808a6b567da7f", "shasum": "" }, "require": { @@ -355,9 +367,9 @@ "doctrine/event-manager": "^1.0", "doctrine/inflector": "^1.0", "doctrine/lexer": "^1.0", - "doctrine/persistence": "^1.1", + "doctrine/persistence": "^1.3.3", "doctrine/reflection": "^1.0", - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^1.0", @@ -415,24 +427,38 @@ "doctrine", "php" ], - "time": "2019-09-10T10:10:14+00:00" + "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%2Fcommon", + "type": "tidelift" + } + ], + "time": "2020-06-05T16:46:05+00:00" }, { "name": "doctrine/event-manager", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/event-manager.git", - "reference": "629572819973f13486371cb611386eb17851e85c" + "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/629572819973f13486371cb611386eb17851e85c", - "reference": "629572819973f13486371cb611386eb17851e85c", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f", + "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "conflict": { "doctrine/common": "<2.9@dev" @@ -491,37 +517,56 @@ "event system", "events" ], - "time": "2019-11-10T09:48:07+00:00" + "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%2Fevent-manager", + "type": "tidelift" + } + ], + "time": "2020-05-29T18:28:51+00:00" }, { "name": "doctrine/inflector", - "version": "1.3.1", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1" + "reference": "4650c8b30c753a76bf44fb2ed00117d6f367490c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1", - "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/4650c8b30c753a76bf44fb2ed00117d6f367490c", + "reference": "4650c8b30c753a76bf44fb2ed00117d6f367490c", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.2 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^6.2" + "doctrine/coding-standard": "^7.0", + "phpstan/phpstan": "^0.11", + "phpstan/phpstan-phpunit": "^0.11", + "phpstan/phpstan-strict-rules": "^0.11", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { "psr-4": { - "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" + "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector", + "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" } }, "notification-url": "https://packagist.org/downloads/", @@ -550,32 +595,52 @@ "email": "schmittjoh@gmail.com" } ], - "description": "Common String Manipulations with regard to casing and singular/plural rules.", - "homepage": "http://www.doctrine-project.org", + "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.", + "homepage": "https://www.doctrine-project.org/projects/inflector.html", "keywords": [ "inflection", - "pluralize", - "singularize", - "string" + "inflector", + "lowercase", + "manipulation", + "php", + "plural", + "singular", + "strings", + "uppercase", + "words" ], - "time": "2019-10-30T19:59:35+00:00" + "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%2Finflector", + "type": "tidelift" + } + ], + "time": "2020-05-29T07:19:59+00:00" }, { "name": "doctrine/lexer", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6" + "reference": "e864bbf5904cb8f5bb334f99209b48018522f042" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6", - "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042", + "reference": "e864bbf5904cb8f5bb334f99209b48018522f042", "shasum": "" }, "require": { - "php": "^7.2" + "php": "^7.2 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^6.0", @@ -620,20 +685,34 @@ "parser", "php" ], - "time": "2019-10-30T14:39:59+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "type": "tidelift" + } + ], + "time": "2020-05-25T17:44:05+00:00" }, { "name": "doctrine/persistence", - "version": "1.3.3", + "version": "1.3.8", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "99b196bbd4715a94fa100fac664a351ffa46d6a5" + "reference": "7a6eac9fb6f61bba91328f15aa7547f4806ca288" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/99b196bbd4715a94fa100fac664a351ffa46d6a5", - "reference": "99b196bbd4715a94fa100fac664a351ffa46d6a5", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/7a6eac9fb6f61bba91328f15aa7547f4806ca288", + "reference": "7a6eac9fb6f61bba91328f15aa7547f4806ca288", "shasum": "" }, "require": { @@ -641,8 +720,8 @@ "doctrine/cache": "^1.0", "doctrine/collections": "^1.0", "doctrine/event-manager": "^1.0", - "doctrine/reflection": "^1.0", - "php": "^7.1" + "doctrine/reflection": "^1.2", + "php": "^7.1 || ^8.0" }, "conflict": { "doctrine/common": "<2.10@dev" @@ -650,7 +729,8 @@ "require-dev": { "doctrine/coding-standard": "^6.0", "phpstan/phpstan": "^0.11", - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "vimeo/psalm": "^3.11" }, "type": "library", "extra": { @@ -703,39 +783,55 @@ "orm", "persistence" ], - "time": "2019-12-13T10:43:02+00:00" + "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%2Fpersistence", + "type": "tidelift" + } + ], + "time": "2020-06-20T12:56:16+00:00" }, { "name": "doctrine/reflection", - "version": "v1.0.0", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/doctrine/reflection.git", - "reference": "02538d3f95e88eb397a5f86274deb2c6175c2ab6" + "reference": "fa587178be682efe90d005e3a322590d6ebb59a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/reflection/zipball/02538d3f95e88eb397a5f86274deb2c6175c2ab6", - "reference": "02538d3f95e88eb397a5f86274deb2c6175c2ab6", + "url": "https://api.github.com/repos/doctrine/reflection/zipball/fa587178be682efe90d005e3a322590d6ebb59a5", + "reference": "fa587178be682efe90d005e3a322590d6ebb59a5", "shasum": "" }, "require": { "doctrine/annotations": "^1.0", "ext-tokenizer": "*", - "php": "^7.1" + "php": "^7.1 || ^8.0" + }, + "conflict": { + "doctrine/common": "<2.9" }, "require-dev": { - "doctrine/coding-standard": "^4.0", - "doctrine/common": "^2.8", - "phpstan/phpstan": "^0.9.2", - "phpstan/phpstan-phpunit": "^0.9.4", - "phpunit/phpunit": "^7.0", - "squizlabs/php_codesniffer": "^3.0" + "doctrine/coding-standard": "^6.0 || ^8.2.0", + "doctrine/common": "^2.10", + "phpstan/phpstan": "^0.11.0 || ^0.12.20", + "phpstan/phpstan-phpunit": "^0.11.0 || ^0.12.16", + "phpunit/phpunit": "^7.5 || ^9.1.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -748,6 +844,10 @@ "MIT" ], "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -756,10 +856,6 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, { "name": "Jonathan Wage", "email": "jonwage@gmail.com" @@ -773,32 +869,35 @@ "email": "ocramius@gmail.com" } ], - "description": "Doctrine Reflection component", + "description": "The Doctrine Reflection project is a simple library used by the various Doctrine projects which adds some additional functionality on top of the reflection functionality that comes with PHP. It allows you to get the reflection information about classes, methods and properties statically.", "homepage": "https://www.doctrine-project.org/projects/reflection.html", "keywords": [ - "reflection" + "reflection", + "static" ], - "time": "2018-06-14T14:45:07+00:00" + "abandoned": "roave/better-reflection", + "time": "2020-10-27T21:46:55+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "6.5.2", + "version": "6.5.5", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "43ece0e75098b7ecd8d13918293029e555a50f82" + "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/43ece0e75098b7ecd8d13918293029e555a50f82", - "reference": "43ece0e75098b7ecd8d13918293029e555a50f82", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", + "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.0", "guzzlehttp/psr7": "^1.6.1", - "php": ">=5.5" + "php": ">=5.5", + "symfony/polyfill-intl-idn": "^1.17.0" }, "require-dev": { "ext-curl": "*", @@ -806,7 +905,6 @@ "psr/log": "^1.1" }, "suggest": { - "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, "type": "library", @@ -845,27 +943,27 @@ "rest", "web service" ], - "time": "2019-12-23T11:57:10+00:00" + "time": "2020-06-16T21:01:06+00:00" }, { "name": "guzzlehttp/promises", - "version": "v1.3.1", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646" + "reference": "60d379c243457e073cff02bc323a2a86cb355631" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646", - "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646", + "url": "https://api.github.com/repos/guzzle/promises/zipball/60d379c243457e073cff02bc323a2a86cb355631", + "reference": "60d379c243457e073cff02bc323a2a86cb355631", "shasum": "" }, "require": { - "php": ">=5.5.0" + "php": ">=5.5" }, "require-dev": { - "phpunit/phpunit": "^4.0" + "symfony/phpunit-bridge": "^4.4 || ^5.1" }, "type": "library", "extra": { @@ -896,20 +994,20 @@ "keywords": [ "promise" ], - "time": "2016-12-20T10:07:11+00:00" + "time": "2020-09-30T07:37:28+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.6.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "239400de7a173fe9901b9ac7c06497751f00727a" + "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a", - "reference": "239400de7a173fe9901b9ac7c06497751f00727a", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3", + "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3", "shasum": "" }, "require": { @@ -922,15 +1020,15 @@ }, "require-dev": { "ext-zlib": "*", - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" }, "suggest": { - "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses" + "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "1.7-dev" } }, "autoload": { @@ -967,65 +1065,7 @@ "uri", "url" ], - "time": "2019-07-01T23:21:34+00:00" - }, - { - "name": "jeremeamia/SuperClosure", - "version": "2.4.0", - "source": { - "type": "git", - "url": "https://github.com/jeremeamia/super_closure.git", - "reference": "5707d5821b30b9a07acfb4d76949784aaa0e9ce9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/5707d5821b30b9a07acfb4d76949784aaa0e9ce9", - "reference": "5707d5821b30b9a07acfb4d76949784aaa0e9ce9", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^1.2|^2.0|^3.0|^4.0", - "php": ">=5.4", - "symfony/polyfill-php56": "^1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0|^5.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - }, - "autoload": { - "psr-4": { - "SuperClosure\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jeremy Lindblom", - "email": "jeremeamia@gmail.com", - "homepage": "https://github.com/jeremeamia", - "role": "Developer" - } - ], - "description": "Serialize Closure objects, including their context and binding", - "homepage": "https://github.com/jeremeamia/super_closure", - "keywords": [ - "closure", - "function", - "lambda", - "parser", - "serializable", - "serialize", - "tokenizer" - ], - "time": "2018-03-21T22:21:57+00:00" + "time": "2020-09-30T07:37:11+00:00" }, { "name": "klein/klein", @@ -1149,16 +1189,16 @@ }, { "name": "monolog/monolog", - "version": "1.25.3", + "version": "1.25.5", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1" + "reference": "1817faadd1846cd08be9a49e905dc68823bc38c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fa82921994db851a8becaf3787a9e73c5976b6f1", - "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1817faadd1846cd08be9a49e905dc68823bc38c0", + "reference": "1817faadd1846cd08be9a49e905dc68823bc38c0", "shasum": "" }, "require": { @@ -1172,11 +1212,10 @@ "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", "graylog2/gelf-php": "~1.0", - "jakub-onderka/php-parallel-lint": "0.9", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", + "php-parallel-lint/php-parallel-lint": "^1.0", "phpunit/phpunit": "~4.5", - "phpunit/phpunit-mock-objects": "2.3.0", "ruflin/elastica": ">=0.90 <3.0", "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "^5.3|^6.0" @@ -1223,76 +1262,95 @@ "logging", "psr-3" ], - "time": "2019-12-20T14:15:16+00:00" + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" + } + ], + "time": "2020-07-23T08:35:51+00:00" }, { - "name": "nikic/php-parser", - "version": "v4.3.0", + "name": "opis/closure", + "version": "3.6.1", "source": { "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc" + "url": "https://github.com/opis/closure.git", + "reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc", - "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc", + "url": "https://api.github.com/repos/opis/closure/zipball/943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5", + "reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5", "shasum": "" }, "require": { - "ext-tokenizer": "*", - "php": ">=7.0" + "php": "^5.4 || ^7.0 || ^8.0" }, "require-dev": { - "ircmaxell/php-yacc": "0.0.5", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" + "jeremeamia/superclosure": "^2.0", + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" }, - "bin": [ - "bin/php-parse" - ], "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "3.6.x-dev" } }, "autoload": { "psr-4": { - "PhpParser\\": "lib/PhpParser" - } + "Opis\\Closure\\": "src/" + }, + "files": [ + "functions.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Nikita Popov" + "name": "Marius Sarca", + "email": "marius.sarca@gmail.com" + }, + { + "name": "Sorin Sarca", + "email": "sarca_sorin@hotmail.com" } ], - "description": "A PHP parser written in PHP", + "description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.", + "homepage": "https://opis.io/closure", "keywords": [ - "parser", - "php" + "anonymous functions", + "closure", + "function", + "serializable", + "serialization", + "serialize" ], - "time": "2019-11-08T13:50:10+00:00" + "time": "2020-11-07T02:01:34+00:00" }, { "name": "paragonie/random_compat", - "version": "v9.99.99", + "version": "v9.99.100", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95" + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", - "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a", + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a", "shasum": "" }, "require": { - "php": "^7" + "php": ">= 7" }, "require-dev": { "phpunit/phpunit": "4.*|5.*", @@ -1320,28 +1378,30 @@ "pseudorandom", "random" ], - "time": "2018-07-02T15:55:56+00:00" + "time": "2020-10-15T08:29:30+00:00" }, { "name": "php-di/invoker", - "version": "2.0.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/PHP-DI/Invoker.git", - "reference": "540c27c86f663e20fe39a24cd72fa76cdb21d41a" + "reference": "e08a7c87068daeaeef464b95d81643ea530bc535" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/540c27c86f663e20fe39a24cd72fa76cdb21d41a", - "reference": "540c27c86f663e20fe39a24cd72fa76cdb21d41a", + "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/e08a7c87068daeaeef464b95d81643ea530bc535", + "reference": "e08a7c87068daeaeef464b95d81643ea530bc535", "shasum": "" }, "require": { + "php": ">=7.3", "psr/container": "~1.0" }, "require-dev": { "athletic/athletic": "~0.1.8", - "phpunit/phpunit": "~4.5" + "mnapoli/hard-mode": "~0.3.0", + "phpunit/phpunit": "^9.0" }, "type": "library", "autoload": { @@ -1363,26 +1423,31 @@ "invoke", "invoker" ], - "time": "2017-03-20T19:28:22+00:00" + "funding": [ + { + "url": "https://github.com/mnapoli", + "type": "github" + } + ], + "time": "2020-10-12T12:15:50+00:00" }, { "name": "php-di/php-di", - "version": "6.0.11", + "version": "6.3.0", "source": { "type": "git", "url": "https://github.com/PHP-DI/PHP-DI.git", - "reference": "9bdcc2f41f5fb700ddd01bc4fa8d5bd7b3f94620" + "reference": "955cacea6b0beaba07e8c11b8367f5b3d5abe89f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/9bdcc2f41f5fb700ddd01bc4fa8d5bd7b3f94620", - "reference": "9bdcc2f41f5fb700ddd01bc4fa8d5bd7b3f94620", + "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/955cacea6b0beaba07e8c11b8367f5b3d5abe89f", + "reference": "955cacea6b0beaba07e8c11b8367f5b3d5abe89f", "shasum": "" }, "require": { - "jeremeamia/superclosure": "^2.0", - "nikic/php-parser": "^2.0|^3.0|^4.0", - "php": ">=7.0.0", + "opis/closure": "^3.5.5", + "php": ">=7.2.0", "php-di/invoker": "^2.0", "php-di/phpdoc-reader": "^2.0.1", "psr/container": "^1.0" @@ -1393,10 +1458,10 @@ "require-dev": { "doctrine/annotations": "~1.2", "friendsofphp/php-cs-fixer": "^2.4", - "mnapoli/phpunit-easymock": "~1.0", + "mnapoli/phpunit-easymock": "^1.2", "ocramius/proxy-manager": "~2.0.2", - "phpstan/phpstan": "^0.9.2", - "phpunit/phpunit": "~6.4" + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^8.5|^9.0" }, "suggest": { "doctrine/annotations": "Install it if you want to use annotations (version ~1.2)", @@ -1416,7 +1481,7 @@ "MIT" ], "description": "The dependency injection container for humans", - "homepage": "http://php-di.org/", + "homepage": "https://php-di.org/", "keywords": [ "PSR-11", "container", @@ -1426,27 +1491,38 @@ "ioc", "psr11" ], - "time": "2019-12-12T07:58:02+00:00" + "funding": [ + { + "url": "https://github.com/mnapoli", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/php-di/php-di", + "type": "tidelift" + } + ], + "time": "2020-10-12T14:39:15+00:00" }, { "name": "php-di/phpdoc-reader", - "version": "2.1.1", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/PHP-DI/PhpDocReader.git", - "reference": "15678f7451c020226807f520efb867ad26fbbfcf" + "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/PhpDocReader/zipball/15678f7451c020226807f520efb867ad26fbbfcf", - "reference": "15678f7451c020226807f520efb867ad26fbbfcf", + "url": "https://api.github.com/repos/PHP-DI/PhpDocReader/zipball/66daff34cbd2627740ffec9469ffbac9f8c8185c", + "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": ">=7.2.0" }, "require-dev": { - "phpunit/phpunit": "~4.6" + "mnapoli/hard-mode": "~0.3.0", + "phpunit/phpunit": "^8.5|^9.0" }, "type": "library", "autoload": { @@ -1463,31 +1539,35 @@ "phpdoc", "reflection" ], - "time": "2019-09-26T11:24:58+00:00" + "time": "2020-10-12T12:39:22+00:00" }, { "name": "phpmailer/phpmailer", - "version": "v6.1.4", + "version": "v6.2.0", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "c5e61d0729507049cec9673aa1a679f9adefd683" + "reference": "e38888a75c070304ca5514197d4847a59a5c853f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/c5e61d0729507049cec9673aa1a679f9adefd683", - "reference": "c5e61d0729507049cec9673aa1a679f9adefd683", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/e38888a75c070304ca5514197d4847a59a5c853f", + "reference": "e38888a75c070304ca5514197d4847a59a5c853f", "shasum": "" }, "require": { "ext-ctype": "*", "ext-filter": "*", + "ext-hash": "*", "php": ">=5.5.0" }, "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "doctrine/annotations": "^1.2", - "friendsofphp/php-cs-fixer": "^2.2", - "phpunit/phpunit": "^4.8 || ^5.7" + "phpcompatibility/php-compatibility": "^9.3.5", + "roave/security-advisories": "dev-latest", + "squizlabs/php_codesniffer": "^3.5.6", + "yoast/phpunit-polyfills": "^0.2.0" }, "suggest": { "ext-mbstring": "Needed to send email in multibyte encoding charset", @@ -1525,28 +1605,34 @@ } ], "description": "PHPMailer is a full-featured email creation and transfer class for PHP", - "time": "2019-12-10T11:17:38+00:00" + "funding": [ + { + "url": "https://github.com/Synchro", + "type": "github" + } + ], + "time": "2020-11-25T15:24:57+00:00" }, { "name": "phpoption/phpoption", - "version": "1.7.2", + "version": "1.7.5", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "77f7c4d2e65413aff5b5a8cc8b3caf7a28d81959" + "reference": "994ecccd8f3283ecf5ac33254543eb0ac946d525" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/77f7c4d2e65413aff5b5a8cc8b3caf7a28d81959", - "reference": "77f7c4d2e65413aff5b5a8cc8b3caf7a28d81959", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/994ecccd8f3283ecf5ac33254543eb0ac946d525", + "reference": "994ecccd8f3283ecf5ac33254543eb0ac946d525", "shasum": "" }, "require": { - "php": "^5.5.9 || ^7.0" + "php": "^5.5.9 || ^7.0 || ^8.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.3", - "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0" + "bamarni/composer-bin-plugin": "^1.4.1", + "phpunit/phpunit": "^4.8.35 || ^5.7.27 || ^6.5.6 || ^7.0 || ^8.0 || ^9.0" }, "type": "library", "extra": { @@ -1580,20 +1666,30 @@ "php", "type" ], - "time": "2019-12-15T19:35:24+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption", + "type": "tidelift" + } + ], + "time": "2020-07-20T17:29:33+00:00" }, { "name": "phpseclib/phpseclib", - "version": "2.0.23", + "version": "2.0.29", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099" + "reference": "497856a8d997f640b4a516062f84228a772a48a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c78eb5058d5bb1a183133c36d4ba5b6675dfa099", - "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/497856a8d997f640b4a516062f84228a772a48a8", + "reference": "497856a8d997f640b4a516062f84228a772a48a8", "shasum": "" }, "require": { @@ -1602,7 +1698,6 @@ "require-dev": { "phing/phing": "~2.7", "phpunit/phpunit": "^4.8.35|^5.7|^6.0", - "sami/sami": "~2.0", "squizlabs/php_codesniffer": "~2.0" }, "suggest": { @@ -1672,7 +1767,21 @@ "x.509", "x509" ], - "time": "2019-09-17T03:41:22+00:00" + "funding": [ + { + "url": "https://github.com/terrafrost", + "type": "github" + }, + { + "url": "https://www.patreon.com/phpseclib", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib", + "type": "tidelift" + } + ], + "time": "2020-09-08T04:24:43+00:00" }, { "name": "psr/container", @@ -1775,16 +1884,16 @@ }, { "name": "psr/log", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, "require": { @@ -1818,7 +1927,7 @@ "psr", "psr-3" ], - "time": "2019-11-01T11:05:21+00:00" + "time": "2020-03-23T09:12:05+00:00" }, { "name": "ralouphie/getallheaders", @@ -1866,12 +1975,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "67ac6ea8f4a078c3c9b7aec5d7ae70f098c37389" + "reference": "676668eda60bb8a32bd2a4efcb12c96d6e1c4bc6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/67ac6ea8f4a078c3c9b7aec5d7ae70f098c37389", - "reference": "67ac6ea8f4a078c3c9b7aec5d7ae70f098c37389", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/676668eda60bb8a32bd2a4efcb12c96d6e1c4bc6", + "reference": "676668eda60bb8a32bd2a4efcb12c96d6e1c4bc6", "shasum": "" }, "conflict": { @@ -1880,22 +1989,32 @@ "alterphp/easyadmin-extension-bundle": ">=1.2,<1.2.11|>=1.3,<1.3.1", "amphp/artax": "<1.0.6|>=2,<2.0.6", "amphp/http": "<1.0.1", + "amphp/http-client": ">=4,<4.4", "api-platform/core": ">=2.2,<2.2.10|>=2.3,<2.3.6", "asymmetricrypt/asymmetricrypt": ">=0,<9.9.99", "aws/aws-sdk-php": ">=3,<3.2.1", + "bagisto/bagisto": "<0.1.5", + "barrelstrength/sprout-base-email": "<1.2.7", + "barrelstrength/sprout-forms": "<3.9", + "baserproject/basercms": ">=4,<=4.3.6|>=4.4,<4.4.1", + "bolt/bolt": "<3.7.1", "brightlocal/phpwhois": "<=4.2.5", + "buddypress/buddypress": "<5.1.2", "bugsnag/bugsnag-laravel": ">=2,<2.0.2", "cakephp/cakephp": ">=1.3,<1.3.18|>=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.5.18|>=3.6,<3.6.15|>=3.7,<3.7.7", "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4", "cartalyst/sentry": "<=2.1.6", + "centreon/centreon": "<18.10.8|>=19,<19.4.5", + "cesnet/simplesamlphp-module-proxystatistics": "<3.1", "codeigniter/framework": "<=3.0.6", "composer/composer": "<=1-alpha.11", "contao-components/mediaelement": ">=2.14.2,<2.21.1", "contao/core": ">=2,<3.5.39", - "contao/core-bundle": ">=4,<4.4.46|>=4.5,<4.8.6", + "contao/core-bundle": ">=4,<4.4.52|>=4.5,<4.9.6|= 4.10.0", "contao/listing-bundle": ">=4,<4.4.8", "datadog/dd-trace": ">=0.30,<0.30.2", "david-garcia/phpwhois": "<=4.3.1", + "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1", "doctrine/annotations": ">=1,<1.2.7", "doctrine/cache": ">=1,<1.3.2|>=1.4,<1.4.2", "doctrine/common": ">=2,<2.4.3|>=2.5,<2.5.1", @@ -1905,97 +2024,161 @@ "doctrine/mongodb-odm": ">=1,<1.0.2", "doctrine/mongodb-odm-bundle": ">=2,<3.0.1", "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1", + "dolibarr/dolibarr": "<11.0.4", "dompdf/dompdf": ">=0.6,<0.6.2", - "drupal/core": ">=7,<7.69|>=8,<8.7.11|>=8.8,<8.8.1", - "drupal/drupal": ">=7,<7.69|>=8,<8.7.11|>=8.8,<8.8.1", + "drupal/core": ">=7,<7.74|>=8,<8.8.11|>=8.9,<8.9.9|>=9,<9.0.8", + "drupal/drupal": ">=7,<7.74|>=8,<8.8.11|>=8.9,<8.9.9|>=9,<9.0.8", "endroid/qr-code-bundle": "<3.4.2", + "enshrined/svg-sanitize": "<0.13.1", "erusev/parsedown": "<1.7.2", - "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.4", - "ezsystems/ezpublish-kernel": ">=5.3,<5.3.12.1|>=5.4,<5.4.13.1|>=6,<6.7.9.1|>=6.8,<6.13.5.1|>=7,<7.2.4.1|>=7.3,<7.3.2.1", - "ezsystems/ezpublish-legacy": ">=5.3,<5.3.12.6|>=5.4,<5.4.12.3|>=2011,<2017.12.4.3|>=2018.6,<2018.6.1.4|>=2018.9,<2018.9.1.3", + "ezsystems/demobundle": ">=5.4,<5.4.6.1", + "ezsystems/ez-support-tools": ">=2.2,<2.2.3", + "ezsystems/ezdemo-ls-extension": ">=5.4,<5.4.2.1", + "ezsystems/ezfind-ls": ">=5.3,<5.3.6.1|>=5.4,<5.4.11.1|>=2017.12,<2017.12.0.1", + "ezsystems/ezplatform": ">=1.7,<1.7.9.1|>=1.13,<1.13.5.1|>=2.5,<2.5.4", + "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6", + "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2.1|>=5,<5.0.1|>=5.1,<5.1.1", + "ezsystems/ezplatform-kernel": ">=1,<1.0.2.1", + "ezsystems/ezplatform-user": ">=1,<1.0.1", + "ezsystems/ezpublish-kernel": ">=5.3,<5.3.12.1|>=5.4,<5.4.14.2|>=6,<6.7.9.1|>=6.8,<6.13.6.3|>=7,<7.2.4.1|>=7.3,<7.3.2.1|>=7.5,<7.5.7.1", + "ezsystems/ezpublish-legacy": ">=5.3,<5.3.12.6|>=5.4,<5.4.14.2|>=2011,<2017.12.7.3|>=2018.6,<2018.6.1.4|>=2018.9,<2018.9.1.3|>=2019.3,<2019.3.5.1", + "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3", "ezsystems/repository-forms": ">=2.3,<2.3.2.1", "ezyang/htmlpurifier": "<4.1.1", "firebase/php-jwt": "<2", "fooman/tcpdf": "<6.2.22", "fossar/tcpdf-parser": "<6.2.22", + "friendsofsymfony/oauth2-php": "<1.3", "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2", "friendsofsymfony/user-bundle": ">=1.2,<1.3.5", + "friendsoftypo3/mediace": ">=7.6.2,<7.6.5", "fuel/core": "<1.8.1", + "getgrav/grav": "<1.7-beta.8", + "gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3", "gree/jose": "<=2.2", "gregwar/rst": "<1.0.3", "guzzlehttp/guzzle": ">=4-rc.2,<4.2.4|>=5,<5.3.1|>=6,<6.2.1", "illuminate/auth": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.10", - "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.42|>=5.6,<5.6.30", - "illuminate/database": ">=4,<4.0.99|>=4.1,<4.1.29", + "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.99999|>=4.2,<=4.2.99999|>=5,<=5.0.99999|>=5.1,<=5.1.99999|>=5.2,<=5.2.99999|>=5.3,<=5.3.99999|>=5.4,<=5.4.99999|>=5.5,<=5.5.49|>=5.6,<=5.6.99999|>=5.7,<=5.7.99999|>=5.8,<=5.8.99999|>=6,<6.18.31|>=7,<7.22.4", + "illuminate/database": ">=4,<4.0.99|>=4.1,<4.1.29|>=5.5,<=5.5.44|>=6,<6.18.34|>=7,<7.23.2", "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15", + "illuminate/view": ">=7,<7.1.2", "ivankristianto/phpwhois": "<=4.3", "james-heinrich/getid3": "<1.9.9", "joomla/session": "<1.3.1", "jsmitty12/phpwhois": "<5.1", "kazist/phpwhois": "<=4.2.6", + "kitodo/presentation": "<3.1.2", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", - "laravel/framework": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.42|>=5.6,<5.6.30", + "laravel/framework": ">=4,<4.0.99|>=4.1,<=4.1.99999|>=4.2,<=4.2.99999|>=5,<=5.0.99999|>=5.1,<=5.1.99999|>=5.2,<=5.2.99999|>=5.3,<=5.3.99999|>=5.4,<=5.4.99999|>=5.5,<=5.5.49|>=5.6,<=5.6.99999|>=5.7,<=5.7.99999|>=5.8,<=5.8.99999|>=6,<6.18.34|>=7,<7.23.2", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", "league/commonmark": "<0.18.3", + "librenms/librenms": "<1.53", + "livewire/livewire": ">2.2.4,<2.2.6", + "magento/community-edition": ">=2,<2.2.10|>=2.3,<2.3.3", "magento/magento1ce": "<1.9.4.3", "magento/magento1ee": ">=1,<1.14.4.3", "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2-p.2", + "marcwillmann/turn": "<0.3.3", + "mediawiki/core": ">=1.27,<1.27.6|>=1.29,<1.29.3|>=1.30,<1.30.2|>=1.31,<1.31.9|>=1.32,<1.32.6|>=1.32.99,<1.33.3|>=1.33.99,<1.34.3|>=1.34.99,<1.35", + "mittwald/typo3_forum": "<1.2.1", "monolog/monolog": ">=1.8,<1.12", "namshi/jose": "<2.2", + "nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6", + "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13", + "nystudio107/craft-seomatic": "<3.3", + "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1", + "october/backend": ">=1.0.319,<1.0.470", + "october/cms": "= 1.0.469|>=1.0.319,<1.0.469", + "october/october": ">=1.0.319,<1.0.466", + "october/rain": ">=1.0.319,<1.0.468", "onelogin/php-saml": "<2.10.4", + "oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5", "openid/php-openid": "<2.3", + "openmage/magento-lts": "<19.4.8|>=20,<20.0.4", + "orchid/platform": ">=9,<9.4.4", "oro/crm": ">=1.7,<1.7.4", "oro/platform": ">=1.7,<1.7.4", "padraic/humbug_get_contents": "<1.1.2", "pagarme/pagarme-php": ">=0,<3", "paragonie/random_compat": "<2", + "passbolt/passbolt_api": "<2.11", "paypal/merchant-sdk-php": "<3.12", - "pear/archive_tar": "<1.4.4", - "phpmailer/phpmailer": ">=5,<5.2.27|>=6,<6.0.6", - "phpoffice/phpexcel": "<=1.8.1", - "phpoffice/phpspreadsheet": "<=1.5", + "pear/archive_tar": "<1.4.11", + "personnummer/personnummer": "<3.0.2", + "phpfastcache/phpfastcache": ">=5,<5.0.13", + "phpmailer/phpmailer": "<6.1.6", + "phpmussel/phpmussel": ">=1,<1.6", + "phpmyadmin/phpmyadmin": "<4.9.6|>=5,<5.0.3", + "phpoffice/phpexcel": "<1.8.2", + "phpoffice/phpspreadsheet": "<1.8", "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3", "phpwhois/phpwhois": "<=4.2.5", "phpxmlrpc/extras": "<0.6.1", + "pimcore/pimcore": "<6.3", + "pocketmine/pocketmine-mp": "<3.15.4", + "prestashop/autoupgrade": ">=4,<4.10.1", + "prestashop/contactform": ">1.0.1,<4.3", + "prestashop/gamification": "<2.3.2", + "prestashop/productcomments": ">=4,<4.2", + "prestashop/ps_facetedsearch": "<3.4.1", + "privatebin/privatebin": "<1.2.2|>=1.3,<1.3.2", "propel/propel": ">=2-alpha.1,<=2-alpha.7", "propel/propel1": ">=1,<=1.7.1", + "pterodactyl/panel": "<0.7.19|>=1-rc.0,<=1-rc.6", "pusher/pusher-php-server": "<2.2.1", - "robrichards/xmlseclibs": ">=1,<3.0.4", + "rainlab/debugbar-plugin": "<3.1", + "robrichards/xmlseclibs": "<3.0.4", + "sabberworm/php-css-parser": ">=1,<1.0.1|>=2,<2.0.1|>=3,<3.0.1|>=4,<4.0.1|>=5,<5.0.9|>=5.1,<5.1.3|>=5.2,<5.2.1|>=6,<6.0.2|>=7,<7.0.4|>=8,<8.0.1|>=8.1,<8.1.1|>=8.2,<8.2.1|>=8.3,<8.3.1", "sabre/dav": ">=1.6,<1.6.99|>=1.7,<1.7.11|>=1.8,<1.8.9", "scheb/two-factor-bundle": ">=0,<3.26|>=4,<4.11", "sensiolabs/connect": "<4.2.3", "serluck/phpwhois": "<=4.2.6", - "shopware/shopware": "<5.3.7", - "silverstripe/cms": ">=3,<=3.0.11|>=3.1,<3.1.11", + "shopware/core": "<=6.3.2", + "shopware/platform": "<=6.3.2", + "shopware/shopware": "<5.6.9", + "silverstripe/admin": ">=1.0.3,<1.0.4|>=1.1,<1.1.1", + "silverstripe/assets": ">=1,<1.4.7|>=1.5,<1.5.2", + "silverstripe/cms": "<4.3.6|>=4.4,<4.4.4", + "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1", "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3", - "silverstripe/framework": ">=3,<3.6.7|>=3.7,<3.7.3|>=4,<4.4", - "silverstripe/graphql": ">=2,<2.0.5|>=3,<3.1.2", + "silverstripe/framework": "<4.4.7|>=4.5,<4.5.4", + "silverstripe/graphql": ">=2,<2.0.5|>=3,<3.1.2|>=3.2,<3.2.4", "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1", "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4", + "silverstripe/subsites": ">=2,<2.1.1", + "silverstripe/taxonomy": ">=1.3,<1.3.1|>=2,<2.0.1", "silverstripe/userforms": "<3", "simple-updates/phpwhois": "<=1", "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4", - "simplesamlphp/simplesamlphp": "<1.17.8", + "simplesamlphp/simplesamlphp": "<1.18.6", "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", + "simplito/elliptic-php": "<1.0.6", "slim/slim": "<2.6", "smarty/smarty": "<3.1.33", "socalnick/scn-social-auth": "<1.15.2", "spoonity/tcpdf": "<6.2.22", "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", + "ssddanbrown/bookstack": "<0.29.2", "stormpath/sdk": ">=0,<9.9.99", - "studio-42/elfinder": "<2.1.48", + "studio-42/elfinder": "<2.1.49", + "sulu/sulu": "<1.6.34|>=2,<2.0.10|>=2.1,<2.1.1", "swiftmailer/swiftmailer": ">=4,<5.4.5", "sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2", "sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1", "sylius/grid-bundle": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1", - "sylius/sylius": ">=1,<1.1.18|>=1.2,<1.2.17|>=1.3,<1.3.12|>=1.4,<1.4.4", + "sylius/resource-bundle": "<1.3.14|>=1.4,<1.4.7|>=1.5,<1.5.2|>=1.6,<1.6.4", + "sylius/sylius": "<1.6.9|>=1.7,<1.7.9|>=1.8,<1.8.3", + "symbiote/silverstripe-multivaluefield": ">=3,<3.0.99", + "symbiote/silverstripe-versionedfiles": "<=2.0.3", "symfony/cache": ">=3.1,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8", "symfony/dependency-injection": ">=2,<2.0.17|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", + "symfony/error-handler": ">=4.4,<4.4.4|>=5,<5.0.4", "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", - "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8", - "symfony/http-kernel": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8", + "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7", + "symfony/http-kernel": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.4.13|>=5,<5.1.5", "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", "symfony/mime": ">=4.3,<4.3.8", "symfony/phpunit-bridge": ">=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", @@ -2003,19 +2186,20 @@ "symfony/polyfill-php55": ">=1,<1.10", "symfony/proxy-manager-bridge": ">=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/routing": ">=2,<2.0.19", - "symfony/security": ">=2,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", + "symfony/security": ">=2,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7|>=4.4,<4.4.7|>=5,<5.0.7", "symfony/security-bundle": ">=2,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<2.8.37|>=3,<3.3.17|>=3.4,<3.4.7|>=4,<4.0.7", "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", "symfony/security-guard": ">=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", - "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8", + "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7", "symfony/serializer": ">=2,<2.0.11", - "symfony/symfony": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8", + "symfony/symfony": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.4.13|>=5,<5.1.5", "symfony/translation": ">=2,<2.0.17", "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3", "symfony/var-exporter": ">=4.2,<4.2.12|>=4.3,<4.3.8", "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4", "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7", + "t3g/svg-sanitizer": "<1.0.3", "tecnickcom/tcpdf": "<6.2.22", "thelia/backoffice-default-template": ">=2.1,<2.1.2", "thelia/thelia": ">=2.1-beta.1,<2.1.3", @@ -2023,22 +2207,27 @@ "titon/framework": ">=0,<9.9.99", "truckersmp/phpwhois": "<=4.3.1", "twig/twig": "<1.38|>=2,<2.7", - "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.30|>=9,<9.5.12|>=10,<10.2.1", - "typo3/cms-core": ">=8,<8.7.30|>=9,<9.5.12|>=10,<10.2.1", + "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.23|>=10,<10.4.10", + "typo3/cms-core": ">=8,<8.7.38|>=9,<9.5.23|>=10,<10.4.10", "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5", "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4", "typo3/phar-stream-wrapper": ">=1,<2.1.1|>=3,<3.1.1", + "typo3fluid/fluid": ">=2,<2.0.8|>=2.1,<2.1.7|>=2.2,<2.2.4|>=2.3,<2.3.7|>=2.4,<2.4.4|>=2.5,<2.5.11|>=2.6,<2.6.10", "ua-parser/uap-php": "<3.8", + "usmanhalalit/pixie": "<1.0.3|>=2,<2.0.2", + "verot/class.upload.php": "<=1.0.3|>=2,<=2.0.4", "wallabag/tcpdf": "<6.2.22", "willdurand/js-translation-bundle": "<2.1.1", + "yii2mod/yii2-cms": "<1.9.2", "yiisoft/yii": ">=1.1.14,<1.1.15", - "yiisoft/yii2": "<2.0.15", + "yiisoft/yii2": "<2.0.38", "yiisoft/yii2-bootstrap": "<2.0.4", "yiisoft/yii2-dev": "<2.0.15", "yiisoft/yii2-elasticsearch": "<2.0.5", "yiisoft/yii2-gii": "<2.0.4", "yiisoft/yii2-jui": "<2.0.4", "yiisoft/yii2-redis": "<2.0.8", + "yourls/yourls": "<1.7.4", "zendframework/zend-cache": ">=2.4,<2.4.8|>=2.5,<2.5.3", "zendframework/zend-captcha": ">=2,<2.4.9|>=2.5,<2.5.2", "zendframework/zend-crypt": ">=2,<2.4.9|>=2.5,<2.5.2", @@ -2075,23 +2264,38 @@ "name": "Marco Pivetta", "email": "ocramius@gmail.com", "role": "maintainer" + }, + { + "name": "Ilya Tribusean", + "email": "slash3b@gmail.com", + "role": "maintainer" } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2020-01-06T19:16:46+00:00" + "funding": [ + { + "url": "https://github.com/Ocramius", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/roave/security-advisories", + "type": "tidelift" + } + ], + "time": "2020-12-02T06:02:50+00:00" }, { "name": "symfony/debug", - "version": "v3.4.36", + "version": "v3.4.47", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "f72e33fdb1170b326e72c3157f0cd456351dd086" + "reference": "ab42889de57fdfcfcc0759ab102e2fd4ea72dcae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/f72e33fdb1170b326e72c3157f0cd456351dd086", - "reference": "f72e33fdb1170b326e72c3157f0cd456351dd086", + "url": "https://api.github.com/repos/symfony/debug/zipball/ab42889de57fdfcfcc0759ab102e2fd4ea72dcae", + "reference": "ab42889de57fdfcfcc0759ab102e2fd4ea72dcae", "shasum": "" }, "require": { @@ -2105,11 +2309,6 @@ "symfony/http-kernel": "~2.8|~3.0|~4.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Debug\\": "" @@ -2134,24 +2333,38 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-10-24T15:33:53+00:00" + "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-24T10:57:07+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.13.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3" + "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41", + "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-ctype": "For best performance" @@ -2159,7 +2372,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-main": "1.20-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -2192,35 +2409,217 @@ "polyfill", "portable" ], - "time": "2019-11-27T13:56:44+00:00" + "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-php56", - "version": "v1.13.1", + "name": "symfony/polyfill-intl-idn", + "version": "v1.20.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "53dd1cdf3cb986893ccf2b96665b25b3abb384f4" + "url": "https://github.com/symfony/polyfill-intl-idn.git", + "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/53dd1cdf3cb986893ccf2b96665b25b3abb384f4", - "reference": "53dd1cdf3cb986893ccf2b96665b25b3abb384f4", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3b75acd829741c768bc8b1f84eb33265e7cc5117", + "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117", "shasum": "" }, "require": { - "php": ">=5.3.3", - "symfony/polyfill-util": "~1.0" + "php": ">=7.1", + "symfony/polyfill-intl-normalizer": "^1.10", + "symfony/polyfill-php72": "^1.10" + }, + "suggest": { + "ext-intl": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-main": "1.20-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php56\\": "" + "Symfony\\Polyfill\\Intl\\Idn\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Laurent Bassin", + "email": "laurent@bassin.info" + }, + { + "name": "Trevor Rowbotham", + "email": "trevor.rowbotham@pm.me" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "idn", + "intl", + "polyfill", + "portable", + "shim" + ], + "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-intl-normalizer", + "version": "v1.20.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "727d1096295d807c309fb01a851577302394c897" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/727d1096295d807c309fb01a851577302394c897", + "reference": "727d1096295d807c309fb01a851577302394c897", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.20-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], + "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.20.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930", + "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.20-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" }, "files": [ "bootstrap.php" @@ -2240,7 +2639,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -2248,82 +2647,50 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" - }, - { - "name": "symfony/polyfill-util", - "version": "v1.13.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-util.git", - "reference": "964a67f293b66b95883a5ed918a65354fcd2258f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/964a67f293b66b95883a5ed918a65354fcd2258f", - "reference": "964a67f293b66b95883a5ed918a65354fcd2258f", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.13-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Util\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ + "funding": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "url": "https://symfony.com/sponsor", + "type": "custom" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" } ], - "description": "Symfony utilities for portability of PHP codes", - "homepage": "https://symfony.com", - "keywords": [ - "compat", - "compatibility", - "polyfill", - "shim" - ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "vlucas/phpdotenv", - "version": "v4.1.0", + "version": "v4.1.8", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "0176075a1b7ee9cf86f70143ec79edf7072c975a" + "reference": "572af79d913627a9d70374d27a6f5d689a35de32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/0176075a1b7ee9cf86f70143ec79edf7072c975a", - "reference": "0176075a1b7ee9cf86f70143ec79edf7072c975a", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/572af79d913627a9d70374d27a6f5d689a35de32", + "reference": "572af79d913627a9d70374d27a6f5d689a35de32", "shasum": "" }, "require": { - "php": "^5.5.9 || ^7.0", - "phpoption/phpoption": "^1.7.1", - "symfony/polyfill-ctype": "^1.9" + "php": "^5.5.9 || ^7.0 || ^8.0", + "phpoption/phpoption": "^1.7.3", + "symfony/polyfill-ctype": "^1.17" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.3", - "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0" + "bamarni/composer-bin-plugin": "^1.4.1", + "ext-filter": "*", + "ext-pcre": "*", + "phpunit/phpunit": "^4.8.35 || ^5.7.27 || ^6.5.6 || ^7.0" + }, + "suggest": { + "ext-filter": "Required to use the boolean validator.", + "ext-pcre": "Required to use most of the library." }, "type": "library", "extra": { @@ -2358,7 +2725,17 @@ "env", "environment" ], - "time": "2019-12-14T13:59:29+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", + "type": "tidelift" + } + ], + "time": "2020-07-14T19:22:52+00:00" } ], "packages-dev": [ @@ -2410,36 +2787,31 @@ }, { "name": "doctrine/instantiator", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "ae466f726242e637cebdd526a7d991b9433bacf1" + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1", - "reference": "ae466f726242e637cebdd526a7d991b9433bacf1", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", + "doctrine/coding-standard": "^8.0", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.13", - "phpstan/phpstan-phpunit": "^0.11", - "phpstan/phpstan-shim": "^0.11", - "phpunit/phpunit": "^7.0" + "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" @@ -2453,7 +2825,7 @@ { "name": "Marco Pivetta", "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" + "homepage": "https://ocramius.github.io/" } ], "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", @@ -2462,25 +2834,39 @@ "constructor", "instantiate" ], - "time": "2019-10-21T16:45:58+00:00" + "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%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2020-11-10T18:47:58+00:00" }, { "name": "fabpot/goutte", - "version": "v3.3.0", + "version": "v3.3.1", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/Goutte.git", - "reference": "4ab5199e3ec0ffde0ee0b5ecf568a4fb8398dbae" + "reference": "80a23b64f44d54dd571d114c473d9d7e9ed84ca5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/4ab5199e3ec0ffde0ee0b5ecf568a4fb8398dbae", - "reference": "4ab5199e3ec0ffde0ee0b5ecf568a4fb8398dbae", + "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/80a23b64f44d54dd571d114c473d9d7e9ed84ca5", + "reference": "80a23b64f44d54dd571d114c473d9d7e9ed84ca5", "shasum": "" }, "require": { "guzzlehttp/guzzle": "^6.0", - "php": "^7.1.3", + "php": ">=7.1.3", "symfony/browser-kit": "^4.4|^5.0", "symfony/css-selector": "^4.4|^5.0", "symfony/dom-crawler": "^4.4|^5.0" @@ -2517,7 +2903,7 @@ "keywords": [ "scraper" ], - "time": "2019-12-06T13:11:18+00:00" + "time": "2020-11-01T09:30:18+00:00" }, { "name": "fzaninotto/faker", @@ -2571,20 +2957,20 @@ }, { "name": "myclabs/deep-copy", - "version": "1.9.4", + "version": "1.10.2", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "579bb7356d91f9456ccd505f24ca8b667966a0a7" + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/579bb7356d91f9456ccd505f24ca8b667966a0a7", - "reference": "579bb7356d91f9456ccd505f24ca8b667966a0a7", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "replace": { "myclabs/deep-copy": "self.version" @@ -2615,7 +3001,65 @@ "object", "object graph" ], - "time": "2019-12-15T19:12:40+00:00" + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], + "time": "2020-11-13T09:40:50+00:00" + }, + { + "name": "nikic/php-parser", + "version": "v4.10.3", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984", + "reference": "dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.0" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.9-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "time": "2020-12-03T17:45:45+00:00" }, { "name": "phar-io/manifest", @@ -2721,28 +3165,25 @@ }, { "name": "phpdocumentor/reflection-common", - "version": "2.0.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a" + "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a", - "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", + "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", "shasum": "" }, "require": { - "php": ">=7.1" - }, - "require-dev": { - "phpunit/phpunit": "~6" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-2.x": "2.x-dev" } }, "autoload": { @@ -2769,45 +3210,41 @@ "reflection", "static analysis" ], - "time": "2018-08-07T13:53:10+00:00" + "time": "2020-06-27T09:03:43+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.3.4", + "version": "5.2.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c" + "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/da3fd972d6bafd628114f7e7e036f45944b62e9c", - "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", + "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", "shasum": "" }, "require": { - "php": "^7.0", - "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0", - "phpdocumentor/type-resolver": "~0.4 || ^1.0.0", - "webmozart/assert": "^1.0" + "ext-filter": "*", + "php": "^7.2 || ^8.0", + "phpdocumentor/reflection-common": "^2.2", + "phpdocumentor/type-resolver": "^1.3", + "webmozart/assert": "^1.9.1" }, "require-dev": { - "doctrine/instantiator": "^1.0.5", - "mockery/mockery": "^1.0", - "phpdocumentor/type-resolver": "0.4.*", - "phpunit/phpunit": "^6.4" + "mockery/mockery": "~1.3.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.x-dev" + "dev-master": "5.x-dev" } }, "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] + "phpDocumentor\\Reflection\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -2818,38 +3255,40 @@ { "name": "Mike van Riel", "email": "me@mikevanriel.com" + }, + { + "name": "Jaap van Otterdijk", + "email": "account@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.", - "time": "2019-12-28T18:55:12+00:00" + "time": "2020-09-03T19:13:55+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.0.1", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9" + "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", - "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0", + "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0", "shasum": "" }, "require": { - "php": "^7.1", + "php": "^7.2 || ^8.0", "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { - "ext-tokenizer": "^7.1", - "mockery/mockery": "~1", - "phpunit/phpunit": "^7.0" + "ext-tokenizer": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-1.x": "1.x-dev" } }, "autoload": { @@ -2868,28 +3307,28 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "time": "2019-08-22T18:11:29+00:00" + "time": "2020-09-17T18:55:26+00:00" }, { "name": "phpspec/prophecy", - "version": "1.10.1", + "version": "v1.10.3", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "cbe1df668b3fe136bcc909126a0f529a78d4cbbc" + "reference": "451c3cd1418cf640de218914901e51b064abb093" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/cbe1df668b3fe136bcc909126a0f529a78d4cbbc", - "reference": "cbe1df668b3fe136bcc909126a0f529a78d4cbbc", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093", + "reference": "451c3cd1418cf640de218914901e51b064abb093", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", - "sebastian/comparator": "^1.2.3|^2.0|^3.0", - "sebastian/recursion-context": "^1.0|^2.0|^3.0" + "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0" }, "require-dev": { "phpspec/phpspec": "^2.5 || ^3.2", @@ -2931,7 +3370,7 @@ "spy", "stub" ], - "time": "2019-12-22T21:05:45+00:00" + "time": "2020-03-05T15:02:03+00:00" }, { "name": "phpunit/dbunit", @@ -3381,23 +3820,23 @@ }, { "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18" + "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", - "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": ">=5.6" }, "require-dev": { - "phpunit/phpunit": "^5.7 || ^6.0" + "phpunit/phpunit": "^8.5" }, "type": "library", "extra": { @@ -3422,7 +3861,13 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2017-03-04T06:30:41+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T08:15:22+00:00" }, { "name": "sebastian/comparator", @@ -3592,20 +4037,20 @@ }, { "name": "sebastian/exporter", - "version": "3.1.2", + "version": "3.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e" + "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e", - "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e", + "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e", "shasum": "" }, "require": { - "php": "^7.0", + "php": ">=7.0", "sebastian/recursion-context": "^3.0" }, "require-dev": { @@ -3655,7 +4100,13 @@ "export", "exporter" ], - "time": "2019-09-14T09:02:43+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T07:47:53+00:00" }, { "name": "sebastian/global-state", @@ -3710,20 +4161,20 @@ }, { "name": "sebastian/object-enumerator", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" + "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", - "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", "shasum": "" }, "require": { - "php": "^7.0", + "php": ">=7.0", "sebastian/object-reflector": "^1.1.1", "sebastian/recursion-context": "^3.0" }, @@ -3753,24 +4204,30 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-08-03T12:35:26+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T07:40:27+00:00" }, { "name": "sebastian/object-reflector", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "773f97c67f28de00d397be301821b06708fca0be" + "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be", - "reference": "773f97c67f28de00d397be301821b06708fca0be", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", "shasum": "" }, "require": { - "php": "^7.0" + "php": ">=7.0" }, "require-dev": { "phpunit/phpunit": "^6.0" @@ -3798,24 +4255,30 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "time": "2017-03-29T09:07:27+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T07:37:18+00:00" }, { "name": "sebastian/recursion-context", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8" + "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", - "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", + "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", "shasum": "" }, "require": { - "php": "^7.0" + "php": ">=7.0" }, "require-dev": { "phpunit/phpunit": "^6.0" @@ -3836,14 +4299,14 @@ "BSD-3-Clause" ], "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, { "name": "Sebastian Bergmann", "email": "sebastian@phpunit.de" }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, { "name": "Adam Harvey", "email": "aharvey@php.net" @@ -3851,7 +4314,13 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2017-03-03T06:23:57+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T07:34:24+00:00" }, { "name": "sebastian/resource-operations", @@ -3940,20 +4409,20 @@ }, { "name": "symfony/browser-kit", - "version": "v5.0.2", + "version": "v5.2.0", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "a195f83b0ba20e622a5baa726af96826b8f5616b" + "reference": "4fc769a12282a12bc47f883f04f01ff3777e369b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/a195f83b0ba20e622a5baa726af96826b8f5616b", - "reference": "a195f83b0ba20e622a5baa726af96826b8f5616b", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/4fc769a12282a12bc47f883f04f01ff3777e369b", + "reference": "4fc769a12282a12bc47f883f04f01ff3777e369b", "shasum": "" }, "require": { - "php": "^7.2.5", + "php": ">=7.2.5", "symfony/dom-crawler": "^4.4|^5.0" }, "require-dev": { @@ -3966,11 +4435,6 @@ "symfony/process": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\BrowserKit\\": "" @@ -3995,31 +4459,40 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2019-11-18T17:27:11+00:00" + "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-11-14T11:04:29+00:00" }, { "name": "symfony/css-selector", - "version": "v5.0.2", + "version": "v5.2.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "19d29e7098b7b2c3313cb03902ca30f100dcb837" + "reference": "b8d8eb06b0942e84a69e7acebc3e9c1e6e6e7256" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/19d29e7098b7b2c3313cb03902ca30f100dcb837", - "reference": "19d29e7098b7b2c3313cb03902ca30f100dcb837", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/b8d8eb06b0942e84a69e7acebc3e9c1e6e6e7256", + "reference": "b8d8eb06b0942e84a69e7acebc3e9c1e6e6e7256", "shasum": "" }, "require": { - "php": "^7.2.5" + "php": ">=7.2.5" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\CssSelector\\": "" @@ -4048,26 +4521,41 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2019-11-18T17:27:11+00:00" + "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-28T21:31:18+00:00" }, { "name": "symfony/dom-crawler", - "version": "v5.0.2", + "version": "v5.2.0", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "0a0a73a0836926898b6fcd6817fe697487a73d97" + "reference": "0969122fe144dd8ab2e8c98c7e03eedc621b368c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/0a0a73a0836926898b6fcd6817fe697487a73d97", - "reference": "0a0a73a0836926898b6fcd6817fe697487a73d97", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/0969122fe144dd8ab2e8c98c7e03eedc621b368c", + "reference": "0969122fe144dd8ab2e8c98c7e03eedc621b368c", "shasum": "" }, "require": { - "php": "^7.2.5", + "php": ">=7.2.5", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.0" + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "^1.15" }, "conflict": { "masterminds/html5": "<2.6" @@ -4080,11 +4568,6 @@ "symfony/css-selector": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\DomCrawler\\": "" @@ -4109,24 +4592,38 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2019-11-18T17:27:11+00:00" + "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-24T12:01:57+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.13.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" + "reference": "39d483bdf39be819deabf04ec872eb0b2410b531" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531", + "reference": "39d483bdf39be819deabf04ec872eb0b2410b531", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-mbstring": "For best performance" @@ -4134,7 +4631,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-main": "1.20-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -4168,24 +4669,118 @@ "portable", "shim" ], - "time": "2019-11-27T14:18:11+00:00" + "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/yaml", - "version": "v4.4.2", + "name": "symfony/polyfill-php80", + "version": "v1.20.0", "source": { "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "a08832b974dd5fafe3085a66d41fe4c84bb2628c" + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/a08832b974dd5fafe3085a66d41fe4c84bb2628c", - "reference": "a08832b974dd5fafe3085a66d41fe4c84bb2628c", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/e70aa8b064c5b72d3df2abd5ab1e90464ad009de", + "reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.20-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "files": [ + "bootstrap.php" + ], + "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" + ], + "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/yaml", + "version": "v4.4.17", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "7531361cf38e4816821b4a12a42542b3c6143ad1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/7531361cf38e4816821b4a12a42542b3c6143ad1", + "reference": "7531361cf38e4816821b4a12a42542b3c6143ad1", + "shasum": "" + }, + "require": { + "php": ">=7.1.3", "symfony/polyfill-ctype": "~1.8" }, "conflict": { @@ -4198,11 +4793,6 @@ "symfony/console": "For validating YAML files using the lint command" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Yaml\\": "" @@ -4227,7 +4817,21 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-12-10T10:33:21+00:00" + "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-11-24T12:28:30+00:00" }, { "name": "syspass/extension-installer-plugin", @@ -4315,23 +4919,23 @@ }, { "name": "theseer/tokenizer", - "version": "1.1.3", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9" + "reference": "75a63c33a8577608444246075ea0af0d052e452a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9", - "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a", + "reference": "75a63c33a8577608444246075ea0af0d052e452a", "shasum": "" }, "require": { "ext-dom": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": "^7.0" + "php": "^7.2 || ^8.0" }, "type": "library", "autoload": { @@ -4346,33 +4950,40 @@ "authors": [ { "name": "Arne Blankerts", - "role": "Developer", - "email": "arne@blankerts.de" + "email": "arne@blankerts.de", + "role": "Developer" } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "time": "2019-06-13T22:48:21+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2020-07-12T23:59:07+00:00" }, { "name": "webmozart/assert", - "version": "1.6.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "573381c0a64f155a0d9a23f4b0c797194805b925" + "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/573381c0a64f155a0d9a23f4b0c797194805b925", - "reference": "573381c0a64f155a0d9a23f4b0c797194805b925", + "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", + "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0", + "php": "^5.3.3 || ^7.0 || ^8.0", "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "vimeo/psalm": "<3.6.0" + "phpstan/phpstan": "<0.12.20", + "vimeo/psalm": "<3.9.1" }, "require-dev": { "phpunit/phpunit": "^4.8.36 || ^7.5.13" @@ -4399,7 +5010,7 @@ "check", "validate" ], - "time": "2019-11-24T13:36:37+00:00" + "time": "2020-07-08T17:02:28+00:00" } ], "aliases": [], @@ -4424,5 +5035,6 @@ "ext-libxml": "*", "ext-mbstring": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } diff --git a/lib/SP/Config/Config.php b/lib/SP/Config/Config.php index d05b6c52..b6af0bf1 100644 --- a/lib/SP/Config/Config.php +++ b/lib/SP/Config/Config.php @@ -150,7 +150,7 @@ final class Config /** * @return bool */ - private function isCacheExpired() + private function isCacheExpired(): bool { try { return $this->fileCache->isExpiredDate($this->fileStorage->getFileHandler()->getFileTime()); @@ -165,7 +165,7 @@ final class Config * @return ConfigData * @throws FileException */ - public function loadConfigFromFile() + public function loadConfigFromFile(): ConfigData { return $this->configMapper($this->fileStorage->load('config')->getItems()); } @@ -177,7 +177,7 @@ final class Config * * @return ConfigData */ - private function configMapper(array $items) + private function configMapper(array $items): ConfigData { $configData = new ConfigData(); @@ -202,7 +202,7 @@ final class Config * @return Config * @throws FileException */ - public function saveConfig(ConfigData $configData, $backup = true) + public function saveConfig(ConfigData $configData, $backup = true): Config { if ($backup) { $this->dic->get(ConfigBackupService::class) @@ -226,7 +226,7 @@ final class Config /** * @return int */ - public static function getTimeUpdated() + public static function getTimeUpdated(): int { return self::$timeUpdated; } @@ -238,7 +238,7 @@ final class Config * * @return Config */ - public function updateConfig(ConfigData $configData) + public function updateConfig(ConfigData $configData): Config { $configData->setConfigDate(time()); $configData->setConfigSaver($this->context->getUserData()->getLogin()); @@ -258,7 +258,7 @@ final class Config * * @return ConfigData */ - public function loadConfig($reload = false) + public function loadConfig($reload = false): ConfigData { try { $configData = $this->fileCache->load(); @@ -284,7 +284,7 @@ final class Config /** * @return ConfigData */ - public function getConfigData() + public function getConfigData(): ConfigData { return clone $this->configData; } @@ -294,7 +294,7 @@ final class Config * @throws FileException * @throws EnvironmentIsBrokenException */ - public function generateUpgradeKey() + public function generateUpgradeKey(): Config { if (empty($this->configData->getUpgradeKey())) { logger('Generating upgrade key'); diff --git a/lib/SP/Config/ConfigData.php b/lib/SP/Config/ConfigData.php index a128ab1f..9043d044 100644 --- a/lib/SP/Config/ConfigData.php +++ b/lib/SP/Config/ConfigData.php @@ -62,9 +62,9 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @param array $logEvents + * @param array|null $logEvents */ - public function setLogEvents($logEvents) + public function setLogEvents(?array $logEvents) { $this->set('logEvents', $logEvents ?: []); } @@ -78,11 +78,11 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @param boolean $dokuwikiEnabled + * @param bool|null $dokuwikiEnabled * * @return $this */ - public function setDokuwikiEnabled($dokuwikiEnabled) + public function setDokuwikiEnabled(?bool $dokuwikiEnabled): ConfigData { $this->set('dokuwikiEnabled', (bool)$dokuwikiEnabled); @@ -90,19 +90,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getDokuwikiUrl() + public function getDokuwikiUrl(): ?string { return $this->get('dokuwikiUrl'); } /** - * @param string $dokuwikiUrl + * @param string|null $dokuwikiUrl * * @return $this */ - public function setDokuwikiUrl($dokuwikiUrl) + public function setDokuwikiUrl(?string $dokuwikiUrl): ConfigData { $this->set('dokuwikiUrl', $dokuwikiUrl); @@ -110,19 +110,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getDokuwikiUrlBase() + public function getDokuwikiUrlBase(): ?string { return $this->get('dokuwikiUrlBase'); } /** - * @param string $dokuwikiUrlBase + * @param string|null $dokuwikiUrlBase * * @return $this */ - public function setDokuwikiUrlBase($dokuwikiUrlBase) + public function setDokuwikiUrlBase(?string $dokuwikiUrlBase): ConfigData { $this->set('dokuwikiUrlBase', $dokuwikiUrlBase); @@ -130,19 +130,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getDokuwikiUser() + public function getDokuwikiUser(): ?string { return $this->get('dokuwikiUser'); } /** - * @param string $dokuwikiUser + * @param string|null $dokuwikiUser * * @return $this */ - public function setDokuwikiUser($dokuwikiUser) + public function setDokuwikiUser(?string $dokuwikiUser): ConfigData { $this->set('dokuwikiUser', $dokuwikiUser); @@ -150,19 +150,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getDokuwikiPass() + public function getDokuwikiPass(): ?string { return $this->get('dokuwikiPass'); } /** - * @param string $dokuwikiPass + * @param string|null $dokuwikiPass * * @return $this */ - public function setDokuwikiPass($dokuwikiPass) + public function setDokuwikiPass(?string $dokuwikiPass): ConfigData { $this->set('dokuwikiPass', $dokuwikiPass); @@ -170,19 +170,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getDokuwikiNamespace() + public function getDokuwikiNamespace(): ?string { return $this->get('dokuwikiNamespace'); } /** - * @param string $dokuwikiNamespace + * @param string|null $dokuwikiNamespace * * @return $this */ - public function setDokuwikiNamespace($dokuwikiNamespace) + public function setDokuwikiNamespace(?string $dokuwikiNamespace): ConfigData { $this->set('dokuwikiNamespace', $dokuwikiNamespace); @@ -198,11 +198,11 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @param int $ldapDefaultGroup + * @param int|null $ldapDefaultGroup * * @return $this */ - public function setLdapDefaultGroup($ldapDefaultGroup) + public function setLdapDefaultGroup(?int $ldapDefaultGroup): ConfigData { $this->set('ldapDefaultGroup', (int)$ldapDefaultGroup); @@ -218,11 +218,11 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @param int $ldapDefaultProfile + * @param int|null $ldapDefaultProfile * * @return $this */ - public function setLdapDefaultProfile($ldapDefaultProfile) + public function setLdapDefaultProfile(?int $ldapDefaultProfile): ConfigData { $this->set('ldapDefaultProfile', (int)$ldapDefaultProfile); @@ -232,17 +232,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return boolean */ - public function isProxyEnabled() + public function isProxyEnabled(): bool { return $this->get('proxyEnabled', false); } /** - * @param boolean $proxyEnabled + * @param boolean|null $proxyEnabled * * @return $this */ - public function setProxyEnabled($proxyEnabled) + public function setProxyEnabled(?bool $proxyEnabled): ConfigData { $this->set('proxyEnabled', (bool)$proxyEnabled); @@ -250,19 +250,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getProxyServer() + public function getProxyServer(): ?string { return $this->get('proxyServer'); } /** - * @param string $proxyServer + * @param string|null $proxyServer * * @return $this */ - public function setProxyServer($proxyServer) + public function setProxyServer(?string $proxyServer): ConfigData { $this->set('proxyServer', $proxyServer); @@ -272,17 +272,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return int */ - public function getProxyPort() + public function getProxyPort(): int { return $this->get('proxyPort', 8080); } /** - * @param int $proxyPort + * @param int|null $proxyPort * * @return $this */ - public function setProxyPort($proxyPort) + public function setProxyPort(?int $proxyPort): ConfigData { $this->set('proxyPort', (int)$proxyPort); @@ -290,19 +290,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getProxyUser() + public function getProxyUser(): ?string { return $this->get('proxyUser'); } /** - * @param string $proxyUser + * @param string|null $proxyUser * * @return $this */ - public function setProxyUser($proxyUser) + public function setProxyUser(?string $proxyUser): ConfigData { $this->set('proxyUser', $proxyUser); @@ -310,19 +310,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getProxyPass() + public function getProxyPass(): ?string { return $this->get('proxyPass'); } /** - * @param string $proxyPass + * @param string|null $proxyPass * * @return $this */ - public function setProxyPass($proxyPass) + public function setProxyPass(?string $proxyPass): ConfigData { $this->set('proxyPass', $proxyPass); @@ -332,18 +332,18 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return int */ - public function getPublinksMaxViews() + public function getPublinksMaxViews(): int { return $this->get('publinksMaxViews', self::PUBLIC_LINK_MAX_VIEWS); } /** - * @param int $publinksMaxViews + * @param int|null $publinksMaxViews * * @return $this */ - public function setPublinksMaxViews($publinksMaxViews) + public function setPublinksMaxViews(?int $publinksMaxViews): ConfigData { $this->set('publinksMaxViews', (int)$publinksMaxViews); @@ -353,17 +353,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return int */ - public function getPublinksMaxTime() + public function getPublinksMaxTime(): int { return $this->get('publinksMaxTime', self::PUBLIC_LINK_MAX_TIME); } /** - * @param int $publinksMaxTime + * @param int|null $publinksMaxTime * * @return $this */ - public function setPublinksMaxTime($publinksMaxTime) + public function setPublinksMaxTime(?int $publinksMaxTime): ConfigData { $this->set('publinksMaxTime', (int)$publinksMaxTime); @@ -373,17 +373,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return boolean */ - public function isSyslogEnabled() + public function isSyslogEnabled(): bool { return $this->get('syslogEnabled', false); } /** - * @param boolean $syslogEnabled + * @param boolean|null $syslogEnabled * * @return $this */ - public function setSyslogEnabled($syslogEnabled) + public function setSyslogEnabled(?bool $syslogEnabled): ConfigData { $this->set('syslogEnabled', (bool)$syslogEnabled); @@ -393,17 +393,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return boolean */ - public function isSyslogRemoteEnabled() + public function isSyslogRemoteEnabled(): bool { return $this->get('syslogRemoteEnabled', false); } /** - * @param boolean $syslogRemoteEnabled + * @param boolean|null $syslogRemoteEnabled * * @return $this */ - public function setSyslogRemoteEnabled($syslogRemoteEnabled) + public function setSyslogRemoteEnabled(?bool $syslogRemoteEnabled): ConfigData { $this->set('syslogRemoteEnabled', (bool)$syslogRemoteEnabled); @@ -411,19 +411,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getSyslogServer() + public function getSyslogServer(): ?string { return $this->get('syslogServer'); } /** - * @param string $syslogServer + * @param string|null $syslogServer * * @return $this */ - public function setSyslogServer($syslogServer) + public function setSyslogServer(?string $syslogServer): ConfigData { $this->set('syslogServer', $syslogServer); @@ -433,17 +433,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return int */ - public function getSyslogPort() + public function getSyslogPort(): int { return $this->get('syslogPort', self::SYSLOG_PORT); } /** - * @param int $syslogPort + * @param int|null $syslogPort * * @return $this */ - public function setSyslogPort($syslogPort) + public function setSyslogPort(?int $syslogPort): ConfigData { $this->set('syslogPort', (int)$syslogPort); @@ -451,19 +451,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getBackupHash() + public function getBackupHash(): ?string { return $this->get('backup_hash'); } /** - * @param string $backup_hash + * @param string|null $backup_hash * * @return $this */ - public function setBackupHash($backup_hash) + public function setBackupHash(?string $backup_hash): ConfigData { $this->set('backup_hash', $backup_hash); @@ -471,19 +471,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getExportHash() + public function getExportHash(): ?string { return $this->get('export_hash'); } /** - * @param string $export_hash + * @param string|null $export_hash * * @return $this */ - public function setExportHash($export_hash) + public function setExportHash(?string $export_hash): ConfigData { $this->set('export_hash', $export_hash); @@ -491,59 +491,39 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getLdapBindUser() + public function getLdapBindUser(): ?string { return $this->get('ldapBindUser'); } /** - * @param string $ldapBindUser + * @param string|null $ldapBindUser * * @return $this */ - public function setLdapBindUser($ldapBindUser) + public function setLdapBindUser(?string $ldapBindUser): ConfigData { $this->set('ldapBindUser', $ldapBindUser); return $this; } - /** - * @return string - */ - public function getLdapProxyUser() - { - return $this->get('ldapProxyUser'); - } - - /** - * @param string $ldapProxyUser - * - * @return $this - */ - public function setLdapProxyUser($ldapProxyUser) - { - $this->get('ldapProxyUser', $ldapProxyUser); - - return $this; - } - /** * @return int */ - public function getAccountCount() + public function getAccountCount(): int { return $this->get('accountCount', self::ACCOUNT_COUNT); } /** - * @param int $accountCount + * @param int|null $accountCount * * @return $this */ - public function setAccountCount($accountCount) + public function setAccountCount(?int $accountCount): ConfigData { $this->set('accountCount', (int)$accountCount); @@ -553,17 +533,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return boolean */ - public function isAccountLink() + public function isAccountLink(): bool { return $this->get('accountLink', true); } /** - * @param boolean $accountLink + * @param bool|null $accountLink * * @return $this */ - public function setAccountLink($accountLink) + public function setAccountLink(?bool $accountLink): ConfigData { $this->set('accountLink', (bool)$accountLink); @@ -571,19 +551,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isCheckUpdates() + public function isCheckUpdates(): bool { return $this->get('checkUpdates', false); } /** - * @param boolean $checkUpdates + * @param bool|null $checkUpdates * * @return $this */ - public function setCheckUpdates($checkUpdates) + public function setCheckUpdates(?bool $checkUpdates): ConfigData { $this->set('checkUpdates', (bool)$checkUpdates); @@ -601,7 +581,7 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * Generates a hash from current config options */ - public function setConfigHash() + public function setConfigHash(): ConfigData { $this->set('configHash', sha1(serialize($this->attributes))); @@ -609,19 +589,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getDbHost() + public function getDbHost(): ?string { return $this->get('dbHost'); } /** - * @param string $dbHost + * @param string|null $dbHost * * @return $this */ - public function setDbHost($dbHost) + public function setDbHost(?string $dbHost): ConfigData { $this->set('dbHost', $dbHost); @@ -629,19 +609,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getDbName() + public function getDbName(): ?string { return $this->get('dbName'); } /** - * @param string $dbName + * @param string|null $dbName * * @return $this */ - public function setDbName($dbName) + public function setDbName(?string $dbName): ConfigData { $this->set('dbName', $dbName); @@ -649,19 +629,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getDbPass() + public function getDbPass(): ?string { return $this->get('dbPass'); } /** - * @param string $dbPass + * @param string|null $dbPass * * @return $this */ - public function setDbPass($dbPass) + public function setDbPass(?string $dbPass): ConfigData { $this->set('dbPass', $dbPass); @@ -669,19 +649,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getDbUser() + public function getDbUser(): ?string { return $this->get('dbUser'); } /** - * @param string $dbUser + * @param string|null $dbUser * * @return $this */ - public function setDbUser($dbUser) + public function setDbUser(?string $dbUser): ConfigData { $this->set('dbUser', $dbUser); @@ -689,19 +669,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isDebug() + public function isDebug(): bool { return $this->get('debug', false); } /** - * @param boolean $debug + * @param bool|null $debug * * @return $this */ - public function setDebug($debug) + public function setDebug(?bool $debug): ConfigData { $this->set('debug', (bool)$debug); @@ -709,19 +689,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isDemoEnabled() + public function isDemoEnabled(): bool { return $this->get('demoEnabled', false); } /** - * @param boolean $demoEnabled + * @param bool|null $demoEnabled * * @return $this */ - public function setDemoEnabled($demoEnabled) + public function setDemoEnabled(?bool $demoEnabled): ConfigData { $this->set('demoEnabled', (bool)$demoEnabled); @@ -739,17 +719,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return int */ - public function getFilesAllowedSize() + public function getFilesAllowedSize(): int { return $this->get('filesAllowedSize', self::FILES_ALLOWED_SIZE); } /** - * @param int $filesAllowedSize + * @param int|null $filesAllowedSize * * @return $this */ - public function setFilesAllowedSize($filesAllowedSize) + public function setFilesAllowedSize(?int $filesAllowedSize): ConfigData { $this->set('filesAllowedSize', (int)$filesAllowedSize); @@ -757,19 +737,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isFilesEnabled() + public function isFilesEnabled(): bool { return $this->get('filesEnabled', true); } /** - * @param boolean $filesEnabled + * @param bool|null $filesEnabled * * @return $this */ - public function setFilesEnabled($filesEnabled) + public function setFilesEnabled(?bool $filesEnabled): ConfigData { $this->set('filesEnabled', (bool)$filesEnabled); @@ -777,19 +757,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isGlobalSearch() + public function isGlobalSearch(): bool { return $this->get('globalSearch', true); } /** - * @param boolean $globalSearch + * @param bool|null $globalSearch * * @return $this */ - public function setGlobalSearch($globalSearch) + public function setGlobalSearch(?bool $globalSearch): ConfigData { $this->set('globalSearch', (bool)$globalSearch); @@ -797,19 +777,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isInstalled() + public function isInstalled(): bool { return $this->get('installed', false); } /** - * @param boolean $installed + * @param bool|null $installed * * @return $this */ - public function setInstalled($installed) + public function setInstalled(?bool $installed): ConfigData { $this->set('installed', (bool)$installed); @@ -817,19 +797,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getLdapBase() + public function getLdapBase(): ?string { return $this->get('ldapBase'); } /** - * @param string $ldapBase + * @param string|null $ldapBase * * @return $this */ - public function setLdapBase($ldapBase) + public function setLdapBase(?string $ldapBase): ConfigData { $this->set('ldapBase', $ldapBase); @@ -837,19 +817,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isLdapEnabled() + public function isLdapEnabled(): bool { return $this->get('ldapEnabled', false); } /** - * @param boolean $ldapEnabled + * @param bool|null $ldapEnabled * * @return $this */ - public function setLdapEnabled($ldapEnabled) + public function setLdapEnabled(?bool $ldapEnabled): ConfigData { $this->set('ldapEnabled', (bool)$ldapEnabled); @@ -857,19 +837,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getLdapGroup() + public function getLdapGroup(): ?string { return $this->get('ldapGroup'); } /** - * @param string $ldapGroup + * @param string|null $ldapGroup * * @return $this */ - public function setLdapGroup($ldapGroup) + public function setLdapGroup(?string $ldapGroup): ConfigData { $this->set('ldapGroup', $ldapGroup); @@ -877,19 +857,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getLdapServer() + public function getLdapServer(): ?string { return $this->get('ldapServer'); } /** - * @param string $ldapServer + * @param string|null $ldapServer * * @return $this */ - public function setLdapServer($ldapServer) + public function setLdapServer(?string $ldapServer): ConfigData { $this->set('ldapServer', $ldapServer); @@ -897,19 +877,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isLogEnabled() + public function isLogEnabled(): bool { return $this->get('logEnabled', true); } /** - * @param boolean $logEnabled + * @param bool|null $logEnabled * * @return $this */ - public function setLogEnabled($logEnabled) + public function setLogEnabled(?bool $logEnabled): ConfigData { $this->set('logEnabled', (bool)$logEnabled); @@ -917,19 +897,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isMailAuthenabled() + public function isMailAuthenabled(): bool { return $this->get('mailAuthenabled', false); } /** - * @param boolean $mailAuthenabled + * @param bool|null $mailAuthenabled * * @return $this */ - public function setMailAuthenabled($mailAuthenabled) + public function setMailAuthenabled(?bool $mailAuthenabled): ConfigData { $this->set('mailAuthenabled', (bool)$mailAuthenabled); @@ -937,19 +917,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isMailEnabled() + public function isMailEnabled(): bool { return $this->get('mailEnabled', false); } /** - * @param boolean $mailEnabled + * @param bool|null $mailEnabled * * @return $this */ - public function setMailEnabled($mailEnabled) + public function setMailEnabled(?bool $mailEnabled): ConfigData { $this->set('mailEnabled', (bool)$mailEnabled); @@ -957,19 +937,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getMailFrom() + public function getMailFrom(): ?string { return $this->get('mailFrom'); } /** - * @param string $mailFrom + * @param string|null $mailFrom * * @return $this */ - public function setMailFrom($mailFrom) + public function setMailFrom(?string $mailFrom): ConfigData { $this->set('mailFrom', $mailFrom); @@ -977,19 +957,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getMailPass() + public function getMailPass(): ?string { return $this->get('mailPass'); } /** - * @param string $mailPass + * @param string|null $mailPass * * @return $this */ - public function setMailPass($mailPass) + public function setMailPass(?string $mailPass): ConfigData { $this->set('mailPass', $mailPass); @@ -999,17 +979,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return int */ - public function getMailPort() + public function getMailPort(): int { return $this->get('mailPort', self::MAIL_PORT); } /** - * @param int $mailPort + * @param int|null $mailPort * * @return $this */ - public function setMailPort($mailPort) + public function setMailPort(?int $mailPort): ConfigData { $this->set('mailPort', (int)$mailPort); @@ -1017,19 +997,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isMailRequestsEnabled() + public function isMailRequestsEnabled(): bool { return $this->get('mailRequestsEnabled', false); } /** - * @param boolean $mailRequestsEnabled + * @param bool|null $mailRequestsEnabled * * @return $this */ - public function setMailRequestsEnabled($mailRequestsEnabled) + public function setMailRequestsEnabled(?bool $mailRequestsEnabled): ConfigData { $this->set('mailRequestsEnabled', (bool)$mailRequestsEnabled); @@ -1037,19 +1017,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getMailSecurity() + public function getMailSecurity(): ?string { return $this->get('mailSecurity'); } /** - * @param string $mailSecurity + * @param string|null $mailSecurity * * @return $this */ - public function setMailSecurity($mailSecurity) + public function setMailSecurity(?string $mailSecurity): ConfigData { $this->set('mailSecurity', $mailSecurity); @@ -1057,19 +1037,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getMailServer() + public function getMailServer(): ?string { return $this->get('mailServer'); } /** - * @param string $mailServer + * @param string|null $mailServer * * @return $this */ - public function setMailServer($mailServer) + public function setMailServer(?string $mailServer): ConfigData { $this->set('mailServer', $mailServer); @@ -1077,19 +1057,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getMailUser() + public function getMailUser(): ?string { return $this->get('mailUser'); } /** - * @param string $mailUser + * @param string|null $mailUser * * @return $this */ - public function setMailUser($mailUser) + public function setMailUser(?string $mailUser): ConfigData { $this->set('mailUser', $mailUser); @@ -1097,19 +1077,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isMaintenance() + public function isMaintenance(): bool { return $this->get('maintenance', false); } /** - * @param boolean $maintenance + * @param bool|null $maintenance * * @return $this */ - public function setMaintenance($maintenance) + public function setMaintenance(?bool $maintenance): ConfigData { $this->set('maintenance', (bool)$maintenance); @@ -1117,19 +1097,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getPasswordSalt() + public function getPasswordSalt(): ?string { return $this->get('passwordSalt'); } /** - * @param string $passwordSalt + * @param string|null $passwordSalt * * @return $this */ - public function setPasswordSalt($passwordSalt) + public function setPasswordSalt(?string $passwordSalt): ConfigData { $this->set('passwordSalt', $passwordSalt); @@ -1137,19 +1117,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isResultsAsCards() + public function isResultsAsCards(): bool { return $this->get('resultsAsCards', false); } /** - * @param boolean $resultsAsCards + * @param bool|null $resultsAsCards * * @return $this */ - public function setResultsAsCards($resultsAsCards) + public function setResultsAsCards(?bool $resultsAsCards): ConfigData { $this->set('resultsAsCards', (bool)$resultsAsCards); @@ -1159,17 +1139,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return int */ - public function getSessionTimeout() + public function getSessionTimeout(): int { return $this->get('sessionTimeout', self::SESSION_TIMEOUT); } /** - * @param int $sessionTimeout + * @param int|null $sessionTimeout * * @return $this */ - public function setSessionTimeout($sessionTimeout) + public function setSessionTimeout(?int $sessionTimeout): ConfigData { $this->set('sessionTimeout', (int)$sessionTimeout); @@ -1177,19 +1157,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getSiteLang() + public function getSiteLang(): ?string { return $this->get('siteLang'); } /** - * @param string $siteLang + * @param string|null $siteLang * * @return $this */ - public function setSiteLang($siteLang) + public function setSiteLang(?string $siteLang): ConfigData { $this->set('siteLang', $siteLang); @@ -1199,17 +1179,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return string */ - public function getSiteTheme() + public function getSiteTheme(): string { return $this->get('siteTheme', self::SITE_THEME); } /** - * @param string $siteTheme + * @param string|null $siteTheme * * @return $this */ - public function setSiteTheme($siteTheme) + public function setSiteTheme(?string $siteTheme): ConfigData { $this->set('siteTheme', $siteTheme); @@ -1217,19 +1197,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getConfigVersion() + public function getConfigVersion(): ?string { return (string)$this->get('configVersion'); } /** - * @param string $configVersion + * @param string|null $configVersion * * @return $this */ - public function setConfigVersion($configVersion) + public function setConfigVersion(?string $configVersion): ConfigData { $this->set('configVersion', $configVersion); @@ -1237,19 +1217,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isWikiEnabled() + public function isWikiEnabled(): bool { return $this->get('wikiEnabled', false); } /** - * @param boolean $wikiEnabled + * @param bool|null $wikiEnabled * * @return $this */ - public function setWikiEnabled($wikiEnabled) + public function setWikiEnabled(?bool $wikiEnabled): ConfigData { $this->set('wikiEnabled', (bool)$wikiEnabled); @@ -1259,17 +1239,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return array */ - public function getWikiFilter() + public function getWikiFilter(): array { return $this->get('wikiFilter', []); } /** - * @param array $wikiFilter + * @param array|null $wikiFilter * * @return $this */ - public function setWikiFilter($wikiFilter) + public function setWikiFilter(?array $wikiFilter): ConfigData { $this->set('wikiFilter', $wikiFilter ?: []); @@ -1277,19 +1257,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getWikiPageurl() + public function getWikiPageurl(): ?string { return $this->get('wikiPageurl'); } /** - * @param string $wikiPageurl + * @param string|null $wikiPageurl * * @return $this */ - public function setWikiPageurl($wikiPageurl) + public function setWikiPageurl(?string $wikiPageurl): ConfigData { $this->set('wikiPageurl', $wikiPageurl); @@ -1297,19 +1277,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getWikiSearchurl() + public function getWikiSearchurl(): ?string { return $this->get('wikiSearchurl'); } /** - * @param string $wikiSearchurl + * @param string|null $wikiSearchurl * * @return $this */ - public function setWikiSearchurl($wikiSearchurl) + public function setWikiSearchurl(?string $wikiSearchurl): ConfigData { $this->set('wikiSearchurl', $wikiSearchurl); @@ -1317,19 +1297,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getLdapBindPass() + public function getLdapBindPass(): ?string { return $this->get('ldapBindPass'); } /** - * @param string $ldapBindPass + * @param string|null $ldapBindPass * * @return $this */ - public function setLdapBindPass($ldapBindPass) + public function setLdapBindPass(?string $ldapBindPass): ConfigData { $this->set('ldapBindPass', $ldapBindPass); @@ -1337,19 +1317,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isPublinksImageEnabled() + public function isPublinksImageEnabled(): bool { return $this->get('publinksImageEnabled', false); } /** - * @param boolean $publinksImageEnabled + * @param bool|null $publinksImageEnabled * * @return $this */ - public function setPublinksImageEnabled($publinksImageEnabled) + public function setPublinksImageEnabled(?bool $publinksImageEnabled): ConfigData { $this->set('publinksImageEnabled', (bool)$publinksImageEnabled); @@ -1357,19 +1337,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isHttpsEnabled() + public function isHttpsEnabled(): bool { return $this->get('httpsEnabled', false); } /** - * @param boolean $httpsEnabled + * @param bool|null $httpsEnabled * * @return $this */ - public function setHttpsEnabled($httpsEnabled) + public function setHttpsEnabled(?bool $httpsEnabled): ConfigData { $this->set('httpsEnabled', (bool)$httpsEnabled); @@ -1377,39 +1357,39 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isChecknotices() + public function isCheckNotices(): bool { return $this->get('checkNotices', false); } /** - * @param boolean $checknotices + * @param bool|null $checknotices * * @return $this */ - public function setCheckNotices($checknotices) + public function setCheckNotices(?bool $checknotices): ConfigData { - $this->set('checkNotices', $checknotices); + $this->set('checkNotices', (bool)$checknotices); return $this; } /** - * @return boolean + * @return bool */ - public function isAccountPassToImage() + public function isAccountPassToImage(): bool { return $this->get('accountPassToImage', false); } /** - * @param boolean $accountPassToImage + * @param bool|null $accountPassToImage * * @return $this */ - public function setAccountPassToImage($accountPassToImage) + public function setAccountPassToImage(?bool $accountPassToImage): ConfigData { $this->set('accountPassToImage', (bool)$accountPassToImage); @@ -1417,19 +1397,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getUpgradeKey() + public function getUpgradeKey(): ?string { return $this->get('upgradeKey'); } /** - * @param string $upgradeKey + * @param string|null $upgradeKey * * @return $this */ - public function setUpgradeKey($upgradeKey) + public function setUpgradeKey(?string $upgradeKey): ConfigData { $this->set('upgradeKey', $upgradeKey); @@ -1439,17 +1419,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return int */ - public function getDbPort() + public function getDbPort(): int { return $this->get('dbPort', self::DB_PORT); } /** - * @param int $dbPort + * @param int|null $dbPort * * @return $this */ - public function setDbPort($dbPort) + public function setDbPort(?int $dbPort): ConfigData { $this->set('dbPort', (int)$dbPort); @@ -1457,19 +1437,19 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return boolean + * @return bool */ - public function isPublinksEnabled() + public function isPublinksEnabled(): bool { return $this->get('publinksEnabled', false); } /** - * @param boolean $publinksEnabled + * @param bool|null $publinksEnabled * * @return $this */ - public function setPublinksEnabled($publinksEnabled) + public function setPublinksEnabled(?bool $publinksEnabled): ConfigData { $this->set('publinksEnabled', (bool)$publinksEnabled); @@ -1498,11 +1478,11 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @param string $configSaver + * @param string|null $configSaver * * @return $this */ - public function setConfigSaver($configSaver) + public function setConfigSaver(?string $configSaver): ConfigData { $this->set('configSaver', $configSaver); @@ -1510,17 +1490,17 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @return string + * @return string|null */ - public function getDbSocket() + public function getDbSocket(): ?string { return $this->get('dbSocket'); } /** - * @param string $dbSocket + * @param string|null $dbSocket */ - public function setDbSocket($dbSocket) + public function setDbSocket(?string $dbSocket) { $this->set('dbSocket', $dbSocket); } @@ -1528,17 +1508,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return bool */ - public function isEncryptSession() + public function isEncryptSession(): bool { return (bool)$this->get('encryptSession', false); } /** - * @param bool $encryptSession + * @param bool|null $encryptSession * * @return $this */ - public function setEncryptSession($encryptSession) + public function setEncryptSession(?bool $encryptSession): ConfigData { $this->set('encryptSession', (bool)$encryptSession); @@ -1548,17 +1528,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return bool */ - public function isAccountFullGroupAccess() + public function isAccountFullGroupAccess(): bool { return (bool)$this->get('accountFullGroupAccess', false); } /** - * @param bool $accountFullGroupAccess + * @param bool|null $accountFullGroupAccess * * @return $this */ - public function setAccountFullGroupAccess($accountFullGroupAccess) + public function setAccountFullGroupAccess(?bool $accountFullGroupAccess): ConfigData { $this->set('accountFullGroupAccess', (bool)$accountFullGroupAccess); @@ -1568,31 +1548,31 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return bool */ - public function isAuthBasicEnabled() + public function isAuthBasicEnabled(): bool { return (bool)$this->get('authBasicEnabled', true); } /** - * @param bool $authBasicEnabled + * @param bool|null $authBasicEnabled */ - public function setAuthBasicEnabled($authBasicEnabled) + public function setAuthBasicEnabled(?bool $authBasicEnabled) { - $this->set('authBasicEnabled', $authBasicEnabled); + $this->set('authBasicEnabled', (bool)$authBasicEnabled); } /** - * @return string + * @return string|null */ - public function getAuthBasicDomain() + public function getAuthBasicDomain(): ?string { return $this->get('authBasicDomain'); } /** - * @param string $authBasicDomain + * @param string|null $authBasicDomain */ - public function setAuthBasicDomain($authBasicDomain) + public function setAuthBasicDomain(?string $authBasicDomain) { $this->set('authBasicDomain', $authBasicDomain); } @@ -1600,47 +1580,47 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return bool */ - public function isAuthBasicAutoLoginEnabled() + public function isAuthBasicAutoLoginEnabled(): bool { return (bool)$this->get('authBasicAutoLoginEnabled', true); } /** - * @param bool $authBasicAutoLoginEnabled + * @param bool|null $authBasicAutoLoginEnabled */ - public function setAuthBasicAutoLoginEnabled($authBasicAutoLoginEnabled) + public function setAuthBasicAutoLoginEnabled(?bool $authBasicAutoLoginEnabled) { $this->set('authBasicAutoLoginEnabled', $authBasicAutoLoginEnabled); } /** - * @return int + * @return int|null */ - public function getSsoDefaultGroup() + public function getSsoDefaultGroup(): ?int { return $this->get('ssoDefaultGroup'); } /** - * @param int $ssoDefaultGroup + * @param int|null $ssoDefaultGroup */ - public function setSsoDefaultGroup($ssoDefaultGroup) + public function setSsoDefaultGroup(?int $ssoDefaultGroup) { $this->set('ssoDefaultGroup', $ssoDefaultGroup); } /** - * @return int + * @return int|null */ - public function getSsoDefaultProfile() + public function getSsoDefaultProfile(): ?int { return $this->get('ssoDefaultProfile'); } /** - * @param int $ssoDefaultProfile + * @param int|null $ssoDefaultProfile */ - public function setSsoDefaultProfile($ssoDefaultProfile) + public function setSsoDefaultProfile(?int $ssoDefaultProfile) { $this->set('ssoDefaultProfile', $ssoDefaultProfile); } @@ -1648,15 +1628,15 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return array */ - public function getMailRecipients() + public function getMailRecipients(): array { return $this->get('mailRecipients', []); } /** - * @param array $mailRecipients + * @param array|null $mailRecipients */ - public function setMailRecipients($mailRecipients) + public function setMailRecipients(?array $mailRecipients) { $this->set('mailRecipients', $mailRecipients ?: []); } @@ -1664,15 +1644,15 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return array */ - public function getMailEvents() + public function getMailEvents(): array { return $this->get('mailEvents', []); } /** - * @param array $mailEvents + * @param array|null $mailEvents */ - public function setMailEvents($mailEvents) + public function setMailEvents(?array $mailEvents) { $this->set('mailEvents', $mailEvents ?: []); } @@ -1680,17 +1660,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return string */ - public function getDatabaseVersion() + public function getDatabaseVersion(): string { return (string)$this->get('databaseVersion'); } /** - * @param string $databaseVersion + * @param string|null $databaseVersion * * @return ConfigData */ - public function setDatabaseVersion($databaseVersion) + public function setDatabaseVersion(?string $databaseVersion): ConfigData { $this->set('databaseVersion', $databaseVersion); @@ -1700,7 +1680,7 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return int */ - public function getConfigDate() + public function getConfigDate(): int { return (int)$this->get('configDate'); } @@ -1710,7 +1690,7 @@ final class ConfigData extends DataCollection implements JsonSerializable * * @return $this */ - public function setConfigDate($configDate) + public function setConfigDate(int $configDate): ConfigData { $this->set('configDate', (int)$configDate); @@ -1720,19 +1700,19 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return bool */ - public function isAccountExpireEnabled() + public function isAccountExpireEnabled(): bool { return (bool)$this->get('accountExpireEnabled', false); } /** - * @param bool $accountExpireEnabled + * @param bool|null $accountExpireEnabled * * @return ConfigData */ - public function setAccountExpireEnabled($accountExpireEnabled) + public function setAccountExpireEnabled(?bool $accountExpireEnabled): ConfigData { - $this->set('accountExpireEnabled', $accountExpireEnabled); + $this->set('accountExpireEnabled', (bool)$accountExpireEnabled); return $this; } @@ -1740,17 +1720,17 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return int */ - public function getAccountExpireTime() + public function getAccountExpireTime(): int { return $this->get('accountExpireTime', self::ACCOUNT_EXPIRE_TIME); } /** - * @param int $accountExpireTime + * @param int|null $accountExpireTime * * @return ConfigData */ - public function setAccountExpireTime($accountExpireTime) + public function setAccountExpireTime(?int $accountExpireTime): ConfigData { $this->set('accountExpireTime', (int)$accountExpireTime); @@ -1766,9 +1746,9 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @param bool $ldapTlsEnabled + * @param bool|null $ldapTlsEnabled */ - public function setLdapTlsEnabled(bool $ldapTlsEnabled) + public function setLdapTlsEnabled(?bool $ldapTlsEnabled) { $this->set('ldapTlsEnabled', (int)$ldapTlsEnabled); } @@ -1782,9 +1762,9 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @param array $filesAllowedMime + * @param array|null $filesAllowedMime */ - public function setFilesAllowedMime($filesAllowedMime) + public function setFilesAllowedMime(?array $filesAllowedMime) { $this->set('filesAllowedMime', $filesAllowedMime ?: []); } @@ -1792,15 +1772,15 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return int */ - public function getLdapType() + public function getLdapType(): int { return (int)$this->get('ldapType'); } /** - * @param int $ldapType + * @param int|null $ldapType */ - public function setLdapType($ldapType) + public function setLdapType(?int $ldapType) { $this->set('ldapType', (int)$ldapType); } @@ -1808,63 +1788,63 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return string */ - public function getAppVersion() + public function getAppVersion(): string { return $this->get('appVersion'); } /** - * @param string $appVersion + * @param string|null $appVersion */ - public function setAppVersion(string $appVersion) + public function setAppVersion(?string $appVersion) { $this->set('appVersion', $appVersion); } /** - * @return string + * @return string|null */ - public function getApplicationUrl() + public function getApplicationUrl(): ?string { return $this->get('applicationUrl'); } /** - * @param string $applicationUrl + * @param string|null $applicationUrl */ - public function setApplicationUrl(string $applicationUrl = null) + public function setApplicationUrl(?string $applicationUrl) { $this->set('applicationUrl', $applicationUrl ? rtrim($applicationUrl, '/') : null); } /** - * @return string + * @return string|null */ - public function getLdapFilterUserObject() + public function getLdapFilterUserObject(): ?string { return $this->get('ldapFilterUserObject'); } /** - * @param string $filter + * @param string|null $filter */ - public function setLdapFilterUserObject($filter) + public function setLdapFilterUserObject(?string $filter) { $this->set('ldapFilterUserObject', $filter); } /** - * @return string + * @return string|null */ - public function getLdapFilterGroupObject() + public function getLdapFilterGroupObject(): ?string { return $this->get('ldapFilterGroupObject'); } /** - * @param string $filter + * @param string|null $filter */ - public function setLdapFilterGroupObject($filter) + public function setLdapFilterGroupObject(?string $filter) { $this->set('ldapFilterGroupObject', $filter); } @@ -1872,15 +1852,15 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return array|null */ - public function getLdapFilterUserAttributes() + public function getLdapFilterUserAttributes(): ?array { return $this->get('ldapFilterUserAttributes'); } /** - * @param array $attributes + * @param array|null $attributes */ - public function setLdapFilterUserAttributes($attributes) + public function setLdapFilterUserAttributes(?array $attributes) { $this->set('ldapFilterUserAttributes', $attributes ?: []); } @@ -1888,15 +1868,15 @@ final class ConfigData extends DataCollection implements JsonSerializable /** * @return array|null */ - public function getLdapFilterGroupAttributes() + public function getLdapFilterGroupAttributes(): ?array { return $this->get('ldapFilterGroupAttributes'); } /** - * @param array $attributes + * @param array|null $attributes */ - public function setLdapFilterGroupAttributes($attributes) + public function setLdapFilterGroupAttributes(?array $attributes) { $this->set('ldapFilterGroupAttributes', $attributes ?: []); } @@ -1910,9 +1890,9 @@ final class ConfigData extends DataCollection implements JsonSerializable } /** - * @param bool $ldapDatabaseEnabled + * @param bool|null $ldapDatabaseEnabled */ - public function setLdapDatabaseEnabled(bool $ldapDatabaseEnabled) + public function setLdapDatabaseEnabled(?bool $ldapDatabaseEnabled) { $this->set('ldapDatabaseEnabled', (int)$ldapDatabaseEnabled); } diff --git a/lib/SP/Config/ConfigUtil.php b/lib/SP/Config/ConfigUtil.php index 1b612a9f..cfb06d7d 100644 --- a/lib/SP/Config/ConfigUtil.php +++ b/lib/SP/Config/ConfigUtil.php @@ -63,7 +63,7 @@ final class ConfigUtil * * @return array */ - public static function mailAddressesAdapter($mailAddresses) + public static function mailAddressesAdapter(string $mailAddresses): array { if (empty($mailAddresses)) { return []; diff --git a/lib/SP/Http/Request.php b/lib/SP/Http/Request.php index 0be280c4..07f2f5e3 100644 --- a/lib/SP/Http/Request.php +++ b/lib/SP/Http/Request.php @@ -293,7 +293,7 @@ final class Request * * @return array|null */ - public function analyzeArray(string $param, callable $mapper = null, $default = null) + public function analyzeArray(string $param, callable $mapper = null, $default = null): ?array { $requestValue = $this->params->get($param); @@ -334,12 +334,12 @@ final class Request } /** - * @param string $param - * @param int $default + * @param string $param + * @param int|null $default * * @return int */ - public function analyzeInt(string $param, int $default = null) + public function analyzeInt(string $param, int $default = null): ?int { if (!$this->params->exists($param)) { return $default; @@ -364,7 +364,7 @@ final class Request * * @return bool */ - public function analyzeBool(string $param, bool $default = null) + public function analyzeBool(string $param, bool $default = null): bool { if (!$this->params->exists($param)) { return (bool)$default; diff --git a/lib/SP/Providers/Auth/Ldap/LdapParams.php b/lib/SP/Providers/Auth/Ldap/LdapParams.php index 4e31e542..3855900b 100644 --- a/lib/SP/Providers/Auth/Ldap/LdapParams.php +++ b/lib/SP/Providers/Auth/Ldap/LdapParams.php @@ -281,7 +281,7 @@ final class LdapParams /** * @return int */ - public function getType() + public function getType(): int { return $this->type; } diff --git a/lib/SP/Services/Backup/FileBackupService.php b/lib/SP/Services/Backup/FileBackupService.php index daa23a5e..5b344308 100644 --- a/lib/SP/Services/Backup/FileBackupService.php +++ b/lib/SP/Services/Backup/FileBackupService.php @@ -54,6 +54,8 @@ defined('APP_ROOT') || die(); */ final class FileBackupService extends Service { + private const BACKUP_EXCLUDE_REGEX = '#^(?!.*(backup|cache|temp|vendor|tests))(.*)$#i'; + /** * @var ConfigData */ @@ -351,7 +353,7 @@ final class FileBackupService extends Service * @throws CheckException * @throws FileException */ - private function backupApp() + private function backupApp(): bool { $this->eventDispatcher->notifyEvent('run.backup.process', new Event($this, EventMessage::factory() @@ -359,7 +361,8 @@ final class FileBackupService extends Service ); $archive = new ArchiveHandler($this->backupFileApp, $this->extensionChecker); - $archive->compressDirectory(APP_ROOT, '#^(?!(.*backup))(.*)$#i'); + + $archive->compressDirectory(APP_ROOT, self::BACKUP_EXCLUDE_REGEX); return true; } diff --git a/lib/SP/Storage/File/XmlHandler.php b/lib/SP/Storage/File/XmlHandler.php index 459b86f1..254412c0 100644 --- a/lib/SP/Storage/File/XmlHandler.php +++ b/lib/SP/Storage/File/XmlHandler.php @@ -75,7 +75,7 @@ final class XmlHandler implements XmlFileStorageInterface * @throws FileException * @throws RuntimeException */ - public function load($node = 'root') + public function load($node = 'root'): XmlFileStorageInterface { $this->fileHandler->checkIsReadable(); $this->fileHandler->getFileSize(true); @@ -110,7 +110,7 @@ final class XmlHandler implements XmlFileStorageInterface * * @return array */ - protected function readChildNodes(DOMNodeList $nodeList) + protected function readChildNodes(DOMNodeList $nodeList): array { $nodes = []; @@ -132,9 +132,14 @@ final class XmlHandler implements XmlFileStorageInterface $nodes[$node->nodeName] = $this->readChildNodes($node->childNodes); } } else { - $val = is_numeric($node->nodeValue) - && strpos($node->nodeValue, '.') === false - ? (int)$node->nodeValue : $node->nodeValue; + $val = null; + + if (is_numeric($node->nodeValue) + && strpos($node->nodeValue, '.') === false) { + $val = (int)$node->nodeValue; + } else if (!empty($node->nodeValue)) { + $val = $node->nodeValue; + } if ($node->nodeName === 'item') { $nodes[] = $val; @@ -170,7 +175,7 @@ final class XmlHandler implements XmlFileStorageInterface * @throws FileException * @throws RuntimeException */ - public function save($data, $node = 'root') + public function save($data, $node = 'root'): XmlFileStorageInterface { $this->fileHandler->checkIsWritable(); diff --git a/lib/SP/Util/Checks.php b/lib/SP/Util/Checks.php index c19f6717..9ecfca75 100644 --- a/lib/SP/Util/Checks.php +++ b/lib/SP/Util/Checks.php @@ -48,7 +48,7 @@ final class Checks */ public static function checkPhpVersion() { - return version_compare(PHP_VERSION, '7.0', '>=') - && version_compare(PHP_VERSION, '7.4', '<'); + return version_compare(PHP_VERSION, '7.2', '>=') + && version_compare(PHP_VERSION, '7.4', '<='); } } diff --git a/lib/SP/Util/Util.php b/lib/SP/Util/Util.php index 55f08684..66ff1f4d 100644 --- a/lib/SP/Util/Util.php +++ b/lib/SP/Util/Util.php @@ -120,7 +120,7 @@ final class Util * @author Samuel Levy * */ - public static function boolval($in, $strict = false) + public static function boolval($in, $strict = false): bool { $in = is_string($in) ? strtolower($in) : $in; diff --git a/tests/SP/Config/ConfigTest.php b/tests/SP/Config/ConfigTest.php index ed7f2f13..914e9db5 100644 --- a/tests/SP/Config/ConfigTest.php +++ b/tests/SP/Config/ConfigTest.php @@ -83,7 +83,7 @@ class ConfigTest extends TestCase * @throws DependencyException * @throws NotFoundException */ - public function testLoadClass() + public function testLoadClass(): Config { $config = self::$dic->get(Config::class); @@ -102,7 +102,7 @@ class ConfigTest extends TestCase * * @throws FileException */ - public function testSaveConfig($config) + public function testSaveConfig(Config $config) { $config->saveConfig($config->getConfigData(), false); @@ -116,9 +116,8 @@ class ConfigTest extends TestCase * @depends testLoadClass * * @param Config $config - * */ - public function testLoadConfig($config) + public function testLoadConfig(Config $config) { $this->assertInstanceOf(ConfigData::class, $config->loadConfig()); } @@ -130,7 +129,7 @@ class ConfigTest extends TestCase * * @param Config $config */ - public function testUpdateConfig($config) + public function testUpdateConfig(Config $config) { $config->updateConfig($config->getConfigData()); @@ -147,7 +146,7 @@ class ConfigTest extends TestCase * @throws EnvironmentIsBrokenException * @throws FileException */ - public function testGenerateUpgradeKey($config) + public function testGenerateUpgradeKey(Config $config) { $config->generateUpgradeKey(); diff --git a/tests/SP/Services/Config/ConfigBackupServiceTest.php b/tests/SP/Services/Config/ConfigBackupServiceTest.php index 68d6603f..5a3fb299 100644 --- a/tests/SP/Services/Config/ConfigBackupServiceTest.php +++ b/tests/SP/Services/Config/ConfigBackupServiceTest.php @@ -101,8 +101,10 @@ class ConfigBackupServiceTest extends TestCase $this->assertEquals($configData->getConfigVersion(), $data->getConfigVersion()); - $config = $dic->get(Config::class); - $this->assertEquals($data->getConfigHash(), $config->loadConfigFromFile()->getConfigHash()); + $config = $dic->get(Config::class)->loadConfigFromFile(); + + $this->assertEquals($config->getConfigVersion(), $data->getConfigVersion()); + $this->assertGreaterThanOrEqual($config->getConfigDate(), $data->getConfigDate()); } } diff --git a/tests/SP/Services/Import/XmlImportTest.php b/tests/SP/Services/Import/XmlImportTest.php index 130b9ee2..fda6b65c 100644 --- a/tests/SP/Services/Import/XmlImportTest.php +++ b/tests/SP/Services/Import/XmlImportTest.php @@ -28,6 +28,7 @@ use DI\Container; use DI\DependencyException; use DI\NotFoundException; use SP\Core\Context\ContextException; +use SP\Core\Exceptions\SPException; use SP\Services\Import\FileImport; use SP\Services\Import\ImportException; use SP\Services\Import\ImportParams; @@ -68,6 +69,7 @@ class XmlImportTest extends DatabaseTestCase /** * @throws ImportException * @throws FileException + * @throws SPException */ public function testDoImport() { diff --git a/tests/SP/bootstrap.php b/tests/SP/bootstrap.php index def641a7..4c69a02f 100644 --- a/tests/SP/bootstrap.php +++ b/tests/SP/bootstrap.php @@ -123,6 +123,8 @@ function setupContext() $userData = new UserLoginResponse(); $userData->setId(1); + $userData->setLogin('Admin'); + $userData->setUserGroupName('Admins'); $userData->setUserGroupId(1); $userData->setIsAdminApp(1); $userData->setLastUpdate(time()); diff --git a/tests/res/config/config.xml b/tests/res/config/config.xml index ebc62a81..c52afb5e 100644 --- a/tests/res/config/config.xml +++ b/tests/res/config/config.xml @@ -1,9 +1,92 @@ - - 1584025638 - 501c9ad829417b77a3168bab78003294422f74ee - sysPass - 321933b882ccd226f99b1fee8c247740afa6b578 - + 12 + + 10368000 + + 1 + + + + 1 + + 1 + + + 1607363733 + 0384920872756be7d264ec32433e78cef0180442 + Admin + + + + + + 3306 + + + + + + + + + + + + 46aa537c917e043aa59e60d91e7f69aecbf727c7 + + 1024 + 1 + 1 + + + + + + 2 + 2 + + + + 0 + 0 + 1 + + + + + + + 25 + + + + + + + fd1058ca0bbaf967d08184ed22ee2c8d5675ca0c9d569c1f237f23fefadf + + + 8080 + + + + + 600 + 3 + + 300 + + material-blue + 3 + 3 + + 514 + + + + + + + diff --git a/tests/res/scripts/reset_db.sh b/tests/res/scripts/reset_db.sh index df0c9623..b6ac634d 100755 --- a/tests/res/scripts/reset_db.sh +++ b/tests/res/scripts/reset_db.sh @@ -1,6 +1,6 @@ #!/bin/bash -DB_HOST=$(docker inspect syspass-db-test --format {{.NetworkSettings.Networks.bridge.IPAddress}}) +DB_HOST=$(docker inspect build_db-test_1 --format {{.NetworkSettings.Networks.bridge.IPAddress}}) if [[ -z "${DB_HOST}" ]]; then echo "Unknown host"