diff options
author | Carl Schwan <carl@carlschwan.eu> | 2022-01-06 16:19:06 +0300 |
---|---|---|
committer | Carl Schwan <carl@carlschwan.eu> | 2022-01-27 19:20:00 +0300 |
commit | d69531ac8ecabfaa2c915d5266d09971c0129a77 (patch) | |
tree | 876d8e19059e7b424cc29ef49167cdf9bf47db69 /build | |
parent | 0c631830bba9ff49e5f281699cf2514ea2e4d54d (diff) |
Fix psalm not running
The issue was that we were using psalm/phar instead of vimeo/psalm. This
caused issue with the custom psalm plugin in buildd/psalm.
This is using the opportunity to also update the psalm version from 3.8
to 3.17 and the php-cs-fixer too.
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Diffstat (limited to 'build')
-rw-r--r-- | build/files-checker.php | 2 | ||||
-rw-r--r-- | build/integration/features/bootstrap/WebDav.php | 2 | ||||
-rw-r--r-- | build/psalm-baseline.xml | 333 | ||||
-rw-r--r-- | build/stubs/gd.php | 6 |
4 files changed, 260 insertions, 83 deletions
diff --git a/build/files-checker.php b/build/files-checker.php index f4ca40a54b3..12109e59d8e 100644 --- a/build/files-checker.php +++ b/build/files-checker.php @@ -38,7 +38,7 @@ $expectedFiles = [ '.jshintrc', '.mailmap', '.npmignore', - '.php_cs.dist', + '.php-cs-fixer.dist.php', '.scrutinizer.yml', '.tag', '.tx', diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php index b4acf99aad6..1d9b4970fe8 100644 --- a/build/integration/features/bootstrap/WebDav.php +++ b/build/integration/features/bootstrap/WebDav.php @@ -623,7 +623,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.xml b/build/psalm-baseline.xml index 262b5283ba6..efa8e657da5 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> @@ -640,9 +691,6 @@ <UndefinedFunction occurrences="1"> <code>\Sabre\Uri\split($this->path)</code> </UndefinedFunction> - <UndefinedInterfaceMethod occurrences="1"> - <code>writeStream</code> - </UndefinedInterfaceMethod> </file> <file src="apps/dav/lib/Connector/Sabre/FilesPlugin.php"> <UndefinedFunction occurrences="3"> @@ -1014,6 +1062,9 @@ <NullArgument occurrences="1"> <code>null</code> </NullArgument> + <RedundantFunctionCall occurrences="1"> + <code>array_values</code> + </RedundantFunctionCall> </file> <file src="apps/dav/lib/Upload/UploadHome.php"> <UndefinedFunction occurrences="1"> @@ -1031,7 +1082,12 @@ </InvalidOperand> </file> <file src="apps/encryption/lib/Crypto/Crypt.php"> - <RedundantCondition occurrences="1"> + <InvalidArgument occurrences="2"> + <code>false</code> + <code>false</code> + </InvalidArgument> + <RedundantCondition occurrences="2"> + <code>$userSession</code> <code>$userSession</code> </RedundantCondition> <TypeDoesNotContainType occurrences="2"> @@ -1067,17 +1123,24 @@ <InvalidThrow occurrences="1"> <code>throw $exception;</code> </InvalidThrow> - <RedundantCondition occurrences="1"> + <RedundantCondition occurrences="2"> + <code>$userSession</code> <code>$userSession</code> </RedundantCondition> </file> + <file src="apps/encryption/lib/Migration/SetMasterKeyStatus.php"> + <InvalidArgument occurrences="1"> + <code>false</code> + </InvalidArgument> + </file> <file src="apps/encryption/lib/Recovery.php"> <InvalidScalarArgument occurrences="3"> <code>0</code> <code>0</code> <code>1</code> </InvalidScalarArgument> - <RedundantCondition occurrences="1"> + <RedundantCondition occurrences="2"> + <code>$userSession</code> <code>$userSession</code> </RedundantCondition> </file> @@ -1087,10 +1150,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> @@ -1145,6 +1214,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> @@ -1161,11 +1235,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> @@ -1194,6 +1263,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> @@ -1283,6 +1358,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> @@ -1332,6 +1413,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> @@ -1526,6 +1613,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> @@ -1545,11 +1642,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> @@ -1595,9 +1698,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> @@ -1620,6 +1720,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> @@ -1732,12 +1837,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> @@ -1761,6 +1867,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> @@ -1804,6 +1916,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> @@ -1814,6 +1931,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> @@ -1855,6 +1977,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> @@ -1868,11 +1995,14 @@ <code>$uid</code> </InvalidScalarArgument> </file> + <file src="apps/settings/lib/SetupChecks/CheckUserCertificates.php"> + <InvalidArgument occurrences="1"> + <code>false</code> + </InvalidArgument> + </file> <file src="apps/sharebymail/lib/ShareByMailProvider.php"> - <InvalidScalarArgument occurrences="4"> + <InvalidScalarArgument occurrences="2"> <code>$share->getId()</code> - <code>$shareId</code> - <code>$shareId</code> <code>(int)$data['id']</code> </InvalidScalarArgument> </file> @@ -1891,6 +2021,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> @@ -1931,6 +2066,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> @@ -1948,6 +2091,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> @@ -1992,9 +2138,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> @@ -2015,8 +2158,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"> @@ -2274,12 +2416,19 @@ </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/user_status/lib/Db/UserStatusMapper.php"> - <MoreSpecificImplementedParamType occurrences="1"/> + <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"> @@ -2375,6 +2524,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> @@ -2394,9 +2556,6 @@ <ImplementedReturnTypeMismatch occurrences="1"> <code>null|int</code> </ImplementedReturnTypeMismatch> - <InvalidReturnType occurrences="1"> - <code>null|int</code> - </InvalidReturnType> <MismatchingDocblockReturnType occurrences="1"> <code>null|int</code> </MismatchingDocblockReturnType> @@ -2415,9 +2574,6 @@ <ImplementedReturnTypeMismatch occurrences="1"> <code>null|int</code> </ImplementedReturnTypeMismatch> - <InvalidReturnType occurrences="1"> - <code>null|int</code> - </InvalidReturnType> <MismatchingDocblockReturnType occurrences="1"> <code>null|int</code> </MismatchingDocblockReturnType> @@ -2440,9 +2596,6 @@ <ImplementedReturnTypeMismatch occurrences="1"> <code>null|int</code> </ImplementedReturnTypeMismatch> - <InvalidReturnType occurrences="1"> - <code>null|int</code> - </InvalidReturnType> <MismatchingDocblockReturnType occurrences="1"> <code>null|int</code> </MismatchingDocblockReturnType> @@ -2602,13 +2755,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> @@ -2617,8 +2776,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> @@ -3042,14 +3203,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> @@ -3474,7 +3627,8 @@ <NullableReturnStatement occurrences="1"> <code>null</code> </NullableReturnStatement> - <RedundantCondition occurrences="1"> + <RedundantCondition occurrences="2"> + <code>$userObject</code> <code>$userObject</code> </RedundantCondition> <TooManyArguments occurrences="1"> @@ -3660,6 +3814,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> @@ -3873,6 +4030,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> @@ -3893,10 +4055,6 @@ <FalsableReturnStatement occurrences="1"> <code>false</code> </FalsableReturnStatement> - <InvalidArgument occurrences="2"> - <code>$source</code> - <code>$target</code> - </InvalidArgument> <InvalidOperand occurrences="3"> <code>$result</code> <code>$result</code> @@ -3967,6 +4125,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> @@ -4016,9 +4179,13 @@ <code>null</code> <code>null</code> </NullableReturnStatement> - <RedundantCondition occurrences="3"> + <RedundantCondition occurrences="7"> + <code>$data</code> <code>$data</code> + <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"> @@ -4057,7 +4224,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> @@ -4100,6 +4270,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> @@ -4107,7 +4281,8 @@ <NullArgument occurrences="1"> <code>null</code> </NullArgument> - <RedundantCondition occurrences="1"> + <RedundantCondition occurrences="2"> + <code>$archive</code> <code>$archive</code> </RedundantCondition> </file> @@ -4181,7 +4356,8 @@ </InvalidPropertyAssignmentValue> </file> <file src="lib/private/Log.php"> - <RedundantCondition occurrences="1"> + <RedundantCondition occurrences="2"> + <code>$request</code> <code>$request</code> </RedundantCondition> </file> @@ -4233,9 +4409,9 @@ </LessSpecificImplementedReturnType> </file> <file src="lib/private/Memcache/Memcached.php"> - <RedundantCondition occurrences="1"> - <code>method_exists(self::$cache, 'deleteMulti')</code> - </RedundantCondition> + <TypeDoesNotContainType occurrences="1"> + <code>\Memcached::HAVE_IGBINARY</code> + </TypeDoesNotContainType> </file> <file src="lib/private/Memcache/Redis.php"> <InvalidMethodCall occurrences="2"> @@ -4255,10 +4431,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"> @@ -4358,6 +4530,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> @@ -4367,6 +4544,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"> @@ -4706,6 +4886,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> @@ -4776,6 +4959,9 @@ <ImplementedReturnTypeMismatch occurrences="1"> <code>array|int</code> </ImplementedReturnTypeMismatch> + <InvalidArgument occurrences="1"> + <code>$callback</code> + </InvalidArgument> <InvalidNullableReturnType occurrences="1"> <code>bool|IUser</code> </InvalidNullableReturnType> @@ -4942,16 +5128,8 @@ <RedundantCondition occurrences="1"> <code>count($obd_values) > 0</code> </RedundantCondition> - <UndefinedInterfaceMethod occurrences="1"> - <code>getSourceStorage</code> - </UndefinedInterfaceMethod> </file> <file src="lib/private/legacy/OC_Image.php"> - <FalsableReturnStatement occurrences="3"> - <code>$this->resource</code> - <code>$this->valid() ? imagesx($this->resource) : -1</code> - <code>$this->valid() ? imagesy($this->resource) : -1</code> - </FalsableReturnStatement> <ImplementedReturnTypeMismatch occurrences="1"> <code>null|string</code> </ImplementedReturnTypeMismatch> @@ -4959,9 +5137,6 @@ <code>$data[floor($p)]</code> <code>$data[floor($p)]</code> </InvalidArrayOffset> - <InvalidPropertyAssignmentValue occurrences="1"> - <code>$resource</code> - </InvalidPropertyAssignmentValue> <InvalidScalarArgument occurrences="4"> <code>$this->bitDepth</code> <code>$x</code> @@ -4987,9 +5162,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> @@ -5000,8 +5172,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/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. |