diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2022-01-13 09:51:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-13 09:51:04 +0100 |
| commit | 89d109a4d9a9c471f9dde7d5bd12a60ca91fe1f9 (patch) | |
| tree | 76e56e0afc214eb0d9542b22e382c22fd77ae4b9 | |
| parent | 7d5a63ab216347e412dc285667026eb66715cbf9 (diff) | |
| parent | 6312c0df6949955d1cd59c3dd444268e0773293c (diff) | |
| download | nextcloud-server-89d109a4d9a9c471f9dde7d5bd12a60ca91fe1f9.tar.gz nextcloud-server-89d109a4d9a9c471f9dde7d5bd12a60ca91fe1f9.zip | |
Merge pull request #30508 from nextcloud/fix/psaml-bin
Fix psalm not running
78 files changed, 1188 insertions, 2362 deletions
diff --git a/.php_cs.dist b/.php-cs-fixer.dist.php index 61ff9d0a10f..fe6d31065f4 100644 --- a/.php_cs.dist +++ b/.php-cs-fixer.dist.php @@ -2,13 +2,14 @@ declare(strict_types=1); -require_once './lib/composer/autoload.php'; +require_once './vendor-bin/cs-fixer/vendor/autoload.php'; use Nextcloud\CodingStandard\Config; $config = new Config(); $config ->getFinder() + ->ignoreVCSIgnored(true) ->exclude('config') ->exclude('data') ->notPath('3rdparty') diff --git a/apps/encryption/lib/Crypto/Crypt.php b/apps/encryption/lib/Crypto/Crypt.php index 8a6be4d3809..93120068c6a 100644 --- a/apps/encryption/lib/Crypto/Crypt.php +++ b/apps/encryption/lib/Crypto/Crypt.php @@ -237,7 +237,7 @@ class Crypt { $encryptedContent = openssl_encrypt($plainContent, $cipher, $passPhrase, - false, + 0, $iv); if (!$encryptedContent) { @@ -617,7 +617,7 @@ class Crypt { $plainContent = openssl_decrypt($encryptedContent, $cipher, $passPhrase, - false, + 0, $iv); if ($plainContent) { diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php index 4a2c6c16e2b..ffd07c0f323 100644 --- a/apps/encryption/lib/KeyManager.php +++ b/apps/encryption/lib/KeyManager.php @@ -159,7 +159,7 @@ class KeyManager { $this->config->setAppValue('encryption', 'masterKeyId', $this->masterKeyId); } - $this->keyId = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false; + $this->keyId = $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false; $this->log = $log; } diff --git a/apps/encryption/lib/Migration/SetMasterKeyStatus.php b/apps/encryption/lib/Migration/SetMasterKeyStatus.php index 9e800ac7cd3..a80d7144cc4 100644 --- a/apps/encryption/lib/Migration/SetMasterKeyStatus.php +++ b/apps/encryption/lib/Migration/SetMasterKeyStatus.php @@ -62,8 +62,8 @@ class SetMasterKeyStatus implements IRepairStep { // if no config for the master key is set we set it explicitly to '0' in // order not to break old installations because the default changed to '1'. - $configAlreadySet = $this->config->getAppValue('encryption', 'useMasterKey', false); - if ($configAlreadySet === false) { + $configAlreadySet = $this->config->getAppValue('encryption', 'useMasterKey', 'not-set'); + if ($configAlreadySet === 'not-set') { $this->config->setAppValue('encryption', 'useMasterKey', '0'); } } diff --git a/apps/encryption/lib/Recovery.php b/apps/encryption/lib/Recovery.php index 22a668cd5b0..f4336ec7c4e 100644 --- a/apps/encryption/lib/Recovery.php +++ b/apps/encryption/lib/Recovery.php @@ -76,7 +76,7 @@ class Recovery { IConfig $config, IFile $file, View $view) { - $this->user = ($userSession && $userSession->isLoggedIn()) ? $userSession->getUser() : false; + $this->user = ($userSession->isLoggedIn()) ? $userSession->getUser() : null; $this->crypt = $crypt; $this->keyManager = $keyManager; $this->config = $config; diff --git a/apps/files_external/lib/Lib/Storage/FtpConnection.php b/apps/files_external/lib/Lib/Storage/FtpConnection.php index d87c44656f4..bc4be18e42e 100644 --- a/apps/files_external/lib/Lib/Storage/FtpConnection.php +++ b/apps/files_external/lib/Lib/Storage/FtpConnection.php @@ -27,7 +27,7 @@ namespace OCA\Files_External\Lib\Storage; * Low level wrapper around the ftp functions that smooths over some difference between servers */ class FtpConnection { - /** @var resource */ + /** @var resource|\FTP\Connection */ private $connection; public function __construct(bool $secure, string $hostname, int $port, string $username, string $password) { diff --git a/apps/settings/lib/SetupChecks/CheckUserCertificates.php b/apps/settings/lib/SetupChecks/CheckUserCertificates.php index eff5b4d7515..52fea7b6551 100644 --- a/apps/settings/lib/SetupChecks/CheckUserCertificates.php +++ b/apps/settings/lib/SetupChecks/CheckUserCertificates.php @@ -39,10 +39,7 @@ class CheckUserCertificates { public function __construct(IL10N $l10n, IConfig $config, IURLGenerator $urlGenerator) { $this->l10n = $l10n; - $configValue = $config->getAppValue('files_external', 'user_certificate_scan', false); - if (!is_string($configValue)) { - $configValue = ''; - } + $configValue = $config->getAppValue('files_external', 'user_certificate_scan', ''); $this->configValue = $configValue; $this->urlGenerator = $urlGenerator; } diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index f79efe90996..093449ee0ea 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -1753,7 +1753,7 @@ class Access extends LDAPUtility { } $attribute = $this->connection->getFromCache($uuidAttr); - if (!$attribute === null) { + if ($attribute !== null) { $this->connection->$uuidAttr = $attribute; return true; } diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php index 09e2680e5ed..93602968fb1 100644 --- a/build/integration/features/bootstrap/WebDav.php +++ b/build/integration/features/bootstrap/WebDav.php @@ -625,7 +625,7 @@ trait WebDav { $body .= $content3."\r\n"; $body .= '--'.$boundary."--\r\n"; - $stream = fopen('php://temp','r+'); + $stream = fopen('php://temp', 'r+'); fwrite($stream, $body); rewind($stream); diff --git a/build/psalm-baseline-ocp.xml b/build/psalm-baseline-ocp.xml index 6f6aa5b85e3..87a994ea720 100644 --- a/build/psalm-baseline-ocp.xml +++ b/build/psalm-baseline-ocp.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<files psalm-version="4.8.1@f73f2299dbc59a3e6c4d66cff4605176e728ee69"> +<files psalm-version="4.18.1@dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb"> <file src="lib/private/legacy/OC_Image.php"> <ImplementedReturnTypeMismatch occurrences="1"> <code>null|string</code> @@ -220,7 +220,9 @@ <InvalidReturnType occurrences="1"> <code>float</code> </InvalidReturnType> - <UndefinedClass occurrences="12"> + <UndefinedClass occurrences="14"> + <code>\OC</code> + <code>\OC</code> <code>\OC</code> <code>\OC</code> <code>\OC</code> diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 8235488b746..9d4ef09a30b 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<files psalm-version="4.8.1@f73f2299dbc59a3e6c4d66cff4605176e728ee69"> +<files psalm-version="4.18.1@dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb"> <file src="3rdparty/sabre/dav/lib/CalDAV/Calendar.php"> <MoreSpecificImplementedParamType occurrences="1"> <code>$calendarData</code> @@ -36,6 +36,11 @@ <code>array</code> </LessSpecificImplementedReturnType> </file> + <file src="apps/admin_audit/lib/AppInfo/Application.php"> + <InvalidArgument occurrences="1"> + <code>registerEventListener</code> + </InvalidArgument> + </file> <file src="apps/cloud_federation_api/lib/Controller/RequestHandlerController.php"> <InvalidScalarArgument occurrences="1"> <code>$e->getCode()</code> @@ -44,6 +49,12 @@ <code>!is_array($notification)</code> </TypeDoesNotContainType> </file> + <file src="apps/comments/lib/AppInfo/Application.php"> + <InvalidArgument occurrences="2"> + <code>registerEventListener</code> + <code>registerEventListener</code> + </InvalidArgument> + </file> <file src="apps/comments/lib/Search/Result.php"> <InvalidScalarArgument occurrences="1"> <code>(int) $comment->getId()</code> @@ -54,6 +65,11 @@ <code>\Sabre\Uri\split($this->principalUri)</code> </UndefinedFunction> </file> + <file src="apps/contactsinteraction/lib/AppInfo/Application.php"> + <InvalidArgument occurrences="1"> + <code>registerEventListener</code> + </InvalidArgument> + </file> <file src="apps/dav/appinfo/v1/caldav.php"> <TooManyArguments occurrences="1"> <code>new \Sabre\DAV\Auth\Plugin($authBackend, 'ownCloud')</code> @@ -112,6 +128,36 @@ </MissingFile> </file> <file src="apps/dav/lib/AppInfo/Application.php"> + <InvalidArgument occurrences="28"> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + </InvalidArgument> <UndefinedInterfaceMethod occurrences="1"> <code>getAppDataDir</code> </UndefinedInterfaceMethod> @@ -314,6 +360,11 @@ <code>@var VEvent $vevent</code> </PossiblyInvalidDocblockTag> </file> + <file src="apps/dav/lib/CalDAV/Reminder/NotificationProviderManager.php"> + <UndefinedConstant occurrences="1"> + <code>$provider::NOTIFICATION_TYPE</code> + </UndefinedConstant> + </file> <file src="apps/dav/lib/CalDAV/Reminder/Notifier.php"> <FalsableReturnStatement occurrences="4"> <code>$this->l10n->l('date', $dt, ['width' => 'medium'])</code> @@ -1005,6 +1056,9 @@ <InvalidReturnType occurrences="1"> <code>array</code> </InvalidReturnType> + <RedundantFunctionCall occurrences="1"> + <code>array_values</code> + </RedundantFunctionCall> </file> <file src="apps/dav/lib/Upload/UploadHome.php"> <UndefinedFunction occurrences="1"> @@ -1022,7 +1076,8 @@ </InvalidOperand> </file> <file src="apps/encryption/lib/Crypto/Crypt.php"> - <RedundantCondition occurrences="1"> + <RedundantCondition occurrences="2"> + <code>$userSession</code> <code>$userSession</code> </RedundantCondition> <TypeDoesNotContainType occurrences="2"> @@ -1058,9 +1113,6 @@ <InvalidThrow occurrences="1"> <code>throw $exception;</code> </InvalidThrow> - <RedundantCondition occurrences="1"> - <code>$userSession</code> - </RedundantCondition> </file> <file src="apps/encryption/lib/Recovery.php"> <InvalidScalarArgument occurrences="3"> @@ -1068,9 +1120,6 @@ <code>0</code> <code>1</code> </InvalidScalarArgument> - <RedundantCondition occurrences="1"> - <code>$userSession</code> - </RedundantCondition> </file> <file src="apps/encryption/lib/Session.php"> <TooManyArguments occurrences="1"> @@ -1078,10 +1127,16 @@ </TooManyArguments> </file> <file src="apps/encryption/lib/Util.php"> - <RedundantCondition occurrences="1"> + <RedundantCondition occurrences="2"> + <code>$userSession</code> <code>$userSession</code> </RedundantCondition> </file> + <file src="apps/federatedfilesharing/lib/AppInfo/Application.php"> + <InvalidArgument occurrences="1"> + <code>registerEventListener</code> + </InvalidArgument> + </file> <file src="apps/federatedfilesharing/lib/Controller/RequestHandlerController.php"> <InvalidScalarArgument occurrences="7"> <code>$id</code> @@ -1136,6 +1191,11 @@ <code>null</code> </NullableReturnStatement> </file> + <file src="apps/federation/lib/AppInfo/Application.php"> + <InvalidArgument occurrences="1"> + <code>registerEventListener</code> + </InvalidArgument> + </file> <file src="apps/federation/lib/TrustedServers.php"> <InvalidArgument occurrences="1"> <code>'OCP\Federation\TrustedServerEvent::remove'</code> @@ -1152,11 +1212,6 @@ <code>$files_list</code> </InvalidArgument> </file> - <file src="apps/files/ajax/list.php"> - <TypeDoesNotContainType occurrences="1"> - <code>!$dirInfo->getType() === 'dir'</code> - </TypeDoesNotContainType> - </file> <file src="apps/files/appinfo/routes.php"> <InvalidScope occurrences="2"> <code>$this</code> @@ -1185,6 +1240,12 @@ <code>10 * 1024 * 1024</code> </InvalidScalarArgument> </file> + <file src="apps/files/lib/AppInfo/Application.php"> + <InvalidArgument occurrences="2"> + <code>registerEventListener</code> + <code>registerEventListener</code> + </InvalidArgument> + </file> <file src="apps/files/lib/Command/Scan.php"> <NullArgument occurrences="1"> <code>null</code> @@ -1274,6 +1335,12 @@ <code>$this</code> </InvalidScope> </file> + <file src="apps/files_external/lib/AppInfo/Application.php"> + <InvalidArgument occurrences="2"> + <code>registerEventListener</code> + <code>registerEventListener</code> + </InvalidArgument> + </file> <file src="apps/files_external/lib/Command/Delete.php"> <NullArgument occurrences="1"> <code>null</code> @@ -1323,6 +1390,12 @@ <code>getUniqueStorages</code> </UndefinedMethod> </file> + <file src="apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php"> + <InvalidArgument occurrences="2"> + <code>addServiceListener</code> + <code>addServiceListener</code> + </InvalidArgument> + </file> <file src="apps/files_external/lib/Lib/Backend/Backend.php"> <InvalidReturnType occurrences="1"> <code>self</code> @@ -1511,6 +1584,16 @@ <code>$_</code> </UndefinedVariable> </file> + <file src="apps/files_sharing/lib/AppInfo/Application.php"> + <InvalidArgument occurrences="6"> + <code>addServiceListener</code> + <code>addServiceListener</code> + <code>addServiceListener</code> + <code>addServiceListener</code> + <code>addServiceListener</code> + <code>addServiceListener</code> + </InvalidArgument> + </file> <file src="apps/files_sharing/lib/Cache.php"> <FalsableReturnStatement occurrences="1"> <code>false</code> @@ -1530,11 +1613,17 @@ </UndefinedInterfaceMethod> </file> <file src="apps/files_sharing/lib/Controller/ShareAPIController.php"> + <InvalidOperand occurrences="1"> + <code>$permissions</code> + </InvalidOperand> <InvalidScalarArgument occurrences="3"> <code>$code</code> <code>$code</code> <code>Constants::PERMISSION_ALL</code> </InvalidScalarArgument> + <RedundantCondition occurrences="1"> + <code>$permissions & Constants::PERMISSION_READ</code> + </RedundantCondition> <UndefinedClass occurrences="2"> <code>\OCA\Circles\Api\v1\Circles</code> <code>\OCA\Circles\Api\v1\Circles</code> @@ -1580,9 +1669,6 @@ </InvalidDocblock> </file> <file src="apps/files_sharing/lib/External/Scanner.php"> - <InvalidScalarArgument occurrences="1"> - <code>$recursive</code> - </InvalidScalarArgument> <MoreSpecificImplementedParamType occurrences="1"> <code>$cacheData</code> </MoreSpecificImplementedParamType> @@ -1605,6 +1691,11 @@ <code>$exception->getMessage()</code> </InvalidArgument> </file> + <file src="apps/files_sharing/lib/MountProvider.php"> + <RedundantFunctionCall occurrences="1"> + <code>array_values</code> + </RedundantFunctionCall> + </file> <file src="apps/files_sharing/lib/ShareBackend/File.php"> <InvalidScalarArgument occurrences="2"> <code>$itemSource</code> @@ -1717,12 +1808,13 @@ </TooManyArguments> </file> <file src="apps/files_trashbin/lib/Trash/LegacyTrashBackend.php"> - <ParadoxicalCondition occurrences="1"> - <code>null</code> - </ParadoxicalCondition> - <RedundantCondition occurrences="1"> + <RedundantCondition occurrences="2"> + <code>$trashFiles</code> <code>$trashFiles</code> </RedundantCondition> + <TypeDoesNotContainType occurrences="1"> + <code>null</code> + </TypeDoesNotContainType> <UndefinedInterfaceMethod occurrences="2"> <code>$file</code> <code>getById</code> @@ -1746,6 +1838,12 @@ <code>$this</code> </InvalidScope> </file> + <file src="apps/files_versions/lib/AppInfo/Application.php"> + <InvalidArgument occurrences="2"> + <code>registerEventListener</code> + <code>registerEventListener</code> + </InvalidArgument> + </file> <file src="apps/files_versions/lib/Sabre/RestoreFolder.php"> <InvalidNullableReturnType occurrences="1"> <code>getChild</code> @@ -1789,6 +1887,11 @@ <file src="apps/oauth2/lib/Db/ClientMapper.php"> <InvalidCatch occurrences="2"/> </file> + <file src="apps/provisioning_api/lib/AppInfo/Application.php"> + <InvalidArgument occurrences="1"> + <code>registerEventListener</code> + </InvalidArgument> + </file> <file src="apps/provisioning_api/lib/Controller/UsersController.php"> <InvalidScalarArgument occurrences="1"> <code>$quota</code> @@ -1799,6 +1902,11 @@ </TypeDoesNotContainNull> </file> <file src="apps/settings/lib/AppInfo/Application.php"> + <InvalidArgument occurrences="3"> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + </InvalidArgument> <InvalidScalarArgument occurrences="1"> <code>\OC_User::getUser()</code> </InvalidScalarArgument> @@ -1840,6 +1948,11 @@ <code>isReady</code> </UndefinedInterfaceMethod> </file> + <file src="apps/settings/lib/Settings/Admin/Server.php"> + <InvalidArgument occurrences="1"> + <code>false</code> + </InvalidArgument> + </file> <file src="apps/settings/lib/Settings/Admin/Sharing.php"> <InvalidScalarArgument occurrences="1"> <code>Constants::PERMISSION_ALL</code> @@ -1876,6 +1989,11 @@ <code>$type</code> </InvalidScalarArgument> </file> + <file src="apps/theming/lib/AppInfo/Application.php"> + <InvalidArgument occurrences="1"> + <code>registerEventListener</code> + </InvalidArgument> + </file> <file src="apps/theming/lib/Controller/IconController.php"> <InvalidReturnStatement occurrences="1"> <code>$response</code> @@ -1916,6 +2034,14 @@ <code>$folder !== null</code> </RedundantCondition> </file> + <file src="apps/twofactor_backupcodes/lib/AppInfo/Application.php"> + <InvalidArgument occurrences="4"> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + </InvalidArgument> + </file> <file src="apps/twofactor_backupcodes/lib/BackgroundJob/RememberBackupCodesJob.php"> <InvalidArgument occurrences="1"> <code>bool</code> @@ -1933,6 +2059,9 @@ </InvalidScalarArgument> </file> <file src="apps/updatenotification/lib/Notification/BackgroundJob.php"> + <InvalidArgument occurrences="1"> + <code>false</code> + </InvalidArgument> <InvalidPropertyAssignmentValue occurrences="1"> <code>$this->users</code> </InvalidPropertyAssignmentValue> @@ -1977,9 +2106,6 @@ <InvalidArgument occurrences="1"> <code>$record</code> </InvalidArgument> - <InvalidArrayOffset occurrences="1"> - <code>[$attr => $result['values']]</code> - </InvalidArrayOffset> <InvalidReturnStatement occurrences="2"> <code>$uuid</code> <code>$values</code> @@ -2000,8 +2126,7 @@ <code>$limit === 0</code> <code>is_array($result)</code> </RedundantCondition> - <TypeDoesNotContainNull occurrences="2"> - <code>!$attribute === null</code> + <TypeDoesNotContainNull occurrences="1"> <code>is_null($findings)</code> </TypeDoesNotContainNull> <TypeDoesNotContainType occurrences="2"> @@ -2137,7 +2262,6 @@ </InvalidPropertyAssignmentValue> <InvalidReturnType occurrences="1"> <code>null</code> - <code>null</code> </InvalidReturnType> <InvalidScalarArgument occurrences="3"> <code>$this->getHomePath($ldapEntry[$attr][0])</code> @@ -2196,10 +2320,20 @@ </TypeDoesNotContainType> </file> <file src="apps/user_status/lib/AppInfo/Application.php"> + <InvalidArgument occurrences="3"> + <code>registerEventListener</code> + <code>registerEventListener</code> + <code>registerEventListener</code> + </InvalidArgument> <UndefinedInterfaceMethod occurrences="1"> <code>registerProvider</code> </UndefinedInterfaceMethod> </file> + <file src="apps/workflowengine/lib/AppInfo/Application.php"> + <InvalidArgument occurrences="1"> + <code>registerEventListener</code> + </InvalidArgument> + </file> <file src="apps/workflowengine/lib/Check/AbstractStringCheck.php"> <NullArgument occurrences="1"> <code>null</code> @@ -2294,6 +2428,19 @@ <code>isUserScopeEnabled</code> </UndefinedInterfaceMethod> </file> + <file src="core/Application.php"> + <InvalidArgument occurrences="9"> + <code>addServiceListener</code> + <code>addServiceListener</code> + <code>addServiceListener</code> + <code>addServiceListener</code> + <code>addServiceListener</code> + <code>addServiceListener</code> + <code>addServiceListener</code> + <code>addServiceListener</code> + <code>addServiceListener</code> + </InvalidArgument> + </file> <file src="core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php"> <ParamNameMismatch occurrences="1"> <code>$arguments</code> @@ -2309,17 +2456,6 @@ <code>$arguments</code> </ParamNameMismatch> </file> - <file src="core/Command/App/GetPath.php"> - <ImplementedReturnTypeMismatch occurrences="1"> - <code>null|int</code> - </ImplementedReturnTypeMismatch> - <InvalidReturnType occurrences="1"> - <code>null|int</code> - </InvalidReturnType> - <MismatchingDocblockReturnType occurrences="1"> - <code>null|int</code> - </MismatchingDocblockReturnType> - </file> <file src="core/Command/App/Install.php"> <TypeDoesNotContainType occurrences="1"> <code>$result === false</code> @@ -2330,17 +2466,6 @@ <code>array</code> </LessSpecificImplementedReturnType> </file> - <file src="core/Command/Config/App/GetConfig.php"> - <ImplementedReturnTypeMismatch occurrences="1"> - <code>null|int</code> - </ImplementedReturnTypeMismatch> - <InvalidReturnType occurrences="1"> - <code>null|int</code> - </InvalidReturnType> - <MismatchingDocblockReturnType occurrences="1"> - <code>null|int</code> - </MismatchingDocblockReturnType> - </file> <file src="core/Command/Config/Import.php"> <InvalidScalarArgument occurrences="2"> <code>0</code> @@ -2355,17 +2480,6 @@ <code>getFilteredValues</code> </TooManyArguments> </file> - <file src="core/Command/Config/System/GetConfig.php"> - <ImplementedReturnTypeMismatch occurrences="1"> - <code>null|int</code> - </ImplementedReturnTypeMismatch> - <InvalidReturnType occurrences="1"> - <code>null|int</code> - </InvalidReturnType> - <MismatchingDocblockReturnType occurrences="1"> - <code>null|int</code> - </MismatchingDocblockReturnType> - </file> <file src="core/Command/Db/AddMissingColumns.php"> <InvalidArgument occurrences="1"> <code>IDBConnection::ADD_MISSING_COLUMNS_EVENT</code> @@ -2521,13 +2635,19 @@ <code>$this</code> </InvalidScope> </file> + <file src="core/templates/layout.guest.php"> + <InvalidArgument occurrences="1"> + <code>false</code> + </InvalidArgument> + </file> <file src="core/templates/layout.public.php"> <UndefinedInterfaceMethod occurrences="1"> <code>getIcon</code> </UndefinedInterfaceMethod> </file> <file src="lib/autoloader.php"> - <RedundantCondition occurrences="1"> + <RedundantCondition occurrences="2"> + <code>$this->memoryCache</code> <code>$this->memoryCache</code> </RedundantCondition> </file> @@ -2536,8 +2656,10 @@ <code>getAppsNeedingUpgrade</code> <code>getIncompatibleApps</code> </InternalMethod> - <InvalidArgument occurrences="1"> + <InvalidArgument occurrences="3"> <code>$restrictions</code> + <code>addServiceListener</code> + <code>addServiceListener</code> </InvalidArgument> <RedundantCondition occurrences="1"> <code>((array)$request->getParam('appid')) !== ''</code> @@ -2943,14 +3065,6 @@ <code>bool|mixed</code> </LessSpecificImplementedReturnType> </file> - <file src="lib/private/Collaboration/Resources/Manager.php"> - <RedundantCondition occurrences="1"> - <code>$user instanceof IUser</code> - </RedundantCondition> - <TypeDoesNotContainType occurrences="1"> - <code>''</code> - </TypeDoesNotContainType> - </file> <file src="lib/private/Command/CallableJob.php"> <ParamNameMismatch occurrences="1"> <code>$serializedCallable</code> @@ -3369,7 +3483,8 @@ <NullableReturnStatement occurrences="1"> <code>null</code> </NullableReturnStatement> - <RedundantCondition occurrences="1"> + <RedundantCondition occurrences="2"> + <code>$userObject</code> <code>$userObject</code> </RedundantCondition> <TooManyArguments occurrences="1"> @@ -3555,6 +3670,9 @@ </MoreSpecificImplementedParamType> </file> <file src="lib/private/Files/ObjectStore/ObjectStoreStorage.php"> + <InvalidScalarArgument occurrences="1"> + <code>$source</code> + </InvalidScalarArgument> <ParamNameMismatch occurrences="2"> <code>$source</code> <code>$target</code> @@ -3758,6 +3876,11 @@ </InvalidReturnType> </file> <file src="lib/private/Files/Storage/Wrapper/Encoding.php"> + <InvalidScalarArgument occurrences="3"> + <code>\Normalizer::FORM_C</code> + <code>\Normalizer::FORM_C</code> + <code>\Normalizer::FORM_D</code> + </InvalidScalarArgument> <UndefinedInterfaceMethod occurrences="13"> <code>$this->namesCache</code> <code>$this->namesCache</code> @@ -3848,6 +3971,11 @@ <code>stream_flush</code> </InvalidReturnType> </file> + <file src="lib/private/Files/Template/TemplateManager.php"> + <RedundantCondition occurrences="1"> + <code>!$isDefaultTemplates</code> + </RedundantCondition> + </file> <file src="lib/private/Files/Type/Detection.php"> <ParamNameMismatch occurrences="1"> <code>$mimetype</code> @@ -3897,9 +4025,11 @@ <code>null</code> <code>null</code> </NullableReturnStatement> - <RedundantCondition occurrences="3"> - <code>$data</code> + <RedundantCondition occurrences="5"> + <code>$result</code> <code>$result && in_array('delete', $hooks) and $result</code> + <code>Constants::PERMISSION_READ</code> + <code>Constants::PERMISSION_READ</code> <code>is_resource($source)</code> </RedundantCondition> <UndefinedDocblockClass occurrences="2"> @@ -3938,7 +4068,10 @@ <MoreSpecificImplementedParamType occurrences="1"> <code>$user</code> </MoreSpecificImplementedParamType> - <RedundantCondition occurrences="3"> + <RedundantCondition occurrences="6"> + <code>$this->emitter</code> + <code>$this->emitter</code> + <code>$this->emitter</code> <code>$this->emitter</code> <code>$this->emitter</code> <code>$this->emitter</code> @@ -3981,6 +4114,10 @@ <FalsableReturnStatement occurrences="1"> <code>false</code> </FalsableReturnStatement> + <InvalidArgument occurrences="2"> + <code>false</code> + <code>false</code> + </InvalidArgument> <InvalidArrayOffset occurrences="2"> <code>$app['path']</code> <code>$app['path']</code> @@ -3988,9 +4125,6 @@ <NullArgument occurrences="1"> <code>null</code> </NullArgument> - <RedundantCondition occurrences="1"> - <code>$archive</code> - </RedundantCondition> </file> <file src="lib/private/IntegrityCheck/Checker.php"> <InvalidArrayAccess occurrences="3"> @@ -4062,7 +4196,8 @@ </InvalidPropertyAssignmentValue> </file> <file src="lib/private/Log.php"> - <RedundantCondition occurrences="1"> + <RedundantCondition occurrences="2"> + <code>$request</code> <code>$request</code> </RedundantCondition> </file> @@ -4136,10 +4271,6 @@ </file> <file src="lib/private/Notification/Manager.php"> <InvalidCatch occurrences="3"/> - <TypeDoesNotContainType occurrences="2"> - <code>!($notification instanceof INotification)</code> - <code>!($notification instanceof INotification)</code> - </TypeDoesNotContainType> </file> <file src="lib/private/Preview/BackgroundCleanupJob.php"> <InvalidReturnStatement occurrences="1"> @@ -4239,6 +4370,11 @@ <code>dispatch</code> </TooManyArguments> </file> + <file src="lib/private/Repair/Owncloud/CleanPreviews.php"> + <InvalidArgument occurrences="1"> + <code>false</code> + </InvalidArgument> + </file> <file src="lib/private/Repair/Owncloud/CleanPreviewsBackgroundJob.php"> <ParamNameMismatch occurrences="1"> <code>$arguments</code> @@ -4248,6 +4384,9 @@ <ParamNameMismatch occurrences="1"> <code>$arguments</code> </ParamNameMismatch> + <TypeDoesNotContainType occurrences="1"> + <code>$counter % 100 === 0</code> + </TypeDoesNotContainType> </file> <file src="lib/private/Repair/RemoveLinkShares.php"> <ImplicitToStringCast occurrences="2"> @@ -4587,6 +4726,9 @@ </NullArgument> </file> <file src="lib/private/Template/JSResourceLocator.php"> + <InvalidArgument occurrences="1"> + <code>false</code> + </InvalidArgument> <InvalidOperand occurrences="6"> <code>$this->appendIfExist($this->serverroot, $script.'.js')</code> <code>$this->appendIfExist($this->serverroot, $theme_dir.$script.'.js')</code> @@ -4654,6 +4796,9 @@ <ImplementedReturnTypeMismatch occurrences="1"> <code>array|int</code> </ImplementedReturnTypeMismatch> + <InvalidArgument occurrences="1"> + <code>$callback</code> + </InvalidArgument> <InvalidNullableReturnType occurrences="1"> <code>bool|IUser</code> </InvalidNullableReturnType> @@ -4854,9 +4999,6 @@ <code>\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($prevLogging)</code> <code>\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false)</code> </InternalMethod> - <InvalidLiteralArgument occurrences="1"> - <code>\OCP\Constants::FILENAME_INVALID_CHARS</code> - </InvalidLiteralArgument> <InvalidReturnStatement occurrences="1"> <code>OC_Helper::computerFileSize($userQuota)</code> </InvalidReturnStatement> @@ -4867,8 +5009,7 @@ <code>$user</code> <code>OC_User::getUser()</code> </InvalidScalarArgument> - <RedundantCondition occurrences="2"> - <code>'off'</code> + <RedundantCondition occurrences="1"> <code>is_string($expected)</code> </RedundantCondition> <TypeDoesNotContainType occurrences="3"> diff --git a/build/stubs/ftp.php b/build/stubs/ftp.php new file mode 100644 index 00000000000..c2505d5a566 --- /dev/null +++ b/build/stubs/ftp.php @@ -0,0 +1,74 @@ +<?php + +/** @generate-class-entries */ + +namespace FTP { + + /** + * @strict-properties + * @not-serializable + */ + final class Connection + { + } + +} + +namespace { + + function ftp_connect(string $hostname, int $port = 21, int $timeout = 90): FTP\Connection|resource|false {} + + #ifdef HAVE_FTP_SSL + function ftp_ssl_connect(string $hostname, int $port = 21, int $timeout = 90): FTP\Connection|resource|false {} + #endif + + function ftp_login(FTP\Connection|resource $ftp, string $username, string $password): bool {} + function ftp_pwd(FTP\Connection|resource $ftp): string|false {} + function ftp_cdup(FTP\Connection|resource $ftp): bool {} + function ftp_chdir(FTP\Connection|resource $ftp, string $directory): bool {} + function ftp_exec(FTP\Connection|resource $ftp, string $command): bool {} + function ftp_raw(FTP\Connection|resource $ftp, string $command): ?array {} + function ftp_mkdir(FTP\Connection|resource $ftp, string $directory): string|false {} + function ftp_rmdir(FTP\Connection|resource $ftp, string $directory): bool {} + function ftp_chmod(FTP\Connection|resource $ftp, int $permissions, string $filename): int|false {} + + /** @param string $response */ + function ftp_alloc(FTP\Connection|resource $ftp, int $size, &$response = null): bool {} + function ftp_nlist(FTP\Connection|resource $ftp, string $directory): array|false {} + function ftp_rawlist(FTP\Connection|resource $ftp, string $directory, bool $recursive = false): array|false {} + function ftp_mlsd(FTP\Connection|resource $ftp, string $directory): array|false {} + function ftp_systype(FTP\Connection|resource $ftp): string|false {} + + /** @param resource $stream */ + function ftp_fget(FTP\Connection|resource $ftp, $stream, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): bool {} + + /** @param resource $stream */ + function ftp_nb_fget(FTP\Connection|resource $ftp, $stream, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): int {} + function ftp_pasv(FTP\Connection|resource $ftp, bool $enable): bool {} + function ftp_get(FTP\Connection|resource $ftp, string $local_filename, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): bool {} + function ftp_nb_get(FTP\Connection|resource $ftp, string $local_filename, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): int {} + function ftp_nb_continue(FTP\Connection|resource $ftp): int {} + + /** @param resource $stream */ + function ftp_fput(FTP\Connection|resource $ftp, string $remote_filename, $stream, int $mode = FTP_BINARY, int $offset = 0): bool {} + + /** @param resource $stream */ + function ftp_nb_fput(FTP\Connection|resource $ftp, string $remote_filename, $stream, int $mode = FTP_BINARY, int $offset = 0): int {} + function ftp_put(FTP\Connection|resource $ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY, int $offset = 0): bool {} + function ftp_append(FTP\Connection|resource $ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY): bool {} + function ftp_nb_put(FTP\Connection|resource $ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY, int $offset = 0): int|false {} + function ftp_size(FTP\Connection|resource $ftp, string $filename): int {} + function ftp_mdtm(FTP\Connection|resource $ftp, string $filename): int {} + function ftp_rename(FTP\Connection|resource $ftp, string $from, string $to): bool {} + function ftp_delete(FTP\Connection|resource $ftp, string $filename): bool {} + function ftp_site(FTP\Connection|resource $ftp, string $command): bool {} + function ftp_close(FTP\Connection|resource $ftp): bool {} + + /** @alias ftp_close */ + function ftp_quit(FTP\Connection|resource $ftp): bool {} + + /** @param int|bool $value */ + function ftp_set_option(FTP\Connection|resource $ftp, int $option, $value): bool {} + function ftp_get_option(FTP\Connection|resource $ftp, int $option): int|bool {} + +} diff --git a/build/stubs/gd.php b/build/stubs/gd.php index 061bfe6453e..c9784009ea8 100644 --- a/build/stubs/gd.php +++ b/build/stubs/gd.php @@ -1,6 +1,12 @@ <?php /** + * @strict-properties + * @not-serializable + */ +final class GdImage {} + +/** * Retrieve information about the currently installed GD library * @link https://php.net/manual/en/function.gd-info.php * @return array an associative array. diff --git a/build/stubs/ldap.php b/build/stubs/ldap.php index 748a662cf47..b635c8e01bc 100644 --- a/build/stubs/ldap.php +++ b/build/stubs/ldap.php @@ -1,1560 +1,28 @@ <?php -// Start of ldap v. - -/** - * PASSWD extended operation helper - * @link https://www.php.net/manual/en/function.ldap-exop-passwd.php - * @param resource $link An LDAP link identifier, returned by ldap_connect(). - * @param string $user [optional] dn of the user to change the password of. - * @param string $oldpw [optional] The old password of this user. May be omitted depending of server configuration. - * @param string $newpw [optional] The new password for this user. May be omitted or empty to have a generated password. - * @param array $serverctrls [optional] If provided, a password policy request control is send with the request and this is filled with an array of LDAP Controls returned with the request. - * @return mixed Returns the generated password if newpw is empty or omitted. Otherwise returns TRUE on success and FALSE on failure. - * @since 7.2 - */ -function ldap_exop_passwd ($link , $user = "" , $oldpw = "" , $newpw = "" , array &$serverctrls = []) {} - -/** - * Refresh extended operation helper - * @link https://www.php.net/manual/en/function.ldap-exop-refresh.php - * @param resource $link An LDAP link identifier, returned by ldap_connect(). - * @param string $dn dn of the entry to refresh. - * @param int $ttl $ttl Time in seconds (between 1 and 31557600) that the client requests that the entry exists in the directory before being automatically removed. - * @return mixed From RFC: The responseTtl field is the time in seconds which the server chooses to have as the time-to-live field for that entry. It must not be any smaller than that which the client requested, and it may be larger. However, to allow servers to maintain a relatively accurate directory, and to prevent clients from abusing the dynamic extensions, servers are permitted to shorten a client-requested time-to-live value, down to a minimum of 86400 seconds (one day). FALSE will be returned on error. - * @since 7.3 - */ -function ldap_exop_refresh ($link, $dn ,$ttl) {} - -/** - * WHOAMI extended operation helper - * @link https://www.php.net/manual/en/function.ldap-exop-whoami.php - * @param resource $link An LDAP link identifier, returned by ldap_connect(). - * @return mixed The data returned by the server, or FALSE on error. - * @since 7.2 - */ -function ldap_exop_whoami ($link) {} - -/** - * Performs an extended operation on the specified link with reqoid the OID of the operation and reqdata the data. - * @link https://www.php.net/manual/en/function.ldap-exop.php - * @param resource $link An LDAP link identifier, returned by ldap_connect(). - * @param string $reqoid The extended operation request OID. You may use one of LDAP_EXOP_START_TLS, LDAP_EXOP_MODIFY_PASSWD, LDAP_EXOP_REFRESH, LDAP_EXOP_WHO_AM_I, LDAP_EXOP_TURN, or a string with the OID of the operation you want to send. - * @param string $reqdata [optional] The extended operation request data. May be NULL for some operations like LDAP_EXOP_WHO_AM_I, may also need to be BER encoded. - * @param array $serverctrls [optional] If provided, a password policy request control is send with the request and this is filled with an array of LDAP Controls returned with the request. - * @param string $retdata [optional] Will be filled with the extended operation response data if provided. If not provided you may use ldap_parse_exop on the result object later to get this data. - * @param string $retoid [optional] Will be filled with the response OID if provided, usually equal to the request OID. - * @return mixed When used with retdata, returns TRUE on success or FALSE on error. When used without retdata, returns a result identifier or FALSE on error. - * @since 7.2 - */ -function ldap_exop ($link , $reqoid , $reqdata = null , $serverctrls = [], &$retdata, &$retoid) {} - -/** - * Parse LDAP extended operation data from result object result - * @link https://www.php.net/manual/en/function.ldap-parse-exop.php - * @param resource $link An LDAP link identifier, returned by ldap_connect(). - * @param resource $result An LDAP result resource, returned by ldap_exop(). - * @param string $retdata [optional] Will be filled by the response data. - * @param string $retoid [optional] Will be filled by the response OID. - * @return bool Returns TRUE on success or FALSE on failure. - * @since 7.2 - */ -function ldap_parse_exop ($link , $result, &$retdata, &$retoid) {} - -/** - * Translate 8859 characters to t61 characters - * @link https://www.php.net/manual/en/function.ldap-8859-to-t61.php - * @param string $value - * @return string - */ -function ldap_8859_to_t61($value) {} - -/** - * Translate t61 characters to 8859 characters - * @link https://www.php.net/manual/en/function.ldap-t61-to-8859.php - * @param string $value - * @return string - */ -function ldap_t61_to_8859($value) {} - -/** - * Connect to an LDAP server - * @link https://php.net/manual/en/function.ldap-connect.php - * @param string $hostname [optional] <p> - * If you are using OpenLDAP 2.x.x you can specify a URL instead of the - * hostname. To use LDAP with SSL, compile OpenLDAP 2.x.x with SSL - * support, configure PHP with SSL, and set this parameter as - * ldaps://hostname/. - * </p> - * @param int $port [optional] <p> - * The port to connect to. Not used when using URLs. - * </p> - * @return resource|false a positive LDAP link identifier on success, or <b>FALSE</b> on error. - * When OpenLDAP 2.x.x is used, <b>ldap_connect</b> will always - * return a resource as it does not actually connect but just - * initializes the connecting parameters. The actual connect happens with - * the next calls to ldap_* funcs, usually with - * <b>ldap_bind</b>. - * </p> - * <p> - * If no arguments are specified then the link identifier of the already - * opened link will be returned. - */ -function ldap_connect ($hostname = null, $port = 389) {} - -/** - * Alias of <b>ldap_unbind</b> - * @link https://php.net/manual/en/function.ldap-close.php - * @param $link_identifier - */ -function ldap_close ($link_identifier) {} - -/** - * Bind to LDAP directory - * @link https://php.net/manual/en/function.ldap-bind.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $bind_rdn [optional] - * @param string $bind_password [optional] - * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. - */ -function ldap_bind ($link_identifier, $bind_rdn = null, $bind_password = null) {} - -/** - * Bind to LDAP directory - * Does the same thing as ldap_bind() but returns the LDAP result resource to be parsed with ldap_parse_result(). - * @link https://php.net/manual/en/function.ldap-bind.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $bind_rdn [optional] - * @param string $bind_password [optional] - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return resource|false - * @since 7.3 - */ -function ldap_bind_ext ($link_identifier, $bind_rdn = null, $bind_password = null, $serverctrls = []) {} - - -/** - * Bind to LDAP directory using SASL - * @link https://php.net/manual/en/function.ldap-sasl-bind.php - * @param resource $link - * @param string $binddn [optional] - * @param string $password [optional] - * @param string $sasl_mech [optional] - * @param string $sasl_realm [optional] - * @param string $sasl_authc_id [optional] - * @param string $sasl_authz_id [optional] - * @param string $props [optional] - * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. - */ -function ldap_sasl_bind ($link, $binddn = null, $password = null, $sasl_mech = null, $sasl_realm = null, $sasl_authc_id = null, $sasl_authz_id = null, $props = null) {} - -/** - * Unbind from LDAP directory - * @link https://php.net/manual/en/function.ldap-unbind.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. - */ -function ldap_unbind ($link_identifier) {} - -/** - * Read an entry - * @link https://php.net/manual/en/function.ldap-read.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $base_dn <p> - * The base DN for the directory. - * </p> - * @param string $filter <p> - * An empty filter is not allowed. If you want to retrieve absolutely all - * information for this entry, use a filter of - * objectClass=*. If you know which entry types are - * used on the directory server, you might use an appropriate filter such - * as objectClass=inetOrgPerson. - * </p> - * @param array $attributes [optional] <p> - * An array of the required attributes, e.g. array("mail", "sn", "cn"). - * Note that the "dn" is always returned irrespective of which attributes - * types are requested. - * </p> - * <p> - * Using this parameter is much more efficient than the default action - * (which is to return all attributes and their associated values). - * The use of this parameter should therefore be considered good - * practice. - * </p> - * @param int $attrsonly [optional] <p> - * Should be set to 1 if only attribute types are wanted. If set to 0 - * both attributes types and attribute values are fetched which is the - * default behaviour. - * </p> - * @param int $sizelimit [optional] <p> - * Enables you to limit the count of entries fetched. Setting this to 0 - * means no limit. - * </p> - * <p> - * This parameter can NOT override server-side preset sizelimit. You can - * set it lower though. - * </p> - * <p> - * Some directory server hosts will be configured to return no more than - * a preset number of entries. If this occurs, the server will indicate - * that it has only returned a partial results set. This also occurs if - * you use this parameter to limit the count of fetched entries. - * </p> - * @param int $timelimit [optional] <p> - * Sets the number of seconds how long is spend on the search. Setting - * this to 0 means no limit. - * </p> - * <p> - * This parameter can NOT override server-side preset timelimit. You can - * set it lower though. - * </p> - * @param int $deref [optional] <p> - * Specifies how aliases should be handled during the search. It can be - * one of the following: - * <b>LDAP_DEREF_NEVER</b> - (default) aliases are never - * dereferenced. - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return resource|false a search result identifier or <b>FALSE</b> on error. - */ -function ldap_read ($link_identifier, $base_dn, $filter, array $attributes = null, $attrsonly = null, $sizelimit = null, $timelimit = null, $deref = null, $serverctrls = []) {} - -/** - * Single-level search - * @link https://php.net/manual/en/function.ldap-list.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $base_dn <p> - * The base DN for the directory. - * </p> - * @param string $filter - * @param array $attributes [optional] <p> - * An array of the required attributes, e.g. array("mail", "sn", "cn"). - * Note that the "dn" is always returned irrespective of which attributes - * types are requested. - * </p> - * <p> - * Using this parameter is much more efficient than the default action - * (which is to return all attributes and their associated values). - * The use of this parameter should therefore be considered good - * practice. - * </p> - * @param int $attrsonly [optional] <p> - * Should be set to 1 if only attribute types are wanted. If set to 0 - * both attributes types and attribute values are fetched which is the - * default behaviour. - * </p> - * @param int $sizelimit [optional] <p> - * Enables you to limit the count of entries fetched. Setting this to 0 - * means no limit. - * </p> - * <p> - * This parameter can NOT override server-side preset sizelimit. You can - * set it lower though. - * </p> - * <p> - * Some directory server hosts will be configured to return no more than - * a preset number of entries. If this occurs, the server will indicate - * that it has only returned a partial results set. This also occurs if - * you use this parameter to limit the count of fetched entries. - * </p> - * @param int $timelimit [optional] <p> - * Sets the number of seconds how long is spend on the search. Setting - * this to 0 means no limit. - * </p> - * <p> - * This parameter can NOT override server-side preset timelimit. You can - * set it lower though. - * </p> - * @param int $deref [optional] <p> - * Specifies how aliases should be handled during the search. It can be - * one of the following: - * <b>LDAP_DEREF_NEVER</b> - (default) aliases are never - * dereferenced. - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return resource|false a search result identifier or <b>FALSE</b> on error. - */ -function ldap_list ($link_identifier, $base_dn, $filter, array $attributes = null, $attrsonly = null, $sizelimit = null, $timelimit = null, $deref = null, $serverctrls = []) {} - -/** - * Search LDAP tree - * @link https://php.net/manual/en/function.ldap-search.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $base_dn <p> - * The base DN for the directory. - * </p> - * @param string $filter <p> - * The search filter can be simple or advanced, using boolean operators in - * the format described in the LDAP documentation (see the Netscape Directory SDK for full - * information on filters). - * </p> - * @param array $attributes [optional] <p> - * An array of the required attributes, e.g. array("mail", "sn", "cn"). - * Note that the "dn" is always returned irrespective of which attributes - * types are requested. - * </p> - * <p> - * Using this parameter is much more efficient than the default action - * (which is to return all attributes and their associated values). - * The use of this parameter should therefore be considered good - * practice. - * </p> - * @param int $attrsonly [optional] <p> - * Should be set to 1 if only attribute types are wanted. If set to 0 - * both attributes types and attribute values are fetched which is the - * default behaviour. - * </p> - * @param int $sizelimit [optional] <p> - * Enables you to limit the count of entries fetched. Setting this to 0 - * means no limit. - * </p> - * <p> - * This parameter can NOT override server-side preset sizelimit. You can - * set it lower though. - * </p> - * <p> - * Some directory server hosts will be configured to return no more than - * a preset number of entries. If this occurs, the server will indicate - * that it has only returned a partial results set. This also occurs if - * you use this parameter to limit the count of fetched entries. - * </p> - * @param int $timelimit [optional] <p> - * Sets the number of seconds how long is spend on the search. Setting - * this to 0 means no limit. - * </p> - * <p> - * This parameter can NOT override server-side preset timelimit. You can - * set it lower though. - * </p> - * @param int $deref [optional] <p> - * Specifies how aliases should be handled during the search. It can be - * one of the following: - * <b>LDAP_DEREF_NEVER</b> - (default) aliases are never - * dereferenced. - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return resource|false a search result identifier or <b>FALSE</b> on error. - */ -function ldap_search ($link_identifier, $base_dn, $filter, array $attributes = null, $attrsonly = null, $sizelimit = null, $timelimit = null, $deref = null, $serverctrls = []) {} - -/** - * Free result memory - * @link https://php.net/manual/en/function.ldap-free-result.php - * @param resource $result_identifier - * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. - */ -function ldap_free_result ($result_identifier) {} - -/** - * Count the number of entries in a search - * @link https://php.net/manual/en/function.ldap-count-entries.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param resource $result_identifier <p> - * The internal LDAP result. - * </p> - * @return int|false number of entries in the result or <b>FALSE</b> on error. - */ -function ldap_count_entries ($link_identifier, $result_identifier) {} - -/** - * Return first result id - * @link https://php.net/manual/en/function.ldap-first-entry.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param resource $result_identifier - * @return resource|false the result entry identifier for the first entry on success and - * <b>FALSE</b> on error. - */ -function ldap_first_entry ($link_identifier, $result_identifier) {} - -/** - * Get next result entry - * @link https://php.net/manual/en/function.ldap-next-entry.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param resource $result_entry_identifier - * @return resource|false entry identifier for the next entry in the result whose entries - * are being read starting with <b>ldap_first_entry</b>. If - * there are no more entries in the result then it returns <b>FALSE</b>. - */ -function ldap_next_entry ($link_identifier, $result_entry_identifier) {} - -/** - * Get all result entries - * @link https://php.net/manual/en/function.ldap-get-entries.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param resource $result_identifier - * @return array a complete result information in a multi-dimensional array on - * success and <b>FALSE</b> on error. - * </p> - * <p> - * The structure of the array is as follows. - * The attribute index is converted to lowercase. (Attributes are - * case-insensitive for directory servers, but not when used as - * array indices.) - * <pre> - * return_value["count"] = number of entries in the result - * return_value[0] : refers to the details of first entry - * return_value[i]["dn"] = DN of the ith entry in the result - * return_value[i]["count"] = number of attributes in ith entry - * return_value[i][j] = NAME of the jth attribute in the ith entry in the result - * return_value[i]["attribute"]["count"] = number of values for - * attribute in ith entry - * return_value[i]["attribute"][j] = jth value of attribute in ith entry - * </pre> - */ -function ldap_get_entries ($link_identifier, $result_identifier) {} - -/** - * Return first attribute - * @link https://php.net/manual/en/function.ldap-first-attribute.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param resource $result_entry_identifier - * @param int $dummy_ber [optional] is the identifier to internal memory location pointer. This parameter is no longer used as this is now handled automatically by PHP. For backwards compatibility PHP will not throw an error if this parameter is passed. - * @return string|false the first attribute in the entry on success and <b>FALSE</b> on - * error. - */ -function ldap_first_attribute ($link_identifier, $result_entry_identifier, $dummy_ber = null) {} - -/** - * Get the next attribute in result - * @link https://php.net/manual/en/function.ldap-next-attribute.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param resource $result_entry_identifier - * @param int $dummy_ber [optional] The internal state of the pointer is maintained by this parameter. This parameter is no longer used as this is now handled automatically by PHP. For backwards compatibility PHP will not throw an error if this parameter is passed. - * @return string|false the next attribute in an entry on success and <b>FALSE</b> on - * error. - */ -function ldap_next_attribute ($link_identifier, $result_entry_identifier, $dummy_ber) {} - -/** - * Get attributes from a search result entry - * @link https://php.net/manual/en/function.ldap-get-attributes.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param resource $result_entry_identifier - * @return array a complete entry information in a multi-dimensional array - * on success and <b>FALSE</b> on error. - */ -function ldap_get_attributes ($link_identifier, $result_entry_identifier) {} - -/** - * Get all values from a result entry - * @link https://php.net/manual/en/function.ldap-get-values.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param resource $result_entry_identifier - * @param string $attribute - * @return array|false an array of values for the attribute on success and <b>FALSE</b> on - * error. The number of values can be found by indexing "count" in the - * resultant array. Individual values are accessed by integer index in the - * array. The first index is 0. - * </p> - * <p> - * LDAP allows more than one entry for an attribute, so it can, for example, - * store a number of email addresses for one person's directory entry all - * labeled with the attribute "mail" - * return_value["count"] = number of values for attribute - * return_value[0] = first value of attribute - * return_value[i] = ith value of attribute - */ -function ldap_get_values ($link_identifier, $result_entry_identifier, $attribute) {} - -/** - * Get all binary values from a result entry - * @link https://php.net/manual/en/function.ldap-get-values-len.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param resource $result_entry_identifier - * @param string $attribute - * @return array|false an array of values for the attribute on success and <b>FALSE</b> on - * error. Individual values are accessed by integer index in the array. The - * first index is 0. The number of values can be found by indexing "count" - * in the resultant array. - */ -function ldap_get_values_len ($link_identifier, $result_entry_identifier, $attribute) {} - -/** - * Get the DN of a result entry - * @link https://php.net/manual/en/function.ldap-get-dn.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param resource $result_entry_identifier - * @return string|false the DN of the result entry and <b>FALSE</b> on error. - */ -function ldap_get_dn ($link_identifier, $result_entry_identifier) {} - -/** - * Splits DN into its component parts - * @link https://php.net/manual/en/function.ldap-explode-dn.php - * @param string $dn <p> - * The distinguished name of an LDAP entity. - * </p> - * @param int $with_attrib <p> - * Used to request if the RDNs are returned with only values or their - * attributes as well. To get RDNs with the attributes (i.e. in - * attribute=value format) set <i>with_attrib</i> to 0 - * and to get only values set it to 1. - * </p> - * @return array an array of all DN components. - * The first element in this array has count key and - * represents the number of returned values, next elements are numerically - * indexed DN components. - */ -function ldap_explode_dn ($dn, $with_attrib) {} - -/** - * Convert DN to User Friendly Naming format - * @link https://php.net/manual/en/function.ldap-dn2ufn.php - * @param string $dn <p> - * The distinguished name of an LDAP entity. - * </p> - * @return string the user friendly name. - */ -function ldap_dn2ufn ($dn) {} - -/** - * Add entries to LDAP directory - * @link https://php.net/manual/en/function.ldap-add.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $dn <p> - * The distinguished name of an LDAP entity. - * </p> - * @param array $entry <p> - * An array that specifies the information about the entry. The values in - * the entries are indexed by individual attributes. - * In case of multiple values for an attribute, they are indexed using - * integers starting with 0. - * <code> - * $entree["attribut1"] = "value"; - * $entree["attribut2"][0] = "value1"; - * $entree["attribut2"][1] = "value2"; - * </code> - * </p> - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. - */ -function ldap_add ($link_identifier, $dn, array $entry, $serverctrls = []) {} - -/** - * Add entries to LDAP directory - * Does the same thing as ldap_add() but returns the LDAP result resource to be parsed with ldap_parse_result(). - * @link https://www.php.net/manual/en/function.ldap-add-ext.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $dn <p> - * The distinguished name of an LDAP entity. - * </p> - * @param array $entry <p> - * An array that specifies the information about the entry. The values in - * the entries are indexed by individual attributes. - * In case of multiple values for an attribute, they are indexed using - * integers starting with 0. - * <code> - * $entree["attribut1"] = "value"; - * $entree["attribut2"][0] = "value1"; - * $entree["attribut2"][1] = "value2"; - * </code> - * </p> - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return resource|false - * @since 7.4 - */ -function ldap_add_ext ($link_identifier, $dn, array $entry, $serverctrls = []) {} - -/** - * Delete an entry from a directory - * @link https://php.net/manual/en/function.ldap-delete.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $dn <p> - * The distinguished name of an LDAP entity. - * </p> - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. - */ -function ldap_delete ($link_identifier, $dn, $serverctrls = []) {} - -/** - * Delete an entry from a directory - * Does the same thing as ldap_delete() but returns the LDAP result resource to be parsed with ldap_parse_result(). - * @link https://php.net/manual/en/function.ldap-delete-ext.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $dn <p> - * The distinguished name of an LDAP entity. - * </p> - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return resource|false - * @since 7.3 - */ -function ldap_delete_ext ($link_identifier, $dn, $serverctrls = []) {} - -/** - * This function is an alias of: ldap_mod_replace(). - * Replace attribute values with new ones - * @link https://php.net/manual/en/function.ldap-mod-replace.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $dn <p> - * The distinguished name of an LDAP entity. - * </p> - * @param array $entry - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. - * @since 7.0 - */ -function ldap_modify ($link_identifier, $dn, array $entry, $serverctrls = []) {} - -/** - * Add attribute values to current attributes - * @link https://php.net/manual/en/function.ldap-mod-add.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $dn <p> - * The distinguished name of an LDAP entity. - * </p> - * @param array $entry - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. - */ -function ldap_mod_add ($link_identifier, $dn, array $entry, $serverctrls = []) {} - -/** - * Add attribute values to current attributes - * Does the same thing as ldap_mod_add() but returns the LDAP result resource to be parsed with ldap_parse_result(). - * @link https://php.net/manual/en/function.ldap-mod-add-ext.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $dn <p> - * The distinguished name of an LDAP entity. - * </p> - * @param array $entry - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return resource|false - */ -function ldap_mod_add_ext ($link_identifier, $dn, array $entry, $serverctrls = []) {} - -/** - * Replace attribute values with new ones - * @link https://php.net/manual/en/function.ldap-mod-replace.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $dn <p> - * The distinguished name of an LDAP entity. - * </p> - * @param array $entry - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. - */ -function ldap_mod_replace ($link_identifier, $dn, array $entry, $serverctrls = []) {} - -/** - * Replace attribute values with new ones - * Does the same thing as ldap_mod_replace() but returns the LDAP result resource to be parsed with ldap_parse_result(). - * @link https://php.net/manual/en/function.ldap-mod-replace-ext.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $dn <p> - * The distinguished name of an LDAP entity. - * </p> - * @param array $entry - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return resource|false - * @since 7.3 - */ -function ldap_mod_replace_ext ($link_identifier, $dn, array $entry, $serverctrls = []) {} - -/** - * Delete attribute values from current attributes - * @link https://php.net/manual/en/function.ldap-mod-del.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $dn <p> - * The distinguished name of an LDAP entity. - * </p> - * @param array $entry - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. - */ -function ldap_mod_del ($link_identifier, $dn, array $entry, $serverctrls = []) {} - -/** - * Delete attribute values from current attributes - * Does the same thing as ldap_mod_del() but returns the LDAP result resource to be parsed with ldap_parse_result(). - * @link https://php.net/manual/en/function.ldap-mod-del-ext.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $dn <p> - * The distinguished name of an LDAP entity. - * </p> - * @param array $entry - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return resource|false - * @since 7.3 - */ -function ldap_mod_del_ext ($link_identifier, $dn, array $entry, $serverctrls = []) {} - -/** - * Return the LDAP error number of the last LDAP command - * @link https://php.net/manual/en/function.ldap-errno.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @return int Return the LDAP error number of the last LDAP command for this - * link. - */ -function ldap_errno ($link_identifier) {} - -/** - * Convert LDAP error number into string error message - * @link https://php.net/manual/en/function.ldap-err2str.php - * @param int $errno <p> - * The error number. - * </p> - * @return string the error message, as a string. - */ -function ldap_err2str ($errno) {} - -/** - * Return the LDAP error message of the last LDAP command - * @link https://php.net/manual/en/function.ldap-error.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @return string string error message. - */ -function ldap_error ($link_identifier) {} - -/** - * Compare value of attribute found in entry specified with DN - * @link https://php.net/manual/en/function.ldap-compare.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $dn <p> - * The distinguished name of an LDAP entity. - * </p> - * @param string $attribute <p> - * The attribute name. - * </p> - * @param string $value <p> - * The compared value. - * </p> - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return mixed <b>TRUE</b> if <i>value</i> matches otherwise returns - * <b>FALSE</b>. Returns -1 on error. - */ -function ldap_compare ($link_identifier, $dn, $attribute, $value, $serverctrls = []) {} - -/** - * Sort LDAP result entries - * @link https://php.net/manual/en/function.ldap-sort.php - * @param resource $link <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param resource $result <p> - * An search result identifier, returned by - * <b>ldap_search</b>. - * </p> - * @param string $sortfilter <p> - * The attribute to use as a key in the sort. - * </p> - * @deprecated 7.0 - * @removed 8.0 - * @return bool - */ -function ldap_sort ($link, $result, $sortfilter) {} - -/** - * Modify the name of an entry - * @link https://php.net/manual/en/function.ldap-rename.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $dn <p> - * The distinguished name of an LDAP entity. - * </p> - * @param string $newrdn <p> - * The new RDN. - * </p> - * @param string $newparent <p> - * The new parent/superior entry. - * </p> - * @param bool $deleteoldrdn <p> - * If <b>TRUE</b> the old RDN value(s) is removed, else the old RDN value(s) - * is retained as non-distinguished values of the entry. - * </p> - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. - */ -function ldap_rename ($link_identifier, $dn, $newrdn, $newparent, $deleteoldrdn, $serverctrls = []) {} - -/** - * Modify the name of an entry - * Does the same thing as ldap_rename() but returns the LDAP result resource to be parsed with ldap_parse_result(). - * @link https://php.net/manual/en/function.ldap-rename-ext.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param string $dn <p> - * The distinguished name of an LDAP entity. - * </p> - * @param string $newrdn <p> - * The new RDN. - * </p> - * @param string $newparent <p> - * The new parent/superior entry. - * </p> - * @param bool $deleteoldrdn <p> - * If <b>TRUE</b> the old RDN value(s) is removed, else the old RDN value(s) - * is retained as non-distinguished values of the entry. - * </p> - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return resource|false - * @since 7.3 - */ -function ldap_rename_ext ($link_identifier, $dn, $newrdn, $newparent, $deleteoldrdn, $serverctrls = []) {} - -/** - * Get the current value for given option - * @link https://php.net/manual/en/function.ldap-get-option.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param int $option <p> - * The parameter <i>option</i> can be one of: - * <tr valign="top"> - * <td>Option</td> - * <td>Type</td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_DEREF</b></td> - * <td>integer</td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_SIZELIMIT</b></td> - * <td>integer</td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_TIMELIMIT</b></td> - * <td>integer</td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_NETWORK_TIMEOUT</b></td> - * <td>integer</td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_PROTOCOL_VERSION</b></td> - * <td>integer</td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_ERROR_NUMBER</b></td> - * <td>integer</td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_REFERRALS</b></td> - * <td>bool</td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_RESTART</b></td> - * <td>bool</td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_HOST_NAME</b></td> - * <td>string</td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_ERROR_STRING</b></td> - * <td>string</td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_MATCHED_DN</b></td> - * <td>string</td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_SERVER_CONTROLS</b></td> - * <td>array</td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_CLIENT_CONTROLS</b></td> - * <td>array</td> - * </tr> - * </p> - * @param mixed $retval <p> - * This will be set to the option value. - * </p> - * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. - */ -function ldap_get_option ($link_identifier, $option, &$retval) {} - -/** - * Set the value of the given option - * @link https://php.net/manual/en/function.ldap-set-option.php - * @param resource $link_identifier <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param int $option <p> - * The parameter <i>option</i> can be one of: - * <tr valign="top"> - * <td>Option</td> - * <td>Type</td> - * <td>Available since</td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_DEREF</b></td> - * <td>integer</td> - * <td></td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_SIZELIMIT</b></td> - * <td>integer</td> - * <td></td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_TIMELIMIT</b></td> - * <td>integer</td> - * <td></td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_NETWORK_TIMEOUT</b></td> - * <td>integer</td> - * <td>PHP 5.3.0</td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_PROTOCOL_VERSION</b></td> - * <td>integer</td> - * <td></td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_ERROR_NUMBER</b></td> - * <td>integer</td> - * <td></td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_REFERRALS</b></td> - * <td>bool</td> - * <td></td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_RESTART</b></td> - * <td>bool</td> - * <td></td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_HOST_NAME</b></td> - * <td>string</td> - * <td></td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_ERROR_STRING</b></td> - * <td>string</td> - * <td></td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_MATCHED_DN</b></td> - * <td>string</td> - * <td></td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_SERVER_CONTROLS</b></td> - * <td>array</td> - * <td></td> - * </tr> - * <tr valign="top"> - * <td><b>LDAP_OPT_CLIENT_CONTROLS</b></td> - * <td>array</td> - * <td></td> - * </tr> - * </p> - * <p> - * <b>LDAP_OPT_SERVER_CONTROLS</b> and - * <b>LDAP_OPT_CLIENT_CONTROLS</b> require a list of - * controls, this means that the value must be an array of controls. A - * control consists of an oid identifying the control, - * an optional value, and an optional flag for - * criticality. In PHP a control is given by an - * array containing an element with the key oid - * and string value, and two optional elements. The optional - * elements are key value with string value - * and key iscritical with boolean value. - * iscritical defaults to <b>FALSE</b> - * if not supplied. See draft-ietf-ldapext-ldap-c-api-xx.txt - * for details. See also the second example below. - * </p> - * @param mixed $newval <p> - * The new value for the specified <i>option</i>. - * </p> - * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. - */ -function ldap_set_option ($link_identifier, $option, $newval) {} - -/** - * Return first reference - * @link https://php.net/manual/en/function.ldap-first-reference.php - * @param resource $link - * @param resource $result - * @return resource - */ -function ldap_first_reference ($link, $result) {} - -/** - * Get next reference - * @link https://php.net/manual/en/function.ldap-next-reference.php - * @param resource $link - * @param resource $entry - * @return resource - */ -function ldap_next_reference ($link, $entry) {} - -/** - * Extract information from reference entry - * @link https://php.net/manual/en/function.ldap-parse-reference.php - * @param resource $link - * @param resource $entry - * @param array $referrals - * @return bool - */ -function ldap_parse_reference ($link, $entry, array &$referrals) {} - -/** - * Extract information from result - * @link https://php.net/manual/en/function.ldap-parse-result.php - * @param resource $link - * @param resource $result - * @param int $errcode - * @param string $matcheddn [optional] - * @param string $errmsg [optional] - * @param array $referrals [optional] - * @param array $serverctrls [optional] An array of LDAP Controls which have been sent with the response. - * @return bool - */ -function ldap_parse_result ($link, $result, &$errcode, &$matcheddn = null, &$errmsg = null, array &$referrals = null, &$serverctrls = []) {} - -/** - * Start TLS - * @link https://php.net/manual/en/function.ldap-start-tls.php - * @param resource $link - * @return bool - */ -function ldap_start_tls ($link) {} - -/** - * Set a callback function to do re-binds on referral chasing - * @link https://php.net/manual/en/function.ldap-set-rebind-proc.php - * @param resource $link - * @param callable $callback - * @return bool - */ -function ldap_set_rebind_proc ($link, callable $callback) {} - -/** - * Send LDAP pagination control - * @link https://php.net/manual/en/function.ldap-control-paged-result.php - * @param resource $link <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param int $pagesize <p> - * The number of entries by page. - * </p> - * @param bool $iscritical [optional] <p> - * Indicates whether the pagination is critical of not. - * If true and if the server doesn't support pagination, the search - * will return no result. - * </p> - * @param string $cookie [optional] <p> - * An opaque structure sent by the server - * (<b>ldap_control_paged_result_response</b>). - * </p> - * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. - * @since 5.4 - * @deprecated 7.4 - */ -function ldap_control_paged_result ($link, $pagesize, $iscritical = false, $cookie = "") {} - -/** - * Retrieve the LDAP pagination cookie - * @link https://php.net/manual/en/function.ldap-control-paged-result-response.php - * @param resource $link <p> - * An LDAP link identifier, returned by <b>ldap_connect</b>. - * </p> - * @param resource $result - * @param string $cookie [optional] <p> - * An opaque structure sent by the server. - * </p> - * @param int $estimated [optional] <p> - * The estimated number of entries to retrieve. - * </p> - * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. - * @since 5.4 - * @deprecated 7.4 - */ -function ldap_control_paged_result_response ($link, $result, &$cookie = null, &$estimated = null) {} - -/** - * Escape a string for use in an LDAP filter or DN - * @param string $value The value to escape. - * @param string $ignore [optional] Characters to ignore when escaping. - * @param int $flags [optional] The context the escaped string will be used in: LDAP_ESCAPE_FILTER for filters to be used with ldap_search(), or LDAP_ESCAPE_DN for DNs. If neither flag is passed, all chars are escaped. - * @return string - * @since 5.6 - */ - -function ldap_escape ($value, $ignore = "", $flags = 0) {} - -/** - * (PHP 5.4 >= 5.4.26, PHP 5.5 >= 5.5.10, PHP 5.6 >= 5.6.0) - * Batch and execute modifications on an LDAP entry - * @link https://php.net/manual/en/function.ldap-modify-batch.php - * @param $link_identifier <p> - * An LDAP link identifier, returned by - * {@see ldap_connect()}. - * </p> - * @param $dn <p>The distinguished name of an LDAP entity.</p> - * @param $entry <p>An array that specifies the modifications to make. Each entry in this - * array is an associative array with two or three keys: - * <em>attrib</em> maps to the name of the attribute to modify, - * <em>modtype</em> maps to the type of modification to perform, - * and (depending on the type of modification) <em>values</em> - * maps to an array of attribute values relevant to the modification. - * </p> - * <p> - * Possible values for <em>modtype</em> include: - * </p><dl> - * - * - * <dt> - * <b>LDAP_MODIFY_BATCH_ADD</b></dt> - * - * <dd> - * - * <p> - * Each value specified through <em>values</em> is added (as - * an additional value) to the attribute named by - * <em>attrib</em>. - * </p> - * </dd> - * - * <dt> - * <b>LDAP_MODIFY_BATCH_REMOVE</b></dt> - * - * <dd> - * - * <p> - * Each value specified through <em>values</em> is removed - * from the attribute named by <em>attrib</em>. Any value of - * the attribute not contained in the <em>values</em> array - * will remain untouched. - * </p> - * </dd> - * <dt> - * <b>LDAP_MODIFY_BATCH_REMOVE_ALL</b></dt> - * - * <dd> - * - * <p> - * All values are removed from the attribute named by - * <em>attrib</em>. A <em>values</em> entry must - * not be provided. - * </p> - * </dd> - * - * <dt> - * <b>LDAP_MODIFY_BATCH_REPLACE</b></dt> - * - * <dd> - * - * <p> - * All current values of the attribute named by - * <em>attrib</em> are replaced with the values specified - * through <em>values</em>. - * </p> - * </dd> - * </dl> - * <p> - * Note that any value for <em>attrib</em> must be a string, any - * value for <em>values</em> must be an array of strings, and - * any value for <em>modtype</em> must be one of the - * <b>LDAP_MODIFY_BATCH_*</b> constants listed above. - * </p></p> - * @param array $serverctrls [optional] Array of LDAP Controls to send with the request. - * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. - * @since 5.4 - */ -function ldap_modify_batch ( $link_identifier , $dn , $entry, $serverctrls = []) {} - -/** - * @param resource $link_identifier - * @param resource $result_identifier - * @return int returns the number of reference messages in a search result. - * @since 8.0 - */ -function ldap_count_references($link_identifier, $result_identifier){} - -define('LDAP_ESCAPE_FILTER', 1); -define ('LDAP_ESCAPE_DN', 2); -define ('LDAP_DEREF_NEVER', 0); -define ('LDAP_DEREF_SEARCHING', 1); -define ('LDAP_DEREF_FINDING', 2); -define ('LDAP_DEREF_ALWAYS', 3); -define ('LDAP_MODIFY_BATCH_REMOVE',2); -define('LDAP_MODIFY_BATCH_ADD', 1); -define('LDAP_MODIFY_BATCH_REMOVE_ALL', 18); -define('LDAP_MODIFY_BATCH_REPLACE', 3); - -define('LDAP_OPT_X_TLS_REQUIRE_CERT', 24582); -define('LDAP_OPT_X_TLS_NEVER', 0); -define('LDAP_OPT_X_TLS_HARD', 1); -define('LDAP_OPT_X_TLS_DEMAND', 2); -define('LDAP_OPT_X_TLS_ALLOW', 3); -define('LDAP_OPT_X_TLS_TRY', 4); -define('LDAP_OPT_X_TLS_CERTFILE', 24580); -define('LDAP_OPT_X_TLS_CIPHER_SUITE', 24584); -define('LDAP_OPT_X_TLS_KEYFILE', 24581); -define('LDAP_OPT_X_TLS_DHFILE', 24590); -define('LDAP_OPT_X_TLS_CRLFILE', 24592); -define('LDAP_OPT_X_TLS_RANDOM_FILE', 24585); -define('LDAP_OPT_X_TLS_CRLCHECK', 24587); -define('LDAP_OPT_X_TLS_CRL_NONE', 0); -define('LDAP_OPT_X_TLS_CRL_PEER', 1); -define('LDAP_OPT_X_TLS_CRL_ALL', 2); -define('LDAP_OPT_X_TLS_PROTOCOL_MIN', 24583); -define('LDAP_OPT_X_TLS_PROTOCOL_SSL2', 512); -define('LDAP_OPT_X_TLS_PROTOCOL_SSL3', 768); -define('LDAP_OPT_X_TLS_PROTOCOL_TLS1_0', 769); -define('LDAP_OPT_X_TLS_PROTOCOL_TLS1_1', 770); -define('LDAP_OPT_X_TLS_PROTOCOL_TLS1_2', 771); -define('LDAP_OPT_X_TLS_PACKAGE', 24593); -define('LDAP_OPT_X_KEEPALIVE_IDLE', 25344); -define('LDAP_OPT_X_KEEPALIVE_PROBES', 25345); -define('LDAP_OPT_X_KEEPALIVE_INTERVAL', 25346); -define('LDAP_OPT_X_SASL_USERNAME', 24844); -define('LDAP_OPT_X_SASL_NOCANON', 24843); - -/** - * Specifies alternative rules for following aliases at the server. - * @link https://php.net/manual/en/ldap.constants.php - */ -define ('LDAP_OPT_DEREF', 2); - -/** - * <p> - * Specifies the maximum number of entries that can be - * returned on a search operation. - * </p> - * The actual size limit for operations is also bounded - * by the server's configured maximum number of return entries. - * The lesser of these two settings is the actual size limit. - * @link https://php.net/manual/en/ldap.constants.php - */ -define ('LDAP_OPT_SIZELIMIT', 3); - -/** - * Specifies the number of seconds to wait for search results. - * The actual time limit for operations is also bounded - * by the server's configured maximum time. - * The lesser of these two settings is the actual time limit. - * @link https://php.net/manual/en/ldap.constants.php - */ -define ('LDAP_OPT_TIMELIMIT', 4); - -/** - * Option for <b>ldap_set_option</b> to allow setting network timeout. - * (Available as of PHP 5.3.0) - * @link https://php.net/manual/en/ldap.constants.php - */ -define ('LDAP_OPT_NETWORK_TIMEOUT', 20485); - -/** - * Specifies the LDAP protocol to be used (V2 or V3). - * @link https://php.net/manual/en/ldap.constants.php - */ -define ('LDAP_OPT_PROTOCOL_VERSION', 17); -define ('LDAP_OPT_ERROR_NUMBER', 49); - -/** - * Specifies whether to automatically follow referrals returned - * by the LDAP server. - * @link https://php.net/manual/en/ldap.constants.php - */ -define ('LDAP_OPT_REFERRALS', 8); -define ('LDAP_OPT_RESTART', 9); -define ('LDAP_OPT_HOST_NAME', 48); -define ('LDAP_OPT_ERROR_STRING', 50); -define ('LDAP_OPT_MATCHED_DN', 51); - -/** - * Specifies a default list of server controls to be sent with each request. - * @link https://php.net/manual/en/ldap.constants.php - */ -define ('LDAP_OPT_SERVER_CONTROLS', 18); - -/** - * Specifies a default list of client controls to be processed with each request. - * @link https://php.net/manual/en/ldap.constants.php - */ -define ('LDAP_OPT_CLIENT_CONTROLS', 19); - -/** - * Specifies a bitwise level for debug traces. - * @link https://php.net/manual/en/ldap.constants.php - */ -define ('LDAP_OPT_DEBUG_LEVEL', 20481); -define ('LDAP_OPT_X_SASL_MECH', 24832); -define ('LDAP_OPT_X_SASL_REALM', 24833); -define ('LDAP_OPT_X_SASL_AUTHCID', 24834); -define ('LDAP_OPT_X_SASL_AUTHZID', 24835); - -/** - * Specifies the path of the directory containing CA certificates. - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.1 - */ -define('LDAP_OPT_X_TLS_CACERTDIR', 24579); - -/** - * Specifies the full-path of the CA certificate file. - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.1 - */ -define('LDAP_OPT_X_TLS_CACERTFILE', 24578); - -define('LDAP_MODIFY_BATCH_ATTRIB', 'attrib'); -define('LDAP_MODIFY_BATCH_MODTYPE', 'modtype'); -define('LDAP_MODIFY_BATCH_VALUES', 'values'); -define('LDAP_OPT_TIMEOUT', 20482); -define('LDAP_OPT_DIAGNOSTIC_MESSAGE', 50); - - -/** - * Control Constant - Manage DSA IT (» RFC 3296) - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_MANAGEDSAIT", "2.16.840.1.113730.3.4.2"); -echo - -/** - * Control Constant - Proxied Authorization (» RFC 4370) - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_PROXY_AUTHZ", "2.16.840.1.113730.3.4.18"); - -/** - * Control Constant - Subentries (» RFC 3672) - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_SUBENTRIES", "1.3.6.1.4.1.4203.1.10.1"); - -/** - * Control Constant - Filter returned values (» RFC 3876) - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_VALUESRETURNFILTER", "1.2.826.0.1.3344810.2.3"); - -/** - * Control Constant - Assertion (» RFC 4528) - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_ASSERT", "1.3.6.1.1.12"); - -/** - * Control Constant - Pre read (» RFC 4527) - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_PRE_READ", "1.3.6.1.1.13.1"); - -/** - * Control Constant - Post read (» RFC 4527) - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_POST_READ", "1.3.6.1.1.13.2"); - -/** - * Control Constant - Sort request (» RFC 2891) - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_SORTREQUEST", "1.2.840.113556.1.4.473"); - -/** - * Control Constant - Sort response (» RFC 2891) - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_SORTRESPONSE", "1.2.840.113556.1.4.474"); - -/** - * Control Constant - Paged results (» RFC 2696) - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_PAGEDRESULTS", "1.2.840.113556.1.4.319"); - -/** - * Control Constant - Content Synchronization Operation (» RFC 4533) - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_SYNC", "1.3.6.1.4.1.4203.1.9.1.1"); - -/** - * Control Constant - Content Synchronization Operation State (» RFC 4533) - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_SYNC_STATE", "1.3.6.1.4.1.4203.1.9.1.2"); - -/** - * Control Constant - Content Synchronization Operation Done (» RFC 4533) - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_SYNC_DONE", "1.3.6.1.4.1.4203.1.9.1.3"); - -/** - * Control Constant - Don't Use Copy (» RFC 6171) - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_DONTUSECOPY", "1.3.6.1.1.22"); - -/** - * Control Constant - Password Policy Request - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_PASSWORDPOLICYREQUEST", "1.3.6.1.4.1.42.2.27.8.5.1"); - -/** - * Control Constant - Password Policy Response - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_PASSWORDPOLICYRESPONSE", "1.3.6.1.4.1.42.2.27.8.5.1"); - -/** - * Control Constant - Active Directory Incremental Values - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_X_INCREMENTAL_VALUES", "1.2.840.113556.1.4.802"); - -/** - * Control Constant - Active Directory Domain Scope - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_X_DOMAIN_SCOPE", "1.2.840.113556.1.4.1339"); - -/** - * Control Constant - Active Directory Permissive Modify - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_X_PERMISSIVE_MODIFY", "1.2.840.113556.1.4.1413"); - -/** - * Control Constant - Active Directory Search Options - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_X_SEARCH_OPTIONS", "1.2.840.113556.1.4.1340"); - -/** - * Control Constant - Active Directory Tree Delete - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_X_TREE_DELETE", "1.2.840.113556.1.4.805"); - -/** - * Control Constant - Active Directory Extended DN - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_X_EXTENDED_DN", "1.2.840.113556.1.4.529"); - -/** - * Control Constant - Virtual List View Request - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_VLVREQUEST", "2.16.840.1.113730.3.4.9"); - -/** - * Control Constant - Virtual List View Response - * @link https://php.net/manual/en/ldap.constants.php - * @since 7.3 - */ -define("LDAP_CONTROL_VLVRESPONSE", "2.16.840.1.113730.3.4.10"); - - -/** - * Extended Operation constant - Modify password - */ -define("LDAP_EXOP_MODIFY_PASSWD", "1.3.6.1.4.1.4203.1.11.1"); - -/** - * Extended Operation Constant - Refresh - */ -define("LDAP_EXOP_REFRESH", "1.3.6.1.4.1.1466.101.119.1"); - -/** - * Extended Operation constant - Start TLS - */ -define("LDAP_EXOP_START_TLS", "1.3.6.1.4.1.1466.20037"); - -/** - * Extended Operation Constant - Turn - */ -define("LDAP_EXOP_TURN", "1.3.6.1.1.19"); - -/** - * Extended Operation Constant - WHOAMI - */ -define("LDAP_EXOP_WHO_AM_I", "1.3.6.1.4.1.4203.1.11.3"); - -// End of ldap v. -?> +namespace LDAP { + + /** + * @strict-properties + * @not-serializable + */ + final class Connection + { + } + + /** + * @strict-properties + * @not-serializable + */ + final class Result + { + } + + /** + * @strict-properties + * @not-serializable + */ + final class ResultEntry + { + } +} diff --git a/build/stubs/pcntl.php b/build/stubs/pcntl.php new file mode 100644 index 00000000000..ff0bde9ed7a --- /dev/null +++ b/build/stubs/pcntl.php @@ -0,0 +1,50 @@ +<?php + +// Licensed under Apache-2.0 +// Copied from https://github.com/JetBrains/phpstorm-stubs/blob/master/pcntl/pcntl.php + +define('WNOHANG', 1); +define('WUNTRACED', 2); +define('WCONTINUED', 8); +define('SIG_IGN', 1); +define('SIG_DFL', 0); +define('SIG_ERR', -1); +define('SIGHUP', 1); +define('SIGINT', 2); +define('SIGQUIT', 3); +define('SIGILL', 4); +define('SIGTRAP', 5); +define('SIGABRT', 6); +define('SIGIOT', 6); +define('SIGBUS', 7); +define('SIGFPE', 8); +define('SIGKILL', 9); +define('SIGUSR1', 10); +define('SIGSEGV', 11); +define('SIGUSR2', 12); +define('SIGPIPE', 13); +define('SIGALRM', 14); +define('SIGTERM', 15); +define('SIGSTKFLT', 16); +define('SIGCLD', 17); +define('SIGCHLD', 17); +define('SIGCONT', 18); +define('SIGSTOP', 19); +define('SIGTSTP', 20); +define('SIGTTIN', 21); +define('SIGTTOU', 22); +define('SIGURG', 23); +define('SIGXCPU', 24); +define('SIGXFSZ', 25); +define('SIGVTALRM', 26); +define('SIGPROF', 27); +define('SIGWINCH', 28); +define('SIGPOLL', 29); +define('SIGIO', 29); +define('SIGPWR', 30); +define('SIGSYS', 31); +define('SIGBABY', 31); +define('PRIO_PGRP', 1); +define('PRIO_USER', 2); +define('PRIO_PROCESS', 0); + diff --git a/composer.json b/composer.json index b17734c8591..4e191745592 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "cs:fix": "php-cs-fixer fix", "cs:check": "php-cs-fixer fix --dry-run --diff", "lint": "find . -name \\*.php -not -path './lib/composer/*' -not -path './build/stubs/*' -print0 | xargs -0 -n1 php -l", - "psalm": "psalm", - "psalm:update-baseline": "psalm --update-baseline --set-baseline=build/psalm-baseline.xml" + "psalm": "psalm --threads=1", + "psalm:update-baseline": "psalm --threads=1 --update-baseline --set-baseline=build/psalm-baseline.xml" } } diff --git a/core/Command/App/GetPath.php b/core/Command/App/GetPath.php index 682c3fb9bac..2ec72385191 100644 --- a/core/Command/App/GetPath.php +++ b/core/Command/App/GetPath.php @@ -48,7 +48,7 @@ class GetPath extends Base { * * @param InputInterface $input An InputInterface instance * @param OutputInterface $output An OutputInterface instance - * @return null|int null or 0 if everything went fine, or an error code + * @return int 0 if everything went fine, or an error code */ protected function execute(InputInterface $input, OutputInterface $output): int { $appName = $input->getArgument('app'); diff --git a/core/Command/Config/App/GetConfig.php b/core/Command/Config/App/GetConfig.php index 0e42ae786d8..e0beb4ee84e 100644 --- a/core/Command/Config/App/GetConfig.php +++ b/core/Command/Config/App/GetConfig.php @@ -69,7 +69,7 @@ class GetConfig extends Base { * * @param InputInterface $input An InputInterface instance * @param OutputInterface $output An OutputInterface instance - * @return null|int null or 0 if everything went fine, or an error code + * @return int 0 if everything went fine, or an error code */ protected function execute(InputInterface $input, OutputInterface $output): int { $appName = $input->getArgument('app'); diff --git a/core/Command/Config/System/GetConfig.php b/core/Command/Config/System/GetConfig.php index 3fce89572c8..265fc70900f 100644 --- a/core/Command/Config/System/GetConfig.php +++ b/core/Command/Config/System/GetConfig.php @@ -65,7 +65,7 @@ class GetConfig extends Base { * * @param InputInterface $input An InputInterface instance * @param OutputInterface $output An OutputInterface instance - * @return null|int null or 0 if everything went fine, or an error code + * @return int 0 if everything went fine, or an error code */ protected function execute(InputInterface $input, OutputInterface $output): int { $configNames = $input->getArgument('name'); diff --git a/core/Command/Db/Migrations/ExecuteCommand.php b/core/Command/Db/Migrations/ExecuteCommand.php index a2dc2b92418..6f4559ee7b4 100644 --- a/core/Command/Db/Migrations/ExecuteCommand.php +++ b/core/Command/Db/Migrations/ExecuteCommand.php @@ -79,7 +79,7 @@ class ExecuteCommand extends Command implements CompletionAwareInterface { $olderVersions = $ms->getMigratedVersions(); $olderVersions[] = '0'; $olderVersions[] = 'prev'; - if (in_array($version, $olderVersions, true)) { + if (in_array($version, $olderVersions, true)) { $output->writeln('<error>Can not go back to previous migration without debug enabled</error>'); return 1; } diff --git a/core/Command/Db/Migrations/GenerateCommand.php b/core/Command/Db/Migrations/GenerateCommand.php index b352e86ec62..47777b1561e 100644 --- a/core/Command/Db/Migrations/GenerateCommand.php +++ b/core/Command/Db/Migrations/GenerateCommand.php @@ -113,7 +113,7 @@ class {{classname}} extends SimpleMigrationStep { $appName = $input->getArgument('app'); $version = $input->getArgument('version'); - if (!preg_match('/^\d{1,16}$/',$version)) { + if (!preg_match('/^\d{1,16}$/', $version)) { $output->writeln('<error>The given version is invalid. Only 0-9 are allowed (max. 16 digits)</error>'); return 1; } diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php index efc7124f2ea..0591132e37f 100644 --- a/core/Command/Upgrade.php +++ b/core/Command/Upgrade.php @@ -247,8 +247,7 @@ class Upgrade extends Command { $output->write('<comment>Maybe an upgrade is already in process. Please check the ' . 'logfile (data/nextcloud.log). If you want to re-run the ' . 'upgrade procedure, remove the "maintenance mode" from ' - . 'config.php and call this script again.</comment>' - , true); + . 'config.php and call this script again.</comment>', true); return self::ERROR_MAINTENANCE_MODE; } else { $output->writeln('<info>Nextcloud is already latest version</info>'); diff --git a/core/Command/User/Add.php b/core/Command/User/Add.php index bb11a1ea5c9..574be6e421c 100644 --- a/core/Command/User/Add.php +++ b/core/Command/User/Add.php @@ -107,7 +107,7 @@ class Add extends Command { $question = new Question('Confirm password: '); $question->setHidden(true); - $confirm = $helper->ask($input, $output,$question); + $confirm = $helper->ask($input, $output, $question); if ($password !== $confirm) { $output->writeln("<error>Passwords did not match!</error>"); diff --git a/core/Command/User/Setting.php b/core/Command/User/Setting.php index b677540d170..04488cdeff1 100644 --- a/core/Command/User/Setting.php +++ b/core/Command/User/Setting.php @@ -178,7 +178,7 @@ class Setting extends Base { return 1; } - if ($app === 'settings' && in_array($key , ['email', 'display_name'])) { + if ($app === 'settings' && in_array($key, ['email', 'display_name'])) { $user = $this->userManager->get($uid); if ($user instanceof IUser) { if ($key === 'email') { @@ -208,7 +208,7 @@ class Setting extends Base { return 1; } - if ($app === 'settings' && in_array($key , ['email', 'display_name'])) { + if ($app === 'settings' && in_array($key, ['email', 'display_name'])) { $user = $this->userManager->get($uid); if ($user instanceof IUser) { if ($key === 'email') { diff --git a/core/Migrations/Version15000Date20180926101451.php b/core/Migrations/Version15000Date20180926101451.php index e379b12490d..f70a786bbcd 100644 --- a/core/Migrations/Version15000Date20180926101451.php +++ b/core/Migrations/Version15000Date20180926101451.php @@ -44,7 +44,7 @@ class Version15000Date20180926101451 extends SimpleMigrationStep { $schema = $schemaClosure(); $table = $schema->getTable('authtoken'); - $table->addColumn('password_invalid','boolean', [ + $table->addColumn('password_invalid', 'boolean', [ 'default' => 0, 'notnull' => false, ]); diff --git a/index.php b/index.php index 7c7400a0564..7b62f17e5bd 100644 --- a/index.php +++ b/index.php @@ -60,7 +60,7 @@ try { * not return a webpage, so we only print the error page when html is accepted, * otherwise we reply with a JSON array like the SecurityMiddleware would do. */ - if (stripos($request->getHeader('Accept'),'html') === false) { + if (stripos($request->getHeader('Accept'), 'html') === false) { http_response_code(401); header('Content-Type: application/json; charset=utf-8'); echo json_encode(['message' => $ex->getMessage()]); diff --git a/lib/composer/composer/ClassLoader.php b/lib/composer/composer/ClassLoader.php index 0cd6055d1b7..afef3fa2ad8 100644 --- a/lib/composer/composer/ClassLoader.php +++ b/lib/composer/composer/ClassLoader.php @@ -149,7 +149,7 @@ class ClassLoader /** * @return string[] Array of classname => path - * @psalm-var array<string, string> + * @psalm-return array<string, string> */ public function getClassMap() { diff --git a/lib/composer/composer/InstalledVersions.php b/lib/composer/composer/InstalledVersions.php index b3a4e1611e6..d50e0c9fcc4 100644 --- a/lib/composer/composer/InstalledVersions.php +++ b/lib/composer/composer/InstalledVersions.php @@ -20,12 +20,25 @@ use Composer\Semver\VersionParser; * * See also https://getcomposer.org/doc/07-runtime.md#installed-versions * - * To require it's presence, you can require `composer-runtime-api ^2.0` + * To require its presence, you can require `composer-runtime-api ^2.0` */ class InstalledVersions { + /** + * @var mixed[]|null + * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null + */ private static $installed; + + /** + * @var bool|null + */ private static $canGetVendors; + + /** + * @var array[] + * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}> + */ private static $installedByVendor = array(); /** @@ -228,7 +241,7 @@ class InstalledVersions /** * @return array - * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string} + * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string} */ public static function getRootPackage() { @@ -242,7 +255,7 @@ class InstalledVersions * * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect. * @return array[] - * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>} + * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} */ public static function getRawData() { @@ -265,7 +278,7 @@ class InstalledVersions * Returns the raw data of all installed.php which are currently loaded for custom implementations * * @return array[] - * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}> + * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}> */ public static function getAllRawData() { @@ -288,7 +301,7 @@ class InstalledVersions * @param array[] $data A vendor/composer/installed.php data set * @return void * - * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>} $data + * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data */ public static function reload($data) { @@ -298,7 +311,7 @@ class InstalledVersions /** * @return array[] - * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}> + * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}> */ private static function getInstalled() { diff --git a/lib/composer/composer/installed.php b/lib/composer/composer/installed.php index b811738fbd0..f12a8e00dbe 100644 --- a/lib/composer/composer/installed.php +++ b/lib/composer/composer/installed.php @@ -5,7 +5,7 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../../../', 'aliases' => array(), - 'reference' => '66144c300395458ff38b86e50cd92174443cd85e', + 'reference' => '1225189f74d06606aafc4150d07584b90cea50dd', 'name' => '__root__', 'dev' => false, ), @@ -16,7 +16,7 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../../../', 'aliases' => array(), - 'reference' => '66144c300395458ff38b86e50cd92174443cd85e', + 'reference' => '1225189f74d06606aafc4150d07584b90cea50dd', 'dev_requirement' => false, ), ), diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php index cdfb123179e..7f855c07d46 100644 --- a/lib/private/Accounts/AccountManager.php +++ b/lib/private/Accounts/AccountManager.php @@ -633,7 +633,7 @@ class AccountManager implements IAccountManager { } // the value col is limited to 255 bytes. It is used for searches only. - $value = $property['value'] ? Util::shortenMultibyteString($property['value'], 255) : ''; + $value = $property['value'] ? Util::shortenMultibyteString($property['value'], 255) : ''; $query->setParameter('name', $property['name']) ->setParameter('value', $value); diff --git a/lib/private/AppFramework/Http/Dispatcher.php b/lib/private/AppFramework/Http/Dispatcher.php index 6bbab42cb79..0f12dbda629 100644 --- a/lib/private/AppFramework/Http/Dispatcher.php +++ b/lib/private/AppFramework/Http/Dispatcher.php @@ -131,7 +131,7 @@ class Dispatcher { $numExecuted = $databaseStatsAfter['executed'] - $databaseStatsBefore['executed']; if ($numBuilt > 50) { - $this->logger->debug('Controller {class}::{method} created {count} QueryBuilder objects, please check if they are created inside a loop by accident.' , [ + $this->logger->debug('Controller {class}::{method} created {count} QueryBuilder objects, please check if they are created inside a loop by accident.', [ 'class' => get_class($controller), 'method' => $methodName, 'count' => $numBuilt, @@ -139,7 +139,7 @@ class Dispatcher { } if ($numExecuted > 100) { - $this->logger->warning('Controller {class}::{method} executed {count} queries.' , [ + $this->logger->warning('Controller {class}::{method} executed {count} queries.', [ 'class' => get_class($controller), 'method' => $methodName, 'count' => $numExecuted, diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index c67500bcaa4..21af2bc46f4 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/lib/private/AppFramework/Http/Request.php @@ -303,7 +303,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { * @return string */ public function getHeader(string $name): string { - $name = strtoupper(str_replace('-', '_',$name)); + $name = strtoupper(str_replace('-', '_', $name)); if (isset($this->server['HTTP_' . $name])) { return $this->server['HTTP_' . $name]; } diff --git a/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php b/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php index 8bdbacda20b..5f683fa38ac 100644 --- a/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php @@ -109,7 +109,7 @@ class RateLimitingMiddleware extends Middleware { */ public function afterException($controller, $methodName, \Exception $exception) { if ($exception instanceof RateLimitExceededException) { - if (stripos($this->request->getHeader('Accept'),'html') === false) { + if (stripos($this->request->getHeader('Accept'), 'html') === false) { $response = new DataResponse([], $exception->getCode()); } else { $response = new TemplateResponse( diff --git a/lib/private/BackgroundJob/JobList.php b/lib/private/BackgroundJob/JobList.php index 9442bd9eca9..3dbcf518f1e 100644 --- a/lib/private/BackgroundJob/JobList.php +++ b/lib/private/BackgroundJob/JobList.php @@ -356,8 +356,8 @@ class JobList implements IJobList { public function resetBackgroundJob(IJob $job): void { $query = $this->connection->getQueryBuilder(); $query->update('jobs') - ->set('last_run', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT)) - ->set('reserved_at', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT)) + ->set('last_run', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT)) + ->set('reserved_at', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT)) ->where($query->expr()->eq('id', $query->createNamedParameter($job->getId()), IQueryBuilder::PARAM_INT)); $query->executeStatement(); } diff --git a/lib/private/Collaboration/Resources/Manager.php b/lib/private/Collaboration/Resources/Manager.php index a0fba16998f..8fc3d0dd5ea 100644 --- a/lib/private/Collaboration/Resources/Manager.php +++ b/lib/private/Collaboration/Resources/Manager.php @@ -131,7 +131,7 @@ class Manager implements IManager { */ public function searchCollections(IUser $user, string $filter, int $limit = 50, int $start = 0): array { $query = $this->connection->getQueryBuilder(); - $userId = $user instanceof IUser ? $user->getUID() : ''; + $userId = $user->getUID(); $query->select('c.*', 'a.access') ->from(self::TABLE_COLLECTIONS, 'c') diff --git a/lib/private/DB/Adapter.php b/lib/private/DB/Adapter.php index 4d9b43d0787..334006d1706 100644 --- a/lib/private/DB/Adapter.php +++ b/lib/private/DB/Adapter.php @@ -136,7 +136,7 @@ class Adapter { /** * @throws \OCP\DB\Exception */ - public function insertIgnoreConflict(string $table,array $values) : int { + public function insertIgnoreConflict(string $table, array $values) : int { try { $builder = $this->conn->getQueryBuilder(); $builder->insert($table); diff --git a/lib/private/DB/AdapterPgSql.php b/lib/private/DB/AdapterPgSql.php index 1262fd4f1ab..9045aa7f879 100644 --- a/lib/private/DB/AdapterPgSql.php +++ b/lib/private/DB/AdapterPgSql.php @@ -43,7 +43,7 @@ class AdapterPgSql extends Adapter { return $statement; } - public function insertIgnoreConflict(string $table,array $values) : int { + public function insertIgnoreConflict(string $table, array $values) : int { if ($this->isPre9_5CompatMode() === true) { return parent::insertIgnoreConflict($table, $values); } diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index f2d91065b9a..271b7a27321 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1182,7 +1182,7 @@ class View { if ($result && in_array('delete', $hooks) and $result) { $this->removeUpdate($storage, $internalPath); } - if ($result && in_array('write', $hooks, true) && $operation !== 'fopen' && $operation !== 'touch') { + if ($result && in_array('write', $hooks, true) && $operation !== 'fopen' && $operation !== 'touch') { $this->writeUpdate($storage, $internalPath); } if ($result && in_array('touch', $hooks)) { @@ -1407,7 +1407,7 @@ class View { } $info = new FileInfo($path, $storage, $internalPath, $data, $mount, $owner); - if ($data and isset($data['fileid'])) { + if (isset($data['fileid'])) { if ($includeMountPoints and $data['mimetype'] === 'httpd/unix-directory') { //add the sizes of other mount points to the folder $extOnly = ($includeMountPoints === 'ext'); diff --git a/lib/private/Installer.php b/lib/private/Installer.php index b63619b821c..95143656295 100644 --- a/lib/private/Installer.php +++ b/lib/private/Installer.php @@ -308,91 +308,80 @@ class Installer { $extractDir = $this->tempManager->getTemporaryFolder(); $archive = new TAR($tempFile); - if ($archive) { - if (!$archive->extract($extractDir)) { - $errorMessage = 'Could not extract app ' . $appId; + if (!$archive->extract($extractDir)) { + $errorMessage = 'Could not extract app ' . $appId; - $archiveError = $archive->getError(); - if ($archiveError instanceof \PEAR_Error) { - $errorMessage .= ': ' . $archiveError->getMessage(); - } - - throw new \Exception($errorMessage); - } - $allFiles = scandir($extractDir); - $folders = array_diff($allFiles, ['.', '..']); - $folders = array_values($folders); - - if (count($folders) > 1) { - throw new \Exception( - sprintf( - 'Extracted app %s has more than 1 folder', - $appId - ) - ); + $archiveError = $archive->getError(); + if ($archiveError instanceof \PEAR_Error) { + $errorMessage .= ': ' . $archiveError->getMessage(); } - // Check if appinfo/info.xml has the same app ID as well - if ((PHP_VERSION_ID < 80000)) { - $loadEntities = libxml_disable_entity_loader(false); - $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml'); - libxml_disable_entity_loader($loadEntities); - } else { - $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml'); - } - if ((string)$xml->id !== $appId) { - throw new \Exception( - sprintf( - 'App for id %s has a wrong app ID in info.xml: %s', - $appId, - (string)$xml->id - ) - ); - } + throw new \Exception($errorMessage); + } + $allFiles = scandir($extractDir); + $folders = array_diff($allFiles, ['.', '..']); + $folders = array_values($folders); - // Check if the version is lower than before - $currentVersion = OC_App::getAppVersion($appId); - $newVersion = (string)$xml->version; - if (version_compare($currentVersion, $newVersion) === 1) { - throw new \Exception( - sprintf( - 'App for id %s has version %s and tried to update to lower version %s', - $appId, - $currentVersion, - $newVersion - ) - ); - } + if (count($folders) > 1) { + throw new \Exception( + sprintf( + 'Extracted app %s has more than 1 folder', + $appId + ) + ); + } - $baseDir = OC_App::getInstallPath() . '/' . $appId; - // Remove old app with the ID if existent - OC_Helper::rmdirr($baseDir); - // Move to app folder - if (@mkdir($baseDir)) { - $extractDir .= '/' . $folders[0]; - OC_Helper::copyr($extractDir, $baseDir); - } - OC_Helper::copyr($extractDir, $baseDir); - OC_Helper::rmdirr($extractDir); - return; + // Check if appinfo/info.xml has the same app ID as well + if ((PHP_VERSION_ID < 80000)) { + $loadEntities = libxml_disable_entity_loader(false); + $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml'); + libxml_disable_entity_loader($loadEntities); } else { + $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml'); + } + if ((string)$xml->id !== $appId) { throw new \Exception( sprintf( - 'Could not extract app with ID %s to %s', + 'App for id %s has a wrong app ID in info.xml: %s', $appId, - $extractDir + (string)$xml->id ) ); } - } else { - // Signature does not match - throw new \Exception( - sprintf( - 'App with id %s has invalid signature', - $appId - ) - ); + + // Check if the version is lower than before + $currentVersion = OC_App::getAppVersion($appId); + $newVersion = (string)$xml->version; + if (version_compare($currentVersion, $newVersion) === 1) { + throw new \Exception( + sprintf( + 'App for id %s has version %s and tried to update to lower version %s', + $appId, + $currentVersion, + $newVersion + ) + ); + } + + $baseDir = OC_App::getInstallPath() . '/' . $appId; + // Remove old app with the ID if existent + OC_Helper::rmdirr($baseDir); + // Move to app folder + if (@mkdir($baseDir)) { + $extractDir .= '/' . $folders[0]; + OC_Helper::copyr($extractDir, $baseDir); + } + OC_Helper::copyr($extractDir, $baseDir); + OC_Helper::rmdirr($extractDir); + return; } + // Signature does not match + throw new \Exception( + sprintf( + 'App with id %s has invalid signature', + $appId + ) + ); } } diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index 1189907eac9..61f506d2676 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -244,7 +244,7 @@ class Mailer implements IMailer { } [$name, $domain] = explode('@', $email, 2); - $domain = idn_to_ascii($domain, 0,INTL_IDNA_VARIANT_UTS46); + $domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46); return $name.'@'.$domain; } diff --git a/lib/private/Memcache/Memcached.php b/lib/private/Memcache/Memcached.php index b3414a7d290..50f3fa66ab3 100644 --- a/lib/private/Memcache/Memcached.php +++ b/lib/private/Memcache/Memcached.php @@ -66,6 +66,7 @@ class Memcached extends Cache implements IMemcache { //\Memcached::OPT_BINARY_PROTOCOL => true, ]; // by default enable igbinary serializer if available + /** @psalm-suppress RedundantCondition */ if (\Memcached::HAVE_IGBINARY) { $defaultOptions[\Memcached::OPT_SERIALIZER] = \Memcached::SERIALIZER_IGBINARY; diff --git a/lib/private/Migration/BackgroundRepair.php b/lib/private/Migration/BackgroundRepair.php index 25026575d38..03a3d3f4a7c 100644 --- a/lib/private/Migration/BackgroundRepair.php +++ b/lib/private/Migration/BackgroundRepair.php @@ -97,7 +97,7 @@ class BackgroundRepair extends TimedJob { try { $repair->addStep($step); } catch (\Exception $ex) { - $this->logger->logException($ex,[ + $this->logger->logException($ex, [ 'app' => 'migration' ]); diff --git a/lib/private/Notification/Manager.php b/lib/private/Notification/Manager.php index d8bbc02e105..c707884355b 100644 --- a/lib/private/Notification/Manager.php +++ b/lib/private/Notification/Manager.php @@ -381,12 +381,12 @@ class Manager implements IManager { throw new \InvalidArgumentException('The given notification has been processed'); } - if (!($notification instanceof INotification) || !$notification->isValidParsed()) { + if (!$notification->isValidParsed()) { throw new \InvalidArgumentException('The given notification has not been handled'); } } - if (!($notification instanceof INotification) || !$notification->isValidParsed()) { + if (!$notification->isValidParsed()) { throw new \InvalidArgumentException('The given notification has not been handled'); } diff --git a/lib/private/Preview/MarkDown.php b/lib/private/Preview/MarkDown.php index e24bdb5959b..929f319f57d 100644 --- a/lib/private/Preview/MarkDown.php +++ b/lib/private/Preview/MarkDown.php @@ -43,7 +43,7 @@ class MarkDown extends TXT { return null; } - $content = stream_get_contents($content,3000); + $content = stream_get_contents($content, 3000); //don't create previews of empty text files if (trim($content) === '') { @@ -119,7 +119,7 @@ class MarkDown extends TXT { // Get rid of markdown symbols that we still needed for the font size $line = preg_replace('/^#*\s/', '', $line); - $wrappedText = wordwrap($line, $wordWrap,"\n"); + $wrappedText = wordwrap($line, $wordWrap, "\n"); $linesWrapped = count(explode("\n", $wrappedText)); imagettftext($image, $actualFontSize, 0, $x, $y, $textColor, $actualFontSize === $fontSize ? $fontFile : $fontFileBold, $wrappedText); $nextLineStart = (int)($linesWrapped * ceil($actualFontSize * 2)); diff --git a/lib/private/Preview/TXT.php b/lib/private/Preview/TXT.php index d55d32386a7..bb3af6b90de 100644 --- a/lib/private/Preview/TXT.php +++ b/lib/private/Preview/TXT.php @@ -62,7 +62,7 @@ class TXT extends ProviderV2 { return null; } - $content = stream_get_contents($content,3000); + $content = stream_get_contents($content, 3000); //don't create previews of empty text files if (trim($content) === '') { diff --git a/lib/private/Security/TrustedDomainHelper.php b/lib/private/Security/TrustedDomainHelper.php index 175e4cbd356..0688ebba5b3 100644 --- a/lib/private/Security/TrustedDomainHelper.php +++ b/lib/private/Security/TrustedDomainHelper.php @@ -98,7 +98,7 @@ class TrustedDomainHelper implements ITrustedDomainHelper { return true; } // Reject misformed domains in any case - if (strpos($domain,'-') === 0 || strpos($domain,'..') !== false) { + if (strpos($domain, '-') === 0 || strpos($domain, '..') !== false) { return false; } // Match, allowing for * wildcards diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php index 8a12465fd8d..920baf3e4ee 100644 --- a/lib/private/Setup/MySQL.php +++ b/lib/private/Setup/MySQL.php @@ -125,7 +125,7 @@ class MySQL extends AbstractDatabase { $connection->executeUpdate($query); } } catch (\Exception $ex) { - $this->logger->error('Database user creation failed.',[ + $this->logger->error('Database user creation failed.', [ 'exception' => $ex, 'app' => 'mysql.setup', ]); diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php index 548c8a2c451..47b09982f3a 100644 --- a/lib/private/Share/Share.php +++ b/lib/private/Share/Share.php @@ -847,7 +847,7 @@ class Share extends Constants { * @param array $parameters additional format parameters * @return array format result */ - private static function formatResult($items, $column, $backend, $format = self::FORMAT_NONE , $parameters = null) { + private static function formatResult($items, $column, $backend, $format = self::FORMAT_NONE, $parameters = null) { if ($format === self::FORMAT_NONE) { return $items; } elseif ($format === self::FORMAT_STATUSES) { diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index ec0f25cbae5..6e8d9105a76 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -670,7 +670,7 @@ class DefaultShareProvider implements IShareProvider { ); } - $qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid')); + $qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid')); $qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId()))); $qb->orderBy('id'); diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php index 382179b23e0..753a4a217d1 100644 --- a/lib/private/URLGenerator.php +++ b/lib/private/URLGenerator.php @@ -187,7 +187,7 @@ class URLGenerator implements IURLGenerator { $theme = \OC_Util::getTheme(); //if a theme has a png but not an svg always use the png - $basename = substr(basename($file),0,-4); + $basename = substr(basename($file), 0, -4); $appPath = \OC_App::getAppPath($appName); diff --git a/lib/private/legacy/OC_DB.php b/lib/private/legacy/OC_DB.php index 1fbc233f535..39faf8e80aa 100644 --- a/lib/private/legacy/OC_DB.php +++ b/lib/private/legacy/OC_DB.php @@ -42,7 +42,7 @@ class OC_DB { * * SQL query via Doctrine prepare(), needs to be execute()'d! */ - public static function prepare($query , $limit = null, $offset = null, $isManipulation = null) { + public static function prepare($query, $limit = null, $offset = null, $isManipulation = null) { $connection = \OC::$server->getDatabaseConnection(); if ($isManipulation === null) { diff --git a/lib/private/legacy/OC_DB_StatementWrapper.php b/lib/private/legacy/OC_DB_StatementWrapper.php index d8e8f0ae37f..d6214a49a33 100644 --- a/lib/private/legacy/OC_DB_StatementWrapper.php +++ b/lib/private/legacy/OC_DB_StatementWrapper.php @@ -59,7 +59,7 @@ class OC_DB_StatementWrapper { /** * pass all other function directly to the \Doctrine\DBAL\Driver\Statement */ - public function __call($name,$arguments) { + public function __call($name, $arguments) { return call_user_func_array([$this->statement,$name], $arguments); } diff --git a/lib/public/IDBConnection.php b/lib/public/IDBConnection.php index 2fa7fa1ad36..d12baa400c0 100644 --- a/lib/public/IDBConnection.php +++ b/lib/public/IDBConnection.php @@ -188,7 +188,7 @@ interface IDBConnection { * @return int number of inserted rows * @since 16.0.0 */ - public function insertIgnoreConflict(string $table,array $values) : int; + public function insertIgnoreConflict(string $table, array $values) : int; /** * Insert or update a row value diff --git a/ocs/providers.php b/ocs/providers.php index 34f931ad940..ca0217d8e91 100644 --- a/ocs/providers.php +++ b/ocs/providers.php @@ -34,7 +34,7 @@ $url = $request->getServerProtocol() . '://' . substr($request->getServerHost() $writer = new XMLWriter(); $writer->openURI('php://output'); -$writer->startDocument('1.0','UTF-8'); +$writer->startDocument('1.0', 'UTF-8'); $writer->setIndent(true); $writer->startElement('providers'); $writer->startElement('provider'); diff --git a/psalm-ocp.xml b/psalm-ocp.xml index 407e0826435..03706430c5f 100644 --- a/psalm-ocp.xml +++ b/psalm-ocp.xml @@ -16,6 +16,10 @@ <directory name="lib/composer/bin"/> </ignoreFiles> </projectFiles> + <stubs> + <file name="build/stubs/gd.php"/> + <file name="build/stubs/ldap.php"/> + </stubs> <extraFiles> <directory name="3rdparty"/> </extraFiles> diff --git a/psalm.xml b/psalm.xml index 85ed49c77ee..9b3ea044435 100644 --- a/psalm.xml +++ b/psalm.xml @@ -75,14 +75,14 @@ <file name="build/stubs/sftp.php"/> <file name="build/stubs/ssh2.php"/> <file name="build/stubs/xsl.php"/> + <file name="build/stubs/ftp.php"/> + <file name="build/stubs/pcntl.php"/> </stubs> <issueHandlers> <UndefinedClass> <errorLevel type="suppress"> <referencedClass name="OCA\GroupFolders\Mount\GroupFolderStorage"/> <referencedClass name="OCA\TwoFactorNextcloudNotification\Controller\APIController"/> - <!-- Classes from PHP>=8 (needed to be able to use \GdImage::class) --> - <referencedClass name="GdImage" /> </errorLevel> </UndefinedClass> <UndefinedFunction> @@ -126,11 +126,6 @@ <!-- Helper classes for sharing API integration from other apps --> <referencedClass name="OCA\Deck\Sharing\ShareAPIHelper" /> <referencedClass name="OCA\Talk\Share\Helper\DeletedShareAPIController" /> - <!-- Classes from PHP>=8 --> - <referencedClass name="GdImage" /> - <referencedClass name="LDAP\Connection" /> - <referencedClass name="LDAP\Result" /> - <referencedClass name="LDAP\ResultEntry" /> </errorLevel> </UndefinedDocblockClass> </issueHandlers> diff --git a/tests/lib/AppFramework/Db/QBMapperTest.php b/tests/lib/AppFramework/Db/QBMapperTest.php index 7865979ef41..b03034056d2 100644 --- a/tests/lib/AppFramework/Db/QBMapperTest.php +++ b/tests/lib/AppFramework/Db/QBMapperTest.php @@ -109,11 +109,11 @@ class QBMapperTest extends \Test\TestCase { ->disableOriginalConstructor() ->getMock(); - $this->qb = $this->getMockBuilder(IQueryBuilder:: class) + $this->qb = $this->getMockBuilder(IQueryBuilder::class) ->disableOriginalConstructor() ->getMock(); - $this->expr = $this->getMockBuilder(IExpressionBuilder:: class) + $this->expr = $this->getMockBuilder(IExpressionBuilder::class) ->disableOriginalConstructor() ->getMock(); diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php index 7260b31b27e..a4a03b6479c 100644 --- a/tests/lib/AppFramework/Http/RequestTest.php +++ b/tests/lib/AppFramework/Http/RequestTest.php @@ -1062,7 +1062,7 @@ class RequestTest extends \Test\TestCase { $this->stream ); - $this->assertSame('from.server.name:8080', $request->getInsecureServerHost()); + $this->assertSame('from.server.name:8080', $request->getInsecureServerHost()); } public function testInsecureServerHostHttpHostHeader() { @@ -1079,7 +1079,7 @@ class RequestTest extends \Test\TestCase { $this->stream ); - $this->assertSame('from.host.header:8080', $request->getInsecureServerHost()); + $this->assertSame('from.host.header:8080', $request->getInsecureServerHost()); } public function testInsecureServerHostHttpFromForwardedHeaderSingle() { @@ -1108,7 +1108,7 @@ class RequestTest extends \Test\TestCase { $this->stream ); - $this->assertSame('from.forwarded.host:8080', $request->getInsecureServerHost()); + $this->assertSame('from.forwarded.host:8080', $request->getInsecureServerHost()); } public function testInsecureServerHostHttpFromForwardedHeaderStacked() { @@ -1137,7 +1137,7 @@ class RequestTest extends \Test\TestCase { $this->stream ); - $this->assertSame('from.forwarded.host2:8080', $request->getInsecureServerHost()); + $this->assertSame('from.forwarded.host2:8080', $request->getInsecureServerHost()); } public function testGetServerHostWithOverwriteHost() { @@ -1161,7 +1161,7 @@ class RequestTest extends \Test\TestCase { $this->stream ); - $this->assertSame('my.overwritten.host', $request->getServerHost()); + $this->assertSame('my.overwritten.host', $request->getServerHost()); } public function testGetServerHostWithTrustedDomain() { @@ -1190,7 +1190,7 @@ class RequestTest extends \Test\TestCase { $this->stream ); - $this->assertSame('my.trusted.host', $request->getServerHost()); + $this->assertSame('my.trusted.host', $request->getServerHost()); } public function testGetServerHostWithUntrustedDomain() { @@ -1219,7 +1219,7 @@ class RequestTest extends \Test\TestCase { $this->stream ); - $this->assertSame('my.trusted.host', $request->getServerHost()); + $this->assertSame('my.trusted.host', $request->getServerHost()); } public function testGetServerHostWithNoTrustedDomain() { @@ -1245,7 +1245,7 @@ class RequestTest extends \Test\TestCase { $this->stream ); - $this->assertSame('', $request->getServerHost()); + $this->assertSame('', $request->getServerHost()); } /** diff --git a/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php b/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php index 3eeac3ef103..5dd13942097 100644 --- a/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php @@ -68,7 +68,7 @@ class CompressionMiddlewareTest extends \Test\TestCase { ->willReturn(Http::STATUS_OK); $this->middleWare->beforeController($this->controller, 'myMethod'); - $this->middleWare->afterController($this->controller,'myMethod', $response); + $this->middleWare->afterController($this->controller, 'myMethod', $response); $output = 'myoutput'; $result = $this->middleWare->beforeOutput($this->controller, 'myMethod', $output); @@ -90,7 +90,7 @@ class CompressionMiddlewareTest extends \Test\TestCase { ->willReturn(Http::STATUS_OK); $this->middleWare->beforeController($this->controller, 'myMethod'); - $this->middleWare->afterController($this->controller,'myMethod', $response); + $this->middleWare->afterController($this->controller, 'myMethod', $response); $output = 'myoutput'; $result = $this->middleWare->beforeOutput($this->controller, 'myMethod', $output); @@ -112,7 +112,7 @@ class CompressionMiddlewareTest extends \Test\TestCase { ->willReturn(Http::STATUS_OK); $this->middleWare->beforeController($this->controller, 'myMethod'); - $this->middleWare->afterController($this->controller,'myMethod', $response); + $this->middleWare->afterController($this->controller, 'myMethod', $response); $output = 'myoutput'; $result = $this->middleWare->beforeOutput($this->controller, 'myMethod', $output); @@ -132,7 +132,7 @@ class CompressionMiddlewareTest extends \Test\TestCase { $response->method('getStatus') ->willReturn(Http::STATUS_OK); $this->middleWare->beforeController($this->controller, 'myMethod'); - $this->middleWare->afterController($this->controller,'myMethod', $response); + $this->middleWare->afterController($this->controller, 'myMethod', $response); $output = 'myoutput'; $result = $this->middleWare->beforeOutput($this->controller, 'myMethod', $output); @@ -153,7 +153,7 @@ class CompressionMiddlewareTest extends \Test\TestCase { ->willReturn(Http::STATUS_NOT_FOUND); $this->middleWare->beforeController($this->controller, 'myMethod'); - $this->middleWare->afterController($this->controller,'myMethod', $response); + $this->middleWare->afterController($this->controller, 'myMethod', $response); $output = 'myoutput'; $result = $this->middleWare->beforeOutput($this->controller, 'myMethod', $output); diff --git a/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php index 786bac6d856..cc04992ae18 100644 --- a/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php @@ -135,7 +135,7 @@ class BruteForceMiddlewareTest extends TestCase { /** @var Controller|\PHPUnit\Framework\MockObject\MockObject $controller */ $controller = $this->createMock(Controller::class); - $this->bruteForceMiddleware->afterController($controller, 'testMethod' ,$response); + $this->bruteForceMiddleware->afterController($controller, 'testMethod', $response); } public function testAfterControllerWithAnnotationAndNotThrottledRequest() { @@ -165,7 +165,7 @@ class BruteForceMiddlewareTest extends TestCase { /** @var Controller|\PHPUnit\Framework\MockObject\MockObject $controller */ $controller = $this->createMock(Controller::class); - $this->bruteForceMiddleware->afterController($controller, 'testMethod' ,$response); + $this->bruteForceMiddleware->afterController($controller, 'testMethod', $response); } public function testAfterControllerWithoutAnnotation() { @@ -188,6 +188,6 @@ class BruteForceMiddlewareTest extends TestCase { $controller = $this->createMock(Controller::class); /** @var Response|\PHPUnit\Framework\MockObject\MockObject $response */ $response = $this->createMock(Response::class); - $this->bruteForceMiddleware->afterController($controller, 'testMethod' ,$response); + $this->bruteForceMiddleware->afterController($controller, 'testMethod', $response); } } diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php index bf84a631f74..1af2b2b9f1c 100644 --- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php @@ -446,7 +446,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { * @SubAdminRequired */ public function testIsNotSubAdminCheck() { - $this->reader->reflect(__CLASS__,__FUNCTION__); + $this->reader->reflect(__CLASS__, __FUNCTION__); $sec = $this->getMiddleware(true, false, false); $this->expectException(SecurityException::class); @@ -458,7 +458,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { * @SubAdminRequired */ public function testIsSubAdminCheck() { - $this->reader->reflect(__CLASS__,__FUNCTION__); + $this->reader->reflect(__CLASS__, __FUNCTION__); $sec = $this->getMiddleware(true, false, true); $sec->beforeController($this, __METHOD__); @@ -470,7 +470,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { * @SubAdminRequired */ public function testIsSubAdminAndAdminCheck() { - $this->reader->reflect(__CLASS__,__FUNCTION__); + $this->reader->reflect(__CLASS__, __FUNCTION__); $sec = $this->getMiddleware(true, true, true); $sec->beforeController($this, __METHOD__); @@ -523,7 +523,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { new NotLoggedInException() ); $expected = new RedirectResponse('http://localhost/nextcloud/index.php/login?redirect_url=nextcloud/index.php/apps/specialapp'); - $this->assertEquals($expected , $response); + $this->assertEquals($expected, $response); } public function testAfterExceptionRedirectsToWebRootAfterStrictCookieFail() { @@ -546,7 +546,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { ); $expected = new RedirectResponse(\OC::$WEBROOT . '/'); - $this->assertEquals($expected , $response); + $this->assertEquals($expected, $response); } @@ -594,7 +594,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { ); $expected = new TemplateResponse('core', '403', ['message' => $exception->getMessage()], 'guest'); $expected->setStatus($exception->getCode()); - $this->assertEquals($expected , $response); + $this->assertEquals($expected, $response); } public function testAfterAjaxExceptionReturnsJSONError() { @@ -624,7 +624,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { */ public function testRestrictedAppLoggedInPublicPage() { $middleware = $this->getMiddleware(true, false, false); - $this->reader->reflect(__CLASS__,__FUNCTION__); + $this->reader->reflect(__CLASS__, __FUNCTION__); $this->appManager->method('getAppPath') ->with('files') @@ -645,7 +645,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { */ public function testRestrictedAppNotLoggedInPublicPage() { $middleware = $this->getMiddleware(false, false, false); - $this->reader->reflect(__CLASS__,__FUNCTION__); + $this->reader->reflect(__CLASS__, __FUNCTION__); $this->appManager->method('getAppPath') ->with('files') @@ -665,7 +665,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { */ public function testRestrictedAppLoggedIn() { $middleware = $this->getMiddleware(true, false, false, false); - $this->reader->reflect(__CLASS__,__FUNCTION__); + $this->reader->reflect(__CLASS__, __FUNCTION__); $this->appManager->method('getAppPath') ->with('files') diff --git a/tests/lib/Avatar/UserAvatarTest.php b/tests/lib/Avatar/UserAvatarTest.php index 7833e3a4953..dd5f25163f2 100644 --- a/tests/lib/Avatar/UserAvatarTest.php +++ b/tests/lib/Avatar/UserAvatarTest.php @@ -258,8 +258,8 @@ class UserAvatarTest extends \Test\TestCase { } public function testMixPalette() { - $colorFrom = new \OC\Color(0,0,0); - $colorTo = new \OC\Color(6,12,18); + $colorFrom = new \OC\Color(0, 0, 0); + $colorTo = new \OC\Color(6, 12, 18); $steps = 6; $palette = $this->invokePrivate($this->avatar, 'mixPalette', [$steps, $colorFrom, $colorTo]); foreach ($palette as $j => $color) { @@ -268,7 +268,7 @@ class UserAvatarTest extends \Test\TestCase { $incG = $colorTo->g / $steps * $j; $incB = $colorTo->b / $steps * $j; // ensure everything is equal - $this->assertEquals($color, new \OC\Color($incR, $incG,$incB)); + $this->assertEquals($color, new \OC\Color($incR, $incG, $incB)); } $hashToInt = $this->invokePrivate($this->avatar, 'hashToInt', ['abcdef', 18]); $this->assertTrue(gettype($hashToInt) === 'integer'); diff --git a/tests/lib/Cache/FileCacheTest.php b/tests/lib/Cache/FileCacheTest.php index c9eafeca280..5791e28eb0c 100644 --- a/tests/lib/Cache/FileCacheTest.php +++ b/tests/lib/Cache/FileCacheTest.php @@ -63,7 +63,7 @@ class FileCacheTest extends TestCache { $this->storage = \OC\Files\Filesystem::getStorage('/'); \OC\Files\Filesystem::clearMounts(); $storage = new \OC\Files\Storage\Temporary([]); - \OC\Files\Filesystem::mount($storage,[],'/'); + \OC\Files\Filesystem::mount($storage, [], '/'); $datadir = str_replace('local::', '', $storage->getId()); $config = \OC::$server->getConfig(); $this->datadir = $config->getSystemValue('cachedirectory', \OC::$SERVERROOT.'/data/cache'); diff --git a/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php b/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php index 6a568d7e01b..4a168cb0143 100644 --- a/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php +++ b/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php @@ -122,8 +122,7 @@ class ExpressionBuilderDBTest extends TestCase { $query->createFunction( '(' . $query->expr()->castColumn('configvalue', IQueryBuilder::PARAM_INT) . ' + 1)' - ) - , IQueryBuilder::PARAM_STR + ), IQueryBuilder::PARAM_STR ) ) ->where($query->expr()->eq('appid', $query->createNamedParameter($appId))) diff --git a/tests/lib/DateTimeFormatterTest.php b/tests/lib/DateTimeFormatterTest.php index 78ef0ef3ace..2ca880ec132 100644 --- a/tests/lib/DateTimeFormatterTest.php +++ b/tests/lib/DateTimeFormatterTest.php @@ -100,7 +100,7 @@ class DateTimeFormatterTest extends TestCase { ['in 2 years', $time, $this->getTimestampAgo($time, 0, 0, 0, 0, 2)], // Test with compare timestamp - ['today', $this->getTimestampAgo($time, 0, 0, 0, 0, 1), $this->getTimestampAgo($time, 0, 0, 0, 0, 1)], + ['today', $this->getTimestampAgo($time, 0, 0, 0, 0, 1), $this->getTimestampAgo($time, 0, 0, 0, 0, 1)], ['yesterday', $this->getTimestampAgo($time, 30, 15, 3, 1, 1), $this->getTimestampAgo($time, 0, 0, 0, 0, 1)], ['4 days ago', $this->getTimestampAgo($time, 30, 15, 3, 4, 1), $this->getTimestampAgo($time, 0, 0, 0, 0, 1)], ['5 months ago', $this->getTimestampAgo($time, 30, 15, 3, 155, 1), $this->getTimestampAgo($time, 0, 0, 0, 0, 1)], diff --git a/tests/lib/Encryption/Keys/StorageTest.php b/tests/lib/Encryption/Keys/StorageTest.php index fdfa08d87c4..30680646f73 100644 --- a/tests/lib/Encryption/Keys/StorageTest.php +++ b/tests/lib/Encryption/Keys/StorageTest.php @@ -452,7 +452,7 @@ class StorageTest extends TestCase { /** * @dataProvider dataProviderCopyRename */ - public function testCopyKeys($source, $target, $systemWideMountSource, $systemWideMountTarget , $expectedSource, $expectedTarget) { + public function testCopyKeys($source, $target, $systemWideMountSource, $systemWideMountTarget, $expectedSource, $expectedTarget) { $this->view->expects($this->any()) ->method('file_exists') ->willReturn(true); diff --git a/tests/lib/Files/Cache/CacheTest.php b/tests/lib/Files/Cache/CacheTest.php index 744a779288d..7f8e1af1577 100644 --- a/tests/lib/Files/Cache/CacheTest.php +++ b/tests/lib/Files/Cache/CacheTest.php @@ -399,23 +399,17 @@ class CacheTest extends \Test\TestCase { $user = $this->createMock(IUser::class); $this->assertCount(1, $this->cache->searchQuery(new SearchQuery( - new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'name', 'foo') - , 10, 0, [], $user))); + new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'name', 'foo'), 10, 0, [], $user))); $this->assertCount(2, $this->cache->searchQuery(new SearchQuery( - new SearchComparison(ISearchComparison::COMPARE_LIKE, 'name', 'foo%') - , 10, 0, [], $user))); + new SearchComparison(ISearchComparison::COMPARE_LIKE, 'name', 'foo%'), 10, 0, [], $user))); $this->assertCount(2, $this->cache->searchQuery(new SearchQuery( - new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'mimetype', 'foo/file') - , 10, 0, [], $user))); + new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'mimetype', 'foo/file'), 10, 0, [], $user))); $this->assertCount(3, $this->cache->searchQuery(new SearchQuery( - new SearchComparison(ISearchComparison::COMPARE_LIKE, 'mimetype', 'foo/%') - , 10, 0, [], $user))); + new SearchComparison(ISearchComparison::COMPARE_LIKE, 'mimetype', 'foo/%'), 10, 0, [], $user))); $this->assertCount(1, $this->cache->searchQuery(new SearchQuery( - new SearchComparison(ISearchComparison::COMPARE_GREATER_THAN, 'size', 100) - , 10, 0, [], $user))); + new SearchComparison(ISearchComparison::COMPARE_GREATER_THAN, 'size', 100), 10, 0, [], $user))); $this->assertCount(2, $this->cache->searchQuery(new SearchQuery( - new SearchComparison(ISearchComparison::COMPARE_GREATER_THAN_EQUAL, 'size', 100) - , 10, 0, [], $user))); + new SearchComparison(ISearchComparison::COMPARE_GREATER_THAN_EQUAL, 'size', 100), 10, 0, [], $user))); } public function movePathProvider() { diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php index 85a68be3daf..5ebfd48d1a6 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php @@ -89,7 +89,7 @@ class ObjectStoreStorageTest extends Storage { */ public function testMove($source, $target) { $this->initSourceAndTarget($source); - $sourceId = $this->instance->getCache()->getId(ltrim('/',$source)); + $sourceId = $this->instance->getCache()->getId(ltrim('/', $source)); $this->assertNotEquals(-1, $sourceId); $this->instance->rename($source, $target); @@ -98,7 +98,7 @@ class ObjectStoreStorageTest extends Storage { $this->assertFalse($this->instance->file_exists($source), $source.' still exists'); $this->assertSameAsLorem($target); - $targetId = $this->instance->getCache()->getId(ltrim('/',$target)); + $targetId = $this->instance->getCache()->getId(ltrim('/', $target)); $this->assertSame($sourceId, $targetId, 'fileid must be stable on move or shares will break'); } diff --git a/tests/lib/L10N/L10nTest.php b/tests/lib/L10N/L10nTest.php index 3fb22b3f66e..9f6337ba804 100644 --- a/tests/lib/L10N/L10nTest.php +++ b/tests/lib/L10N/L10nTest.php @@ -45,7 +45,7 @@ class L10nTest extends TestCase { public function testRussianPluralTranslations() { $transFile = \OC::$SERVERROOT.'/tests/data/l10n/ru.json'; - $l = new L10N($this->getFactory(), 'test', 'ru', 'ru_UA',[$transFile]); + $l = new L10N($this->getFactory(), 'test', 'ru', 'ru_UA', [$transFile]); $this->assertEquals('1 файл', (string)$l->n('%n file', '%n files', 1)); $this->assertEquals('2 файла', (string)$l->n('%n file', '%n files', 2)); diff --git a/tests/lib/Mail/MessageTest.php b/tests/lib/Mail/MessageTest.php index b0641ae332f..f30630824fc 100644 --- a/tests/lib/Mail/MessageTest.php +++ b/tests/lib/Mail/MessageTest.php @@ -113,7 +113,7 @@ class MessageTest extends TestCase { /** * @dataProvider getMailAddressProvider */ - public function testGetTo($swiftresult,$return) { + public function testGetTo($swiftresult, $return) { $this->swiftMessage ->expects($this->once()) ->method('getTo') @@ -133,7 +133,7 @@ class MessageTest extends TestCase { /** * @dataProvider getMailAddressProvider */ - public function testGetCc($swiftresult,$return) { + public function testGetCc($swiftresult, $return) { $this->swiftMessage ->expects($this->once()) ->method('getCc') @@ -153,7 +153,7 @@ class MessageTest extends TestCase { /** * @dataProvider getMailAddressProvider */ - public function testGetBcc($swiftresult,$return) { + public function testGetBcc($swiftresult, $return) { $this->swiftMessage ->expects($this->once()) ->method('getBcc') diff --git a/tests/lib/Security/HasherTest.php b/tests/lib/Security/HasherTest.php index 5836703504e..a81f98533ce 100644 --- a/tests/lib/Security/HasherTest.php +++ b/tests/lib/Security/HasherTest.php @@ -197,7 +197,7 @@ class HasherTest extends \Test\TestCase { } - $this->assertTrue($this->hasher->verify($message, $blowfish,$newHash)); + $this->assertTrue($this->hasher->verify($message, $blowfish, $newHash)); $this->assertTrue($this->hasher->verify($message, $argon2)); $relativePath = self::invokePrivate($this->hasher, 'splitHash', [$newHash]); diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php index 40626bdb571..03e1bdb4346 100644 --- a/tests/lib/Share20/DefaultShareProviderTest.php +++ b/tests/lib/Share20/DefaultShareProviderTest.php @@ -951,7 +951,7 @@ class DefaultShareProviderTest extends \Test\TestCase { $this->rootFolder->method('getUserFolder')->with('shareOwner')->willReturnSelf(); $this->rootFolder->method('getById')->with($fileId)->willReturn([$file]); - $share = $this->provider->getSharedWith('sharedWith', IShare::TYPE_USER, null, 1 , 0); + $share = $this->provider->getSharedWith('sharedWith', IShare::TYPE_USER, null, 1, 0); $this->assertCount(1, $share); $share = $share[0]; @@ -1023,7 +1023,7 @@ class DefaultShareProviderTest extends \Test\TestCase { $this->rootFolder->method('getUserFolder')->with('shareOwner')->willReturnSelf(); $this->rootFolder->method('getById')->with($fileId)->willReturn([$file]); - $share = $this->provider->getSharedWith('sharedWith', IShare::TYPE_GROUP, null, 20 , 1); + $share = $this->provider->getSharedWith('sharedWith', IShare::TYPE_GROUP, null, 20, 1); $this->assertCount(1, $share); $share = $share[0]; @@ -1267,7 +1267,7 @@ class DefaultShareProviderTest extends \Test\TestCase { ]); $this->groupManager->method('getUserGroupIds')->with($user)->willReturn($groups); - $share = $this->provider->getSharedWith('sharedWith', $shareType, null, 1 , 0); + $share = $this->provider->getSharedWith('sharedWith', $shareType, null, 1, 0); $this->assertCount(0, $share); } diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php index f1a53200f5f..93f33fe30b9 100644 --- a/tests/lib/Share20/ManagerTest.php +++ b/tests/lib/Share20/ManagerTest.php @@ -481,7 +481,7 @@ class ManagerTest extends \Test\TestCase { ->getMock(); $date = new \DateTime(); - $date->setTime(0,0,0); + $date->setTime(0, 0, 0); $share = $this->manager->newShare(); $share->setExpirationDate($date) @@ -594,30 +594,30 @@ class ManagerTest extends \Test\TestCase { ->willReturn($storage); $data = [ - [$this->createShare(null, IShare::TYPE_USER, $file, null, $user0, $user0, 31, null, null), 'SharedWith is not a valid user', true], - [$this->createShare(null, IShare::TYPE_USER, $file, $group0, $user0, $user0, 31, null, null), 'SharedWith is not a valid user', true], - [$this->createShare(null, IShare::TYPE_USER, $file, 'foo@bar.com', $user0, $user0, 31, null, null), 'SharedWith is not a valid user', true], + [$this->createShare(null, IShare::TYPE_USER, $file, null, $user0, $user0, 31, null, null), 'SharedWith is not a valid user', true], + [$this->createShare(null, IShare::TYPE_USER, $file, $group0, $user0, $user0, 31, null, null), 'SharedWith is not a valid user', true], + [$this->createShare(null, IShare::TYPE_USER, $file, 'foo@bar.com', $user0, $user0, 31, null, null), 'SharedWith is not a valid user', true], [$this->createShare(null, IShare::TYPE_GROUP, $file, null, $user0, $user0, 31, null, null), 'SharedWith is not a valid group', true], [$this->createShare(null, IShare::TYPE_GROUP, $file, $user2, $user0, $user0, 31, null, null), 'SharedWith is not a valid group', true], [$this->createShare(null, IShare::TYPE_GROUP, $file, 'foo@bar.com', $user0, $user0, 31, null, null), 'SharedWith is not a valid group', true], - [$this->createShare(null, IShare::TYPE_LINK, $file, $user2, $user0, $user0, 31, null, null), 'SharedWith should be empty', true], - [$this->createShare(null, IShare::TYPE_LINK, $file, $group0, $user0, $user0, 31, null, null), 'SharedWith should be empty', true], - [$this->createShare(null, IShare::TYPE_LINK, $file, 'foo@bar.com', $user0, $user0, 31, null, null), 'SharedWith should be empty', true], + [$this->createShare(null, IShare::TYPE_LINK, $file, $user2, $user0, $user0, 31, null, null), 'SharedWith should be empty', true], + [$this->createShare(null, IShare::TYPE_LINK, $file, $group0, $user0, $user0, 31, null, null), 'SharedWith should be empty', true], + [$this->createShare(null, IShare::TYPE_LINK, $file, 'foo@bar.com', $user0, $user0, 31, null, null), 'SharedWith should be empty', true], [$this->createShare(null, -1, $file, null, $user0, $user0, 31, null, null), 'unknown share type', true], - [$this->createShare(null, IShare::TYPE_USER, $file, $user2, null, $user0, 31, null, null), 'SharedBy should be set', true], + [$this->createShare(null, IShare::TYPE_USER, $file, $user2, null, $user0, 31, null, null), 'SharedBy should be set', true], [$this->createShare(null, IShare::TYPE_GROUP, $file, $group0, null, $user0, 31, null, null), 'SharedBy should be set', true], - [$this->createShare(null, IShare::TYPE_LINK, $file, null, null, $user0, 31, null, null), 'SharedBy should be set', true], + [$this->createShare(null, IShare::TYPE_LINK, $file, null, null, $user0, 31, null, null), 'SharedBy should be set', true], - [$this->createShare(null, IShare::TYPE_USER, $file, $user0, $user0, $user0, 31, null, null), 'Cannot share with yourself', true], + [$this->createShare(null, IShare::TYPE_USER, $file, $user0, $user0, $user0, 31, null, null), 'Cannot share with yourself', true], - [$this->createShare(null, IShare::TYPE_USER, null, $user2, $user0, $user0, 31, null, null), 'Path should be set', true], + [$this->createShare(null, IShare::TYPE_USER, null, $user2, $user0, $user0, 31, null, null), 'Path should be set', true], [$this->createShare(null, IShare::TYPE_GROUP, null, $group0, $user0, $user0, 31, null, null), 'Path should be set', true], - [$this->createShare(null, IShare::TYPE_LINK, null, null, $user0, $user0, 31, null, null), 'Path should be set', true], + [$this->createShare(null, IShare::TYPE_LINK, null, null, $user0, $user0, 31, null, null), 'Path should be set', true], - [$this->createShare(null, IShare::TYPE_USER, $node, $user2, $user0, $user0, 31, null, null), 'Path should be either a file or a folder', true], + [$this->createShare(null, IShare::TYPE_USER, $node, $user2, $user0, $user0, 31, null, null), 'Path should be either a file or a folder', true], [$this->createShare(null, IShare::TYPE_GROUP, $node, $group0, $user0, $user0, 31, null, null), 'Path should be either a file or a folder', true], - [$this->createShare(null, IShare::TYPE_LINK, $node, null, $user0, $user0, 31, null, null), 'Path should be either a file or a folder', true], + [$this->createShare(null, IShare::TYPE_LINK, $node, null, $user0, $user0, 31, null, null), 'Path should be either a file or a folder', true], ]; $nonShareAble = $this->createMock(Folder::class); @@ -629,9 +629,9 @@ class ManagerTest extends \Test\TestCase { $nonShareAble->method('getStorage') ->willReturn($storage); - $data[] = [$this->createShare(null, IShare::TYPE_USER, $nonShareAble, $user2, $user0, $user0, 31, null, null), 'You are not allowed to share name', true]; + $data[] = [$this->createShare(null, IShare::TYPE_USER, $nonShareAble, $user2, $user0, $user0, 31, null, null), 'You are not allowed to share name', true]; $data[] = [$this->createShare(null, IShare::TYPE_GROUP, $nonShareAble, $group0, $user0, $user0, 31, null, null), 'You are not allowed to share name', true]; - $data[] = [$this->createShare(null, IShare::TYPE_LINK, $nonShareAble, null, $user0, $user0, 31, null, null), 'You are not allowed to share name', true]; + $data[] = [$this->createShare(null, IShare::TYPE_LINK, $nonShareAble, null, $user0, $user0, 31, null, null), 'You are not allowed to share name', true]; $limitedPermssions = $this->createMock(File::class); $limitedPermssions->method('isShareable')->willReturn(true); @@ -644,17 +644,17 @@ class ManagerTest extends \Test\TestCase { $limitedPermssions->method('getStorage') ->willReturn($storage); - $data[] = [$this->createShare(null, IShare::TYPE_USER, $limitedPermssions, $user2, $user0, $user0, null, null, null), 'A share requires permissions', true]; + $data[] = [$this->createShare(null, IShare::TYPE_USER, $limitedPermssions, $user2, $user0, $user0, null, null, null), 'A share requires permissions', true]; $data[] = [$this->createShare(null, IShare::TYPE_GROUP, $limitedPermssions, $group0, $user0, $user0, null, null, null), 'A share requires permissions', true]; - $data[] = [$this->createShare(null, IShare::TYPE_LINK, $limitedPermssions, null, $user0, $user0, null, null, null), 'A share requires permissions', true]; + $data[] = [$this->createShare(null, IShare::TYPE_LINK, $limitedPermssions, null, $user0, $user0, null, null, null), 'A share requires permissions', true]; $mount = $this->createMock(MoveableMount::class); $limitedPermssions->method('getMountPoint')->willReturn($mount); - $data[] = [$this->createShare(null, IShare::TYPE_USER, $limitedPermssions, $user2, $user0, $user0, 31, null, null), 'Cannot increase permissions of path', true]; + $data[] = [$this->createShare(null, IShare::TYPE_USER, $limitedPermssions, $user2, $user0, $user0, 31, null, null), 'Cannot increase permissions of path', true]; $data[] = [$this->createShare(null, IShare::TYPE_GROUP, $limitedPermssions, $group0, $user0, $user0, 17, null, null), 'Cannot increase permissions of path', true]; - $data[] = [$this->createShare(null, IShare::TYPE_LINK, $limitedPermssions, null, $user0, $user0, 3, null, null), 'Cannot increase permissions of path', true]; + $data[] = [$this->createShare(null, IShare::TYPE_LINK, $limitedPermssions, null, $user0, $user0, 3, null, null), 'Cannot increase permissions of path', true]; $nonMoveableMountPermssions = $this->createMock(Folder::class); $nonMoveableMountPermssions->method('isShareable')->willReturn(true); @@ -667,7 +667,7 @@ class ManagerTest extends \Test\TestCase { $nonMoveableMountPermssions->method('getStorage') ->willReturn($storage); - $data[] = [$this->createShare(null, IShare::TYPE_USER, $nonMoveableMountPermssions, $user2, $user0, $user0, 11, null, null), 'Cannot increase permissions of path', false]; + $data[] = [$this->createShare(null, IShare::TYPE_USER, $nonMoveableMountPermssions, $user2, $user0, $user0, 11, null, null), 'Cannot increase permissions of path', false]; $data[] = [$this->createShare(null, IShare::TYPE_GROUP, $nonMoveableMountPermssions, $group0, $user0, $user0, 11, null, null), 'Cannot increase permissions of path', false]; $rootFolder = $this->createMock(Folder::class); @@ -675,9 +675,9 @@ class ManagerTest extends \Test\TestCase { $rootFolder->method('getPermissions')->willReturn(\OCP\Constants::PERMISSION_ALL); $rootFolder->method('getId')->willReturn(42); - $data[] = [$this->createShare(null, IShare::TYPE_USER, $rootFolder, $user2, $user0, $user0, 30, null, null), 'You cannot share your root folder', true]; + $data[] = [$this->createShare(null, IShare::TYPE_USER, $rootFolder, $user2, $user0, $user0, 30, null, null), 'You cannot share your root folder', true]; $data[] = [$this->createShare(null, IShare::TYPE_GROUP, $rootFolder, $group0, $user0, $user0, 2, null, null), 'You cannot share your root folder', true]; - $data[] = [$this->createShare(null, IShare::TYPE_LINK, $rootFolder, null, $user0, $user0, 16, null, null), 'You cannot share your root folder', true]; + $data[] = [$this->createShare(null, IShare::TYPE_LINK, $rootFolder, null, $user0, $user0, 16, null, null), 'You cannot share your root folder', true]; $allPermssions = $this->createMock(Folder::class); $allPermssions->method('isShareable')->willReturn(true); @@ -688,12 +688,12 @@ class ManagerTest extends \Test\TestCase { $allPermssions->method('getStorage') ->willReturn($storage); - $data[] = [$this->createShare(null, IShare::TYPE_USER, $allPermssions, $user2, $user0, $user0, 30, null, null), 'Shares need at least read permissions', true]; + $data[] = [$this->createShare(null, IShare::TYPE_USER, $allPermssions, $user2, $user0, $user0, 30, null, null), 'Shares need at least read permissions', true]; $data[] = [$this->createShare(null, IShare::TYPE_GROUP, $allPermssions, $group0, $user0, $user0, 2, null, null), 'Shares need at least read permissions', true]; - $data[] = [$this->createShare(null, IShare::TYPE_USER, $allPermssions, $user2, $user0, $user0, 31, null, null), null, false]; + $data[] = [$this->createShare(null, IShare::TYPE_USER, $allPermssions, $user2, $user0, $user0, 31, null, null), null, false]; $data[] = [$this->createShare(null, IShare::TYPE_GROUP, $allPermssions, $group0, $user0, $user0, 3, null, null), null, false]; - $data[] = [$this->createShare(null, IShare::TYPE_LINK, $allPermssions, null, $user0, $user0, 17, null, null), null, false]; + $data[] = [$this->createShare(null, IShare::TYPE_LINK, $allPermssions, null, $user0, $user0, 17, null, null), null, false]; $remoteStorage = $this->createMock(Storage\IStorage::class); @@ -889,7 +889,7 @@ class ManagerTest extends \Test\TestCase { } $expected = new \DateTime(); - $expected->setTime(0,0,0); + $expected->setTime(0, 0, 0); $expected->add(new \DateInterval('P3D')); self::invokePrivate($this->manager, 'validateExpirationDateInternal', [$share]); @@ -924,7 +924,7 @@ class ManagerTest extends \Test\TestCase { } $expected = new \DateTime(); - $expected->setTime(0,0,0); + $expected->setTime(0, 0, 0); $expected->add(new \DateInterval('P1D')); self::invokePrivate($this->manager, 'validateExpirationDateInternal', [$share]); @@ -972,10 +972,10 @@ class ManagerTest extends \Test\TestCase { public function testValidateExpirationDateInternalEnforceValid($shareType) { $future = new \DateTime(); $future->add(new \DateInterval('P2D')); - $future->setTime(1,2,3); + $future->setTime(1, 2, 3); $expected = clone $future; - $expected->setTime(0,0,0); + $expected->setTime(0, 0, 0); $share = $this->manager->newShare(); $share->setShareType($shareType); @@ -1014,10 +1014,10 @@ class ManagerTest extends \Test\TestCase { public function testValidateExpirationDateInternalNoDefault($shareType) { $date = new \DateTime(); $date->add(new \DateInterval('P5D')); - $date->setTime(1,2,3); + $date->setTime(1, 2, 3); $expected = clone $date; - $expected->setTime(0,0,0); + $expected->setTime(0, 0, 0); $share = $this->manager->newShare(); $share->setShareType($shareType); @@ -1062,7 +1062,7 @@ class ManagerTest extends \Test\TestCase { $expected = new \DateTime(); $expected->add(new \DateInterval('P3D')); - $expected->setTime(0,0,0); + $expected->setTime(0, 0, 0); if ($shareType === IShare::TYPE_USER) { $this->config->method('getAppValue') @@ -1097,10 +1097,10 @@ class ManagerTest extends \Test\TestCase { public function testValidateExpirationDateInternalDefault($shareType) { $future = new \DateTime(); $future->add(new \DateInterval('P5D')); - $future->setTime(1,2,3); + $future->setTime(1, 2, 3); $expected = clone $future; - $expected->setTime(0,0,0); + $expected->setTime(0, 0, 0); $share = $this->manager->newShare(); $share->setShareType($shareType); @@ -1139,7 +1139,7 @@ class ManagerTest extends \Test\TestCase { public function testValidateExpirationDateInternalHookModification($shareType) { $nextWeek = new \DateTime(); $nextWeek->add(new \DateInterval('P7D')); - $nextWeek->setTime(0,0,0); + $nextWeek->setTime(0, 0, 0); $save = clone $nextWeek; @@ -1168,7 +1168,7 @@ class ManagerTest extends \Test\TestCase { $nextWeek = new \DateTime(); $nextWeek->add(new \DateInterval('P7D')); - $nextWeek->setTime(0,0,0); + $nextWeek->setTime(0, 0, 0); $share = $this->manager->newShare(); $share->setShareType($shareType); @@ -1267,7 +1267,7 @@ class ManagerTest extends \Test\TestCase { ]); $expected = new \DateTime(); - $expected->setTime(0,0,0); + $expected->setTime(0, 0, 0); $expected->add(new \DateInterval('P3D')); self::invokePrivate($this->manager, 'validateExpirationDateLink', [$share]); @@ -1288,7 +1288,7 @@ class ManagerTest extends \Test\TestCase { ]); $expected = new \DateTime(); - $expected->setTime(0,0,0); + $expected->setTime(0, 0, 0); $expected->add(new \DateInterval('P1D')); self::invokePrivate($this->manager, 'validateExpirationDateLink', [$share]); @@ -1320,10 +1320,10 @@ class ManagerTest extends \Test\TestCase { public function testValidateExpirationDateEnforceValid() { $future = new \DateTime(); $future->add(new \DateInterval('P2D')); - $future->setTime(1,2,3); + $future->setTime(1, 2, 3); $expected = clone $future; - $expected->setTime(0,0,0); + $expected->setTime(0, 0, 0); $share = $this->manager->newShare(); $share->setExpirationDate($future); @@ -1349,10 +1349,10 @@ class ManagerTest extends \Test\TestCase { public function testValidateExpirationDateNoDefault() { $date = new \DateTime(); $date->add(new \DateInterval('P5D')); - $date->setTime(1,2,3); + $date->setTime(1, 2, 3); $expected = clone $date; - $expected->setTime(0,0,0); + $expected->setTime(0, 0, 0); $share = $this->manager->newShare(); $share->setExpirationDate($date); @@ -1388,7 +1388,7 @@ class ManagerTest extends \Test\TestCase { $expected = new \DateTime(); $expected->add(new \DateInterval('P3D')); - $expected->setTime(0,0,0); + $expected->setTime(0, 0, 0); $this->config->method('getAppValue') ->willReturnMap([ @@ -1411,10 +1411,10 @@ class ManagerTest extends \Test\TestCase { public function testValidateExpirationDateDefault() { $future = new \DateTime(); $future->add(new \DateInterval('P5D')); - $future->setTime(1,2,3); + $future->setTime(1, 2, 3); $expected = clone $future; - $expected->setTime(0,0,0); + $expected->setTime(0, 0, 0); $share = $this->manager->newShare(); $share->setExpirationDate($future); @@ -1440,7 +1440,7 @@ class ManagerTest extends \Test\TestCase { public function testValidateExpirationDateHookModification() { $nextWeek = new \DateTime(); $nextWeek->add(new \DateInterval('P7D')); - $nextWeek->setTime(0,0,0); + $nextWeek->setTime(0, 0, 0); $save = clone $nextWeek; @@ -1465,7 +1465,7 @@ class ManagerTest extends \Test\TestCase { $nextWeek = new \DateTime(); $nextWeek->add(new \DateInterval('P7D')); - $nextWeek->setTime(0,0,0); + $nextWeek->setTime(0, 0, 0); $share = $this->manager->newShare(); $share->setExpirationDate($nextWeek); @@ -2623,7 +2623,7 @@ class ManagerTest extends \Test\TestCase { } $today = new \DateTime(); - $today->setTime(0,0,0); + $today->setTime(0, 0, 0); /* * Set the expiration date to today for some shares @@ -2851,7 +2851,7 @@ class ManagerTest extends \Test\TestCase { ->getMock(); $date = new \DateTime(); - $date->setTime(0,0,0); + $date->setTime(0, 0, 0); $share = $this->manager->newShare(); $share->setExpirationDate($date); @@ -2875,7 +2875,7 @@ class ManagerTest extends \Test\TestCase { ->willReturn('yes'); $date = new \DateTime(); - $date->setTime(0,0,0); + $date->setTime(0, 0, 0); $date->add(new \DateInterval('P2D')); $share = $this->manager->newShare(); $share->setExpirationDate($date); @@ -3195,7 +3195,7 @@ class ManagerTest extends \Test\TestCase { ->setPermissions(15); $tomorrow = new \DateTime(); - $tomorrow->setTime(0,0,0); + $tomorrow->setTime(0, 0, 0); $tomorrow->add(new \DateInterval('P1D')); $file = $this->createMock(File::class); @@ -3276,7 +3276,7 @@ class ManagerTest extends \Test\TestCase { ->setPermissions(15); $tomorrow = new \DateTime(); - $tomorrow->setTime(0,0,0); + $tomorrow->setTime(0, 0, 0); $tomorrow->add(new \DateInterval('P1D')); $file = $this->createMock(File::class); @@ -3342,7 +3342,7 @@ class ManagerTest extends \Test\TestCase { ->setPermissions(\OCP\Constants::PERMISSION_ALL); $tomorrow = new \DateTime(); - $tomorrow->setTime(0,0,0); + $tomorrow->setTime(0, 0, 0); $tomorrow->add(new \DateInterval('P1D')); $file = $this->createMock(File::class); @@ -3424,7 +3424,7 @@ class ManagerTest extends \Test\TestCase { ->setSendPasswordByTalk(false); $tomorrow = new \DateTime(); - $tomorrow->setTime(0,0,0); + $tomorrow->setTime(0, 0, 0); $tomorrow->add(new \DateInterval('P1D')); $file = $this->createMock(File::class); @@ -3507,7 +3507,7 @@ class ManagerTest extends \Test\TestCase { ->setSendPasswordByTalk(false); $tomorrow = new \DateTime(); - $tomorrow->setTime(0,0,0); + $tomorrow->setTime(0, 0, 0); $tomorrow->add(new \DateInterval('P1D')); $file = $this->createMock(File::class); @@ -3598,7 +3598,7 @@ class ManagerTest extends \Test\TestCase { ->setSendPasswordByTalk(false); $tomorrow = new \DateTime(); - $tomorrow->setTime(0,0,0); + $tomorrow->setTime(0, 0, 0); $tomorrow->add(new \DateInterval('P1D')); $file = $this->createMock(File::class); @@ -3671,7 +3671,7 @@ class ManagerTest extends \Test\TestCase { ->setSendPasswordByTalk(false); $tomorrow = new \DateTime(); - $tomorrow->setTime(0,0,0); + $tomorrow->setTime(0, 0, 0); $tomorrow->add(new \DateInterval('P1D')); $file = $this->createMock(File::class); @@ -3744,7 +3744,7 @@ class ManagerTest extends \Test\TestCase { ->setSendPasswordByTalk(false); $tomorrow = new \DateTime(); - $tomorrow->setTime(0,0,0); + $tomorrow->setTime(0, 0, 0); $tomorrow->add(new \DateInterval('P1D')); $file = $this->createMock(File::class); @@ -3817,7 +3817,7 @@ class ManagerTest extends \Test\TestCase { ->setSendPasswordByTalk(false); $tomorrow = new \DateTime(); - $tomorrow->setTime(0,0,0); + $tomorrow->setTime(0, 0, 0); $tomorrow->add(new \DateInterval('P1D')); $file = $this->createMock(File::class); @@ -3891,7 +3891,7 @@ class ManagerTest extends \Test\TestCase { ->setSendPasswordByTalk(true); $tomorrow = new \DateTime(); - $tomorrow->setTime(0,0,0); + $tomorrow->setTime(0, 0, 0); $tomorrow->add(new \DateInterval('P1D')); $file = $this->createMock(File::class); @@ -3965,7 +3965,7 @@ class ManagerTest extends \Test\TestCase { ->setSendPasswordByTalk(true); $tomorrow = new \DateTime(); - $tomorrow->setTime(0,0,0); + $tomorrow->setTime(0, 0, 0); $tomorrow->add(new \DateInterval('P1D')); $file = $this->createMock(File::class); diff --git a/tests/lib/User/UserTest.php b/tests/lib/User/UserTest.php index ad8b01555ea..aa56959d3cb 100644 --- a/tests/lib/User/UserTest.php +++ b/tests/lib/User/UserTest.php @@ -117,7 +117,7 @@ class UserTest extends TestCase { }); $user = new User('foo', $backend, $this->dispatcher); - $this->assertTrue($user->setPassword('bar','')); + $this->assertTrue($user->setPassword('bar', '')); } public function testSetPasswordNotSupported() { @@ -133,7 +133,7 @@ class UserTest extends TestCase { ->willReturn(false); $user = new User('foo', $backend, $this->dispatcher); - $this->assertFalse($user->setPassword('bar','')); + $this->assertFalse($user->setPassword('bar', '')); } public function testChangeAvatarSupportedYes() { @@ -389,12 +389,12 @@ class UserTest extends TestCase { $backend->expects($this->once()) ->method('setDisplayName') - ->with('foo','Foo') + ->with('foo', 'Foo') ->willReturn(true); $user = new User('foo', $backend, $this->dispatcher); $this->assertTrue($user->setDisplayName('Foo')); - $this->assertEquals('Foo',$user->getDisplayName()); + $this->assertEquals('Foo', $user->getDisplayName()); } /** @@ -418,7 +418,7 @@ class UserTest extends TestCase { $user = new User('foo', $backend, $this->dispatcher); $this->assertFalse($user->setDisplayName(' ')); - $this->assertEquals('foo',$user->getDisplayName()); + $this->assertEquals('foo', $user->getDisplayName()); } public function testSetDisplayNameNotSupported() { @@ -436,7 +436,7 @@ class UserTest extends TestCase { $user = new User('foo', $backend, $this->dispatcher); $this->assertFalse($user->setDisplayName('Foo')); - $this->assertEquals('foo',$user->getDisplayName()); + $this->assertEquals('foo', $user->getDisplayName()); } public function testSetPasswordHooks() { @@ -476,7 +476,7 @@ class UserTest extends TestCase { $user = new User('foo', $backend, $this->dispatcher, $emitter); - $user->setPassword('bar',''); + $user->setPassword('bar', ''); $this->assertEquals(2, $hooksCalled); } diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json index 8290b56d103..958c3246abb 100644 --- a/vendor-bin/cs-fixer/composer.json +++ b/vendor-bin/cs-fixer/composer.json @@ -4,8 +4,8 @@ "php": "7.3" } }, - "require": { - "friendsofphp/php-cs-fixer": "2.19.1", - "nextcloud/coding-standard": "^0.5.0" - } + "require": { + "friendsofphp/php-cs-fixer": "^3.4.0", + "nextcloud/coding-standard": "^1.0.0" + } } diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock index e9bddf31ce7..ec188f867c3 100644 --- a/vendor-bin/cs-fixer/composer.lock +++ b/vendor-bin/cs-fixer/composer.lock @@ -4,20 +4,91 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5d1bc6052d45a0cf3a95e1c64db5dd47", + "content-hash": "c66e934287e6aaa6a9b6fdf7ac314a9a", "packages": [ { + "name": "composer/pcre", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2", + "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/1.0.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-12-06T15:17:27+00:00" + }, + { "name": "composer/semver", - "version": "3.2.5", + "version": "3.2.7", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9" + "reference": "deac27056b57e46faf136fae7b449eeaa71661ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/31f3ea725711245195f62e54ffa402d8ef2fdba9", - "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9", + "url": "https://api.github.com/repos/composer/semver/zipball/deac27056b57e46faf136fae7b449eeaa71661ee", + "reference": "deac27056b57e46faf136fae7b449eeaa71661ee", "shasum": "" }, "require": { @@ -69,7 +140,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.5" + "source": "https://github.com/composer/semver/tree/3.2.7" }, "funding": [ { @@ -85,29 +156,31 @@ "type": "tidelift" } ], - "time": "2021-05-24T12:41:47+00:00" + "time": "2022-01-04T09:57:54+00:00" }, { "name": "composer/xdebug-handler", - "version": "2.0.2", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339" + "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/84674dd3a7575ba617f5a76d7e9e29a7d3891339", - "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/0c1a3925ec58a4ec98e992b9c7d171e9e184be0a", + "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a", "shasum": "" }, "require": { + "composer/pcre": "^1", "php": "^5.3.2 || ^7.0 || ^8.0", "psr/log": "^1 || ^2 || ^3" }, "require-dev": { - "phpstan/phpstan": "^0.12.55", - "symfony/phpunit-bridge": "^4.2 || ^5" + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0" }, "type": "library", "autoload": { @@ -133,7 +206,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/2.0.2" + "source": "https://github.com/composer/xdebug-handler/tree/2.0.4" }, "funding": [ { @@ -149,7 +222,7 @@ "type": "tidelift" } ], - "time": "2021-07-31T17:03:58+00:00" + "time": "2022-01-04T17:06:45+00:00" }, { "name": "doctrine/annotations", @@ -305,85 +378,65 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.19.1", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "1fa4af92841f67362c053728989b262fba8eb1ec" + "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1fa4af92841f67362c053728989b262fba8eb1ec", - "reference": "1fa4af92841f67362c053728989b262fba8eb1ec", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/47177af1cfb9dab5d1cc4daf91b7179c2efe7fad", + "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad", "shasum": "" }, "require": { - "composer/semver": "^1.4 || ^2.0 || ^3.0", - "composer/xdebug-handler": "^1.2 || ^2.0", - "doctrine/annotations": "^1.2", + "composer/semver": "^3.2", + "composer/xdebug-handler": "^2.0", + "doctrine/annotations": "^1.12", "ext-json": "*", "ext-tokenizer": "*", - "php": "^5.6 || ^7.0 || ^8.0", - "php-cs-fixer/diff": "^1.3", - "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0", - "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0", - "symfony/filesystem": "^3.0 || ^4.0 || ^5.0", - "symfony/finder": "^3.0 || ^4.0 || ^5.0", - "symfony/options-resolver": "^3.0 || ^4.0 || ^5.0", - "symfony/polyfill-php70": "^1.0", - "symfony/polyfill-php72": "^1.4", - "symfony/process": "^3.0 || ^4.0 || ^5.0", - "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0" + "php": "^7.2.5 || ^8.0", + "php-cs-fixer/diff": "^2.0", + "symfony/console": "^4.4.20 || ^5.1.3 || ^6.0", + "symfony/event-dispatcher": "^4.4.20 || ^5.0 || ^6.0", + "symfony/filesystem": "^4.4.20 || ^5.0 || ^6.0", + "symfony/finder": "^4.4.20 || ^5.0 || ^6.0", + "symfony/options-resolver": "^4.4.20 || ^5.0 || ^6.0", + "symfony/polyfill-mbstring": "^1.23", + "symfony/polyfill-php80": "^1.23", + "symfony/polyfill-php81": "^1.23", + "symfony/process": "^4.4.20 || ^5.0 || ^6.0", + "symfony/stopwatch": "^4.4.20 || ^5.0 || ^6.0" }, "require-dev": { - "justinrainbow/json-schema": "^5.0", - "keradus/cli-executor": "^1.4", - "mikey179/vfsstream": "^1.6", - "php-coveralls/php-coveralls": "^2.4.2", - "php-cs-fixer/accessible-object": "^1.0", + "justinrainbow/json-schema": "^5.2", + "keradus/cli-executor": "^1.5", + "mikey179/vfsstream": "^1.6.8", + "php-coveralls/php-coveralls": "^2.5.2", + "php-cs-fixer/accessible-object": "^1.1", "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", + "phpspec/prophecy": "^1.15", "phpspec/prophecy-phpunit": "^1.1 || ^2.0", - "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.5", + "phpunit/phpunit": "^8.5.21 || ^9.5", "phpunitgoodpractices/polyfill": "^1.5", "phpunitgoodpractices/traits": "^1.9.1", - "sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1", - "symfony/phpunit-bridge": "^5.2.1", - "symfony/yaml": "^3.0 || ^4.0 || ^5.0" + "symfony/phpunit-bridge": "^5.2.4 || ^6.0", + "symfony/yaml": "^4.4.20 || ^5.0 || ^6.0" }, "suggest": { "ext-dom": "For handling output formats in XML", - "ext-mbstring": "For handling non-UTF8 characters.", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.", - "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." + "ext-mbstring": "For handling non-UTF8 characters." }, "bin": [ "php-cs-fixer" ], "type": "application", - "extra": { - "branch-alias": { - "dev-master": "2.19-dev" - } - }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" - }, - "classmap": [ - "tests/Test/AbstractFixerTestCase.php", - "tests/Test/AbstractIntegrationCaseFactory.php", - "tests/Test/AbstractIntegrationTestCase.php", - "tests/Test/Assert/AssertTokensTrait.php", - "tests/Test/IntegrationCase.php", - "tests/Test/IntegrationCaseFactory.php", - "tests/Test/IntegrationCaseFactoryInterface.php", - "tests/Test/InternalIntegrationCaseFactory.php", - "tests/Test/IsIdenticalConstraint.php", - "tests/Test/TokensWithObservedTransformers.php", - "tests/TestCase.php" - ] + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -402,7 +455,7 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.1" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.4.0" }, "funding": [ { @@ -410,25 +463,25 @@ "type": "github" } ], - "time": "2021-08-02T17:52:09+00:00" + "time": "2021-12-11T16:25:08+00:00" }, { "name": "nextcloud/coding-standard", - "version": "v0.5.0", + "version": "v1.0.0", "source": { "type": "git", "url": "https://github.com/nextcloud/coding-standard.git", - "reference": "742ed895ae76c10daf95e08488cfb3f554199f40" + "reference": "f3d1f9375e89c605deb1734f59a9f51ecbe80578" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/742ed895ae76c10daf95e08488cfb3f554199f40", - "reference": "742ed895ae76c10daf95e08488cfb3f554199f40", + "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/f3d1f9375e89c605deb1734f59a9f51ecbe80578", + "reference": "f3d1f9375e89c605deb1734f59a9f51ecbe80578", "shasum": "" }, "require": { - "friendsofphp/php-cs-fixer": "^2.17", - "php": "^7.2|^8.0" + "friendsofphp/php-cs-fixer": "^3.2", + "php": "^7.3|^8.0" }, "type": "library", "autoload": { @@ -449,22 +502,22 @@ "description": "Nextcloud coding standards for the php cs fixer", "support": { "issues": "https://github.com/nextcloud/coding-standard/issues", - "source": "https://github.com/nextcloud/coding-standard/tree/v0.5.0" + "source": "https://github.com/nextcloud/coding-standard/tree/v1.0.0" }, - "time": "2021-01-11T14:15:58+00:00" + "time": "2021-11-10T08:44:10+00:00" }, { "name": "php-cs-fixer/diff", - "version": "v1.3.1", + "version": "v2.0.2", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/diff.git", - "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759" + "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759", - "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759", + "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3", + "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3", "shasum": "" }, "require": { @@ -492,21 +545,18 @@ { "name": "Kore Nordmann", "email": "mail@kore-nordmann.de" - }, - { - "name": "SpacePossum" } ], - "description": "sebastian/diff v2 backport support for PHP5.6", + "description": "sebastian/diff v3 backport support for PHP 5.6+", "homepage": "https://github.com/PHP-CS-Fixer", "keywords": [ "diff" ], "support": { "issues": "https://github.com/PHP-CS-Fixer/diff/issues", - "source": "https://github.com/PHP-CS-Fixer/diff/tree/v1.3.1" + "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2" }, - "time": "2020-10-14T08:39:05+00:00" + "time": "2020-10-14T08:32:19+00:00" }, { "name": "psr/cache", @@ -707,26 +757,26 @@ }, { "name": "symfony/console", - "version": "v5.3.6", + "version": "v5.4.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "51b71afd6d2dc8f5063199357b9880cea8d8bfe2" + "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/51b71afd6d2dc8f5063199357b9880cea8d8bfe2", - "reference": "51b71afd6d2dc8f5063199357b9880cea8d8bfe2", + "url": "https://api.github.com/repos/symfony/console/zipball/a2c6b7ced2eb7799a35375fb9022519282b5405e", + "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.8", + "symfony/polyfill-php73": "^1.9", "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1|^2", - "symfony/string": "^5.1" + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/string": "^5.1|^6.0" }, "conflict": { "psr/log": ">=3", @@ -741,12 +791,12 @@ }, "require-dev": { "psr/log": "^1|^2", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/lock": "^4.4|^5.0", - "symfony/process": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0" + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/lock": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0" }, "suggest": { "psr/log": "For using the console logger", @@ -786,7 +836,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.3.6" + "source": "https://github.com/symfony/console/tree/v5.4.2" }, "funding": [ { @@ -802,20 +852,20 @@ "type": "tidelift" } ], - "time": "2021-07-27T19:10:22+00:00" + "time": "2021-12-20T16:11:12+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" + "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8", + "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8", "shasum": "" }, "require": { @@ -824,7 +874,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -853,7 +903,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0" }, "funding": [ { @@ -869,26 +919,26 @@ "type": "tidelift" } ], - "time": "2021-03-23T23:28:01+00:00" + "time": "2021-07-12T14:48:14+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.3.4", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "f2fd2208157553874560f3645d4594303058c4bd" + "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f2fd2208157553874560f3645d4594303058c4bd", - "reference": "f2fd2208157553874560f3645d4594303058c4bd", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/27d39ae126352b9fa3be5e196ccf4617897be3eb", + "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1", - "symfony/event-dispatcher-contracts": "^2", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/event-dispatcher-contracts": "^2|^3", "symfony/polyfill-php80": "^1.16" }, "conflict": { @@ -900,13 +950,13 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/error-handler": "^4.4|^5.0", - "symfony/expression-language": "^4.4|^5.0", - "symfony/http-foundation": "^4.4|^5.0", - "symfony/service-contracts": "^1.1|^2", - "symfony/stopwatch": "^4.4|^5.0" + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/http-foundation": "^4.4|^5.0|^6.0", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/stopwatch": "^4.4|^5.0|^6.0" }, "suggest": { "symfony/dependency-injection": "", @@ -938,7 +988,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.3.4" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.0" }, "funding": [ { @@ -954,20 +1004,20 @@ "type": "tidelift" } ], - "time": "2021-07-23T15:55:36+00:00" + "time": "2021-11-23T10:19:22+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11" + "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/69fee1ad2332a7cbab3aca13591953da9cdb7a11", - "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/66bea3b09be61613cd3b4043a65a8ec48cfa6d2a", + "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a", "shasum": "" }, "require": { @@ -980,7 +1030,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -1017,7 +1067,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.0" }, "funding": [ { @@ -1033,25 +1083,26 @@ "type": "tidelift" } ], - "time": "2021-03-23T23:28:01+00:00" + "time": "2021-07-12T14:48:14+00:00" }, { "name": "symfony/filesystem", - "version": "v5.3.4", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32" + "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/343f4fe324383ca46792cae728a3b6e2f708fb32", - "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/731f917dc31edcffec2c6a777f3698c33bea8f01", + "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8", "symfony/polyfill-php80": "^1.16" }, "type": "library", @@ -1080,7 +1131,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.3.4" + "source": "https://github.com/symfony/filesystem/tree/v5.4.0" }, "funding": [ { @@ -1096,24 +1147,25 @@ "type": "tidelift" } ], - "time": "2021-07-21T12:40:44+00:00" + "time": "2021-10-28T13:39:27+00:00" }, { "name": "symfony/finder", - "version": "v5.3.4", + "version": "v5.4.2", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "17f50e06018baec41551a71a15731287dbaab186" + "reference": "e77046c252be48c48a40816187ed527703c8f76c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/17f50e06018baec41551a71a15731287dbaab186", - "reference": "17f50e06018baec41551a71a15731287dbaab186", + "url": "https://api.github.com/repos/symfony/finder/zipball/e77046c252be48c48a40816187ed527703c8f76c", + "reference": "e77046c252be48c48a40816187ed527703c8f76c", "shasum": "" }, "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-php80": "^1.16" }, "type": "library", @@ -1142,7 +1194,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.3.4" + "source": "https://github.com/symfony/finder/tree/v5.4.2" }, "funding": [ { @@ -1158,25 +1210,25 @@ "type": "tidelift" } ], - "time": "2021-07-23T15:54:19+00:00" + "time": "2021-12-15T11:06:13+00:00" }, { "name": "symfony/options-resolver", - "version": "v5.3.4", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "a603e5701bd6e305cfc777a8b50bf081ef73105e" + "reference": "b0fb78576487af19c500aaddb269fd36701d4847" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a603e5701bd6e305cfc777a8b50bf081ef73105e", - "reference": "a603e5701bd6e305cfc777a8b50bf081ef73105e", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b0fb78576487af19c500aaddb269fd36701d4847", + "reference": "b0fb78576487af19c500aaddb269fd36701d4847", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-php73": "~1.0", "symfony/polyfill-php80": "^1.16" }, @@ -1211,7 +1263,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.3.4" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.0" }, "funding": [ { @@ -1227,25 +1279,28 @@ "type": "tidelift" } ], - "time": "2021-07-23T15:55:36+00:00" + "time": "2021-11-23T10:19:22+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" + "reference": "30885182c981ab175d4d034db0f6f469898070ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", + "reference": "30885182c981ab175d4d034db0f6f469898070ab", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-ctype": "*" + }, "suggest": { "ext-ctype": "For best performance" }, @@ -1290,7 +1345,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0" }, "funding": [ { @@ -1306,20 +1361,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-10-20T20:35:02+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.23.1", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "16880ba9c5ebe3642d1995ab866db29270b36535" + "reference": "81b86b50cf841a64252b439e738e97f4a34e2783" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535", - "reference": "16880ba9c5ebe3642d1995ab866db29270b36535", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783", + "reference": "81b86b50cf841a64252b439e738e97f4a34e2783", "shasum": "" }, "require": { @@ -1371,7 +1426,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0" }, "funding": [ { @@ -1387,11 +1442,11 @@ "type": "tidelift" } ], - "time": "2021-05-27T12:26:48+00:00" + "time": "2021-11-23T21:10:46+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -1455,7 +1510,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0" }, "funding": [ { @@ -1475,21 +1530,24 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.23.1", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-mbstring": "*" + }, "suggest": { "ext-mbstring": "For best performance" }, @@ -1535,7 +1593,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0" }, "funding": [ { @@ -1551,88 +1609,20 @@ "type": "tidelift" } ], - "time": "2021-05-27T12:26:48+00:00" + "time": "2021-11-30T18:21:41+00:00" }, { - "name": "symfony/polyfill-php70", - "version": "v1.20.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644", - "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "metapackage", - "extra": { - "branch-alias": { - "dev-main": "1.20-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php70/tree/v1.20.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-10-23T14:02:19+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.23.0", + "name": "symfony/polyfill-php73", + "version": "v1.24.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", - "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5", + "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5", "shasum": "" }, "require": { @@ -1650,10 +1640,13 @@ }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" + "Symfony\\Polyfill\\Php73\\": "" }, "files": [ "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" ] }, "notification-url": "https://packagist.org/downloads/", @@ -1670,7 +1663,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -1679,7 +1672,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0" }, "funding": [ { @@ -1695,20 +1688,20 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:17:38+00:00" + "time": "2021-06-05T21:20:04+00:00" }, { - "name": "symfony/polyfill-php73", - "version": "v1.23.0", + "name": "symfony/polyfill-php80", + "version": "v1.24.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9", + "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9", "shasum": "" }, "require": { @@ -1726,7 +1719,7 @@ }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" + "Symfony\\Polyfill\\Php80\\": "" }, "files": [ "bootstrap.php" @@ -1741,6 +1734,10 @@ ], "authors": [ { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { "name": "Nicolas Grekas", "email": "p@tchwork.com" }, @@ -1749,7 +1746,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -1758,7 +1755,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0" }, "funding": [ { @@ -1774,20 +1771,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-09-13T13:58:33+00:00" }, { - "name": "symfony/polyfill-php80", - "version": "v1.23.1", + "name": "symfony/polyfill-php81", + "version": "v1.24.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", + "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", "shasum": "" }, "require": { @@ -1805,7 +1802,7 @@ }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" + "Symfony\\Polyfill\\Php81\\": "" }, "files": [ "bootstrap.php" @@ -1820,10 +1817,6 @@ ], "authors": [ { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, - { "name": "Nicolas Grekas", "email": "p@tchwork.com" }, @@ -1832,7 +1825,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -1841,7 +1834,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0" }, "funding": [ { @@ -1857,20 +1850,20 @@ "type": "tidelift" } ], - "time": "2021-07-28T13:41:28+00:00" + "time": "2021-09-13T13:58:11+00:00" }, { "name": "symfony/process", - "version": "v5.3.4", + "version": "v5.4.2", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "d16634ee55b895bd85ec714dadc58e4428ecf030" + "reference": "2b3ba8722c4aaf3e88011be5e7f48710088fb5e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/d16634ee55b895bd85ec714dadc58e4428ecf030", - "reference": "d16634ee55b895bd85ec714dadc58e4428ecf030", + "url": "https://api.github.com/repos/symfony/process/zipball/2b3ba8722c4aaf3e88011be5e7f48710088fb5e4", + "reference": "2b3ba8722c4aaf3e88011be5e7f48710088fb5e4", "shasum": "" }, "require": { @@ -1903,7 +1896,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.3.4" + "source": "https://github.com/symfony/process/tree/v5.4.2" }, "funding": [ { @@ -1919,25 +1912,29 @@ "type": "tidelift" } ], - "time": "2021-07-23T15:54:19+00:00" + "time": "2021-12-27T21:01:00+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb" + "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", + "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", "shasum": "" }, "require": { "php": ">=7.2.5", - "psr/container": "^1.1" + "psr/container": "^1.1", + "symfony/deprecation-contracts": "^2.1" + }, + "conflict": { + "ext-psr": "<1.1|>=2" }, "suggest": { "symfony/service-implementation": "" @@ -1945,7 +1942,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -1982,7 +1979,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.0" }, "funding": [ { @@ -1998,25 +1995,25 @@ "type": "tidelift" } ], - "time": "2021-04-01T10:43:52+00:00" + "time": "2021-11-04T16:48:04+00:00" }, { "name": "symfony/stopwatch", - "version": "v5.3.4", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "b24c6a92c6db316fee69e38c80591e080e41536c" + "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b24c6a92c6db316fee69e38c80591e080e41536c", - "reference": "b24c6a92c6db316fee69e38c80591e080e41536c", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/208ef96122bfed82a8f3a61458a07113a08bdcfe", + "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/service-contracts": "^1.0|^2" + "symfony/service-contracts": "^1|^2|^3" }, "type": "library", "autoload": { @@ -2044,7 +2041,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.3.4" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.0" }, "funding": [ { @@ -2060,20 +2057,20 @@ "type": "tidelift" } ], - "time": "2021-07-10T08:58:57+00:00" + "time": "2021-11-23T10:19:22+00:00" }, { "name": "symfony/string", - "version": "v5.3.3", + "version": "v5.4.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1" + "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1", - "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1", + "url": "https://api.github.com/repos/symfony/string/zipball/e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d", + "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d", "shasum": "" }, "require": { @@ -2084,11 +2081,14 @@ "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php80": "~1.15" }, + "conflict": { + "symfony/translation-contracts": ">=3.0" + }, "require-dev": { - "symfony/error-handler": "^4.4|^5.0", - "symfony/http-client": "^4.4|^5.0", + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0" + "symfony/var-exporter": "^4.4|^5.0|^6.0" }, "type": "library", "autoload": { @@ -2127,7 +2127,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.3.3" + "source": "https://github.com/symfony/string/tree/v5.4.2" }, "funding": [ { @@ -2143,7 +2143,7 @@ "type": "tidelift" } ], - "time": "2021-06-27T11:44:38+00:00" + "time": "2021-12-16T21:52:00+00:00" } ], "packages-dev": [], @@ -2157,5 +2157,5 @@ "platform-overrides": { "php": "7.3" }, - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" } diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json index f3494d8ac18..e03c935cb99 100644 --- a/vendor-bin/psalm/composer.json +++ b/vendor-bin/psalm/composer.json @@ -1,10 +1,13 @@ { - "config": { - "platform": { - "php": "7.3" - } - }, "require": { - "vimeo/psalm": "4.8.1" + "vimeo/psalm": "^4.18" + }, + "config": { + "platform": { + "php": "7.3" + }, + "allow-plugins": { + "composer/package-versions-deprecated": true + } } } diff --git a/vendor-bin/psalm/composer.lock b/vendor-bin/psalm/composer.lock index 80b901469bc..faa325c5601 100644 --- a/vendor-bin/psalm/composer.lock +++ b/vendor-bin/psalm/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ba2a70c923aa539b8f49b4b9a10686d9", + "content-hash": "c3c578c654631288a179470ece96f0ba", "packages": [ { "name": "amphp/amp", - "version": "v2.6.0", + "version": "v2.6.1", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "caa95edeb1ca1bf7532e9118ede4a3c3126408cc" + "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/caa95edeb1ca1bf7532e9118ede4a3c3126408cc", - "reference": "caa95edeb1ca1bf7532e9118ede4a3c3126408cc", + "url": "https://api.github.com/repos/amphp/amp/zipball/c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae", + "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae", "shasum": "" }, "require": { @@ -85,7 +85,7 @@ "support": { "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.6.0" + "source": "https://github.com/amphp/amp/tree/v2.6.1" }, "funding": [ { @@ -93,7 +93,7 @@ "type": "github" } ], - "time": "2021-07-16T20:06:06+00:00" + "time": "2021-09-23T18:43:08+00:00" }, { "name": "amphp/byte-stream", @@ -174,16 +174,16 @@ }, { "name": "composer/package-versions-deprecated", - "version": "1.11.99.2", + "version": "1.11.99.4", "source": { "type": "git", "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c" + "reference": "b174585d1fe49ceed21928a945138948cb394600" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/c6522afe5540d5fc46675043d3ed5a45a740b27c", - "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b174585d1fe49ceed21928a945138948cb394600", + "reference": "b174585d1fe49ceed21928a945138948cb394600", "shasum": "" }, "require": { @@ -227,7 +227,7 @@ "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", "support": { "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.2" + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.4" }, "funding": [ { @@ -243,20 +243,91 @@ "type": "tidelift" } ], - "time": "2021-05-24T07:46:03+00:00" + "time": "2021-09-13T08:41:34+00:00" + }, + { + "name": "composer/pcre", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2", + "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/1.0.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-12-06T15:17:27+00:00" }, { "name": "composer/semver", - "version": "3.2.5", + "version": "3.2.7", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9" + "reference": "deac27056b57e46faf136fae7b449eeaa71661ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/31f3ea725711245195f62e54ffa402d8ef2fdba9", - "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9", + "url": "https://api.github.com/repos/composer/semver/zipball/deac27056b57e46faf136fae7b449eeaa71661ee", + "reference": "deac27056b57e46faf136fae7b449eeaa71661ee", "shasum": "" }, "require": { @@ -308,7 +379,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.5" + "source": "https://github.com/composer/semver/tree/3.2.7" }, "funding": [ { @@ -324,29 +395,31 @@ "type": "tidelift" } ], - "time": "2021-05-24T12:41:47+00:00" + "time": "2022-01-04T09:57:54+00:00" }, { "name": "composer/xdebug-handler", - "version": "2.0.2", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339" + "reference": "12f1b79476638a5615ed00ea6adbb269cec96fd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/84674dd3a7575ba617f5a76d7e9e29a7d3891339", - "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/12f1b79476638a5615ed00ea6adbb269cec96fd8", + "reference": "12f1b79476638a5615ed00ea6adbb269cec96fd8", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0 || ^8.0", + "composer/pcre": "^1", + "php": "^7.2.5 || ^8.0", "psr/log": "^1 || ^2 || ^3" }, "require-dev": { - "phpstan/phpstan": "^0.12.55", - "symfony/phpunit-bridge": "^4.2 || ^5" + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^6.0" }, "type": "library", "autoload": { @@ -372,7 +445,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/2.0.2" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.1" }, "funding": [ { @@ -388,7 +461,7 @@ "type": "tidelift" } ], - "time": "2021-07-31T17:03:58+00:00" + "time": "2022-01-04T18:29:42+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -581,16 +654,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.12.0", + "version": "v4.13.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "6608f01670c3cc5079e18c1dab1104e002579143" + "reference": "210577fe3cf7badcc5814d99455df46564f3c077" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143", - "reference": "6608f01670c3cc5079e18c1dab1104e002579143", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", + "reference": "210577fe3cf7badcc5814d99455df46564f3c077", "shasum": "" }, "require": { @@ -631,9 +704,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2" }, - "time": "2021-07-21T10:44:31+00:00" + "time": "2021-11-30T19:35:32+00:00" }, { "name": "openlss/lib-array2xml", @@ -743,16 +816,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.2.2", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", "shasum": "" }, "require": { @@ -763,7 +836,8 @@ "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2" + "mockery/mockery": "~1.3.2", + "psalm/phar": "^4.8" }, "type": "library", "extra": { @@ -793,22 +867,22 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" }, - "time": "2020-09-03T19:13:55+00:00" + "time": "2021-10-19T17:43:47+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.4.0", + "version": "1.6.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0" + "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0", - "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706", + "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706", "shasum": "" }, "require": { @@ -816,7 +890,8 @@ "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { - "ext-tokenizer": "*" + "ext-tokenizer": "*", + "psalm/phar": "^4.8" }, "type": "library", "extra": { @@ -842,9 +917,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0" }, - "time": "2020-09-17T18:55:26+00:00" + "time": "2022-01-04T19:58:01+00:00" }, { "name": "psr/container", @@ -1012,26 +1087,26 @@ }, { "name": "symfony/console", - "version": "v5.3.6", + "version": "v5.4.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "51b71afd6d2dc8f5063199357b9880cea8d8bfe2" + "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/51b71afd6d2dc8f5063199357b9880cea8d8bfe2", - "reference": "51b71afd6d2dc8f5063199357b9880cea8d8bfe2", + "url": "https://api.github.com/repos/symfony/console/zipball/a2c6b7ced2eb7799a35375fb9022519282b5405e", + "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.8", + "symfony/polyfill-php73": "^1.9", "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1|^2", - "symfony/string": "^5.1" + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/string": "^5.1|^6.0" }, "conflict": { "psr/log": ">=3", @@ -1046,12 +1121,12 @@ }, "require-dev": { "psr/log": "^1|^2", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/lock": "^4.4|^5.0", - "symfony/process": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0" + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/lock": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0" }, "suggest": { "psr/log": "For using the console logger", @@ -1091,7 +1166,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.3.6" + "source": "https://github.com/symfony/console/tree/v5.4.2" }, "funding": [ { @@ -1107,20 +1182,20 @@ "type": "tidelift" } ], - "time": "2021-07-27T19:10:22+00:00" + "time": "2021-12-20T16:11:12+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" + "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8", + "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8", "shasum": "" }, "require": { @@ -1129,7 +1204,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -1158,7 +1233,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0" }, "funding": [ { @@ -1174,25 +1249,28 @@ "type": "tidelift" } ], - "time": "2021-03-23T23:28:01+00:00" + "time": "2021-07-12T14:48:14+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" + "reference": "30885182c981ab175d4d034db0f6f469898070ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", + "reference": "30885182c981ab175d4d034db0f6f469898070ab", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-ctype": "*" + }, "suggest": { "ext-ctype": "For best performance" }, @@ -1237,7 +1315,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0" }, "funding": [ { @@ -1253,20 +1331,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-10-20T20:35:02+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.23.1", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "16880ba9c5ebe3642d1995ab866db29270b36535" + "reference": "81b86b50cf841a64252b439e738e97f4a34e2783" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535", - "reference": "16880ba9c5ebe3642d1995ab866db29270b36535", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783", + "reference": "81b86b50cf841a64252b439e738e97f4a34e2783", "shasum": "" }, "require": { @@ -1318,7 +1396,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0" }, "funding": [ { @@ -1334,11 +1412,11 @@ "type": "tidelift" } ], - "time": "2021-05-27T12:26:48+00:00" + "time": "2021-11-23T21:10:46+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -1402,7 +1480,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0" }, "funding": [ { @@ -1422,21 +1500,24 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.23.1", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-mbstring": "*" + }, "suggest": { "ext-mbstring": "For best performance" }, @@ -1482,7 +1563,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0" }, "funding": [ { @@ -1498,20 +1579,20 @@ "type": "tidelift" } ], - "time": "2021-05-27T12:26:48+00:00" + "time": "2021-11-30T18:21:41+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" + "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5", + "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5", "shasum": "" }, "require": { @@ -1561,7 +1642,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0" }, "funding": [ { @@ -1577,20 +1658,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-06-05T21:20:04+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.23.1", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" + "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9", + "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9", "shasum": "" }, "require": { @@ -1644,7 +1725,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0" }, "funding": [ { @@ -1660,25 +1741,29 @@ "type": "tidelift" } ], - "time": "2021-07-28T13:41:28+00:00" + "time": "2021-09-13T13:58:33+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb" + "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", + "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", "shasum": "" }, "require": { "php": ">=7.2.5", - "psr/container": "^1.1" + "psr/container": "^1.1", + "symfony/deprecation-contracts": "^2.1" + }, + "conflict": { + "ext-psr": "<1.1|>=2" }, "suggest": { "symfony/service-implementation": "" @@ -1686,7 +1771,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -1723,7 +1808,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.0" }, "funding": [ { @@ -1739,20 +1824,20 @@ "type": "tidelift" } ], - "time": "2021-04-01T10:43:52+00:00" + "time": "2021-11-04T16:48:04+00:00" }, { "name": "symfony/string", - "version": "v5.3.3", + "version": "v5.4.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1" + "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1", - "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1", + "url": "https://api.github.com/repos/symfony/string/zipball/e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d", + "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d", "shasum": "" }, "require": { @@ -1763,11 +1848,14 @@ "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php80": "~1.15" }, + "conflict": { + "symfony/translation-contracts": ">=3.0" + }, "require-dev": { - "symfony/error-handler": "^4.4|^5.0", - "symfony/http-client": "^4.4|^5.0", + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0" + "symfony/var-exporter": "^4.4|^5.0|^6.0" }, "type": "library", "autoload": { @@ -1806,7 +1894,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.3.3" + "source": "https://github.com/symfony/string/tree/v5.4.2" }, "funding": [ { @@ -1822,20 +1910,20 @@ "type": "tidelift" } ], - "time": "2021-06-27T11:44:38+00:00" + "time": "2021-12-16T21:52:00+00:00" }, { "name": "vimeo/psalm", - "version": "4.8.1", + "version": "4.18.1", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "f73f2299dbc59a3e6c4d66cff4605176e728ee69" + "reference": "dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/f73f2299dbc59a3e6c4d66cff4605176e728ee69", - "reference": "f73f2299dbc59a3e6c4d66cff4605176e728ee69", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb", + "reference": "dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb", "shasum": "" }, "require": { @@ -1843,8 +1931,9 @@ "amphp/byte-stream": "^1.5", "composer/package-versions-deprecated": "^1.8.0", "composer/semver": "^1.4 || ^2.0 || ^3.0", - "composer/xdebug-handler": "^1.1 || ^2.0", + "composer/xdebug-handler": "^1.1 || ^2.0 || ^3.0", "dnoegel/php-xdg-base-dir": "^0.1.1", + "ext-ctype": "*", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -1854,11 +1943,11 @@ "felixfbecker/advanced-json-rpc": "^3.0.3", "felixfbecker/language-server-protocol": "^1.5", "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", - "nikic/php-parser": "^4.10.5", + "nikic/php-parser": "^4.13", "openlss/lib-array2xml": "^1.0", "php": "^7.1|^8", "sebastian/diff": "^3.0 || ^4.0", - "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0", + "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0 || ^6.0", "webmozart/path-util": "^2.3" }, "provide": { @@ -1876,12 +1965,12 @@ "psalm/plugin-phpunit": "^0.16", "slevomat/coding-standard": "^7.0", "squizlabs/php_codesniffer": "^3.5", - "symfony/process": "^4.3 || ^5.0", - "weirdan/phpunit-appveyor-reporter": "^1.0.0", + "symfony/process": "^4.3 || ^5.0 || ^6.0", "weirdan/prophecy-shim": "^1.0 || ^2.0" }, "suggest": { - "ext-igbinary": "^2.0.5" + "ext-curl": "In order to send data to shepherd", + "ext-igbinary": "^2.0.5 is required, used to serialize caching data" }, "bin": [ "psalm", @@ -1925,9 +2014,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.8.1" + "source": "https://github.com/vimeo/psalm/tree/4.18.1" }, - "time": "2021-06-20T23:03:20+00:00" + "time": "2022-01-08T21:21:26+00:00" }, { "name": "webmozart/assert", @@ -2035,6 +2124,7 @@ "issues": "https://github.com/webmozart/path-util/issues", "source": "https://github.com/webmozart/path-util/tree/2.3.0" }, + "abandoned": "symfony/filesystem", "time": "2015-12-17T08:42:14+00:00" } ], @@ -2049,5 +2139,5 @@ "platform-overrides": { "php": "7.3" }, - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" } |