diff options
author | Maxence Lange <maxence@artificial-owl.com> | 2023-06-15 19:01:55 -0100 |
---|---|---|
committer | Louis Chemineau <louis@chmn.me> | 2023-06-28 14:05:55 +0200 |
commit | a7eaa8352043a1ad812fba9fb17545ea658c2f12 (patch) | |
tree | d859ff9119c8932303c48fd077d687367c8475c5 | |
parent | acceb582ed68aa5535daf73e14c899b10f4f6f67 (diff) |
fixing
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
-rw-r--r-- | lib/Service/CurlService.php | 24 | ||||
-rw-r--r-- | psalm.xml | 2 | ||||
-rw-r--r-- | tests/psalm-baseline.xml | 69 |
3 files changed, 42 insertions, 53 deletions
diff --git a/lib/Service/CurlService.php b/lib/Service/CurlService.php index c864bc14..b10afa7c 100644 --- a/lib/Service/CurlService.php +++ b/lib/Service/CurlService.php @@ -30,6 +30,7 @@ declare(strict_types=1); namespace OCA\Social\Service; +use CurlHandle; use Exception; use OCA\Social\AP; use OCA\Social\Exceptions\HostMetaException; @@ -386,9 +387,9 @@ class CurlService { /** * @param Request $request * - * @return resource + * @return CurlHandle */ - private function initRequest(Request $request) { + private function initRequest(Request $request): CurlHandle { $curl = $this->generateCurlRequest($request); $this->initRequestHeaders($curl, $request); @@ -404,7 +405,8 @@ class CurlService { curl_setopt($curl, CURLOPT_BUFFERSIZE, 128); curl_setopt($curl, CURLOPT_NOPROGRESS, false); - curl_setopt($curl, CURLOPT_PROGRESSFUNCTION, + curl_setopt( + $curl, CURLOPT_PROGRESSFUNCTION, /** * @param $downloadSize * @param int $downloaded @@ -430,8 +432,10 @@ class CurlService { /** * @param Request $request + * + * @return CurlHandle */ - private function generateCurlRequest(Request $request) { + private function generateCurlRequest(Request $request): CurlHandle { $url = $request->getUsedProtocol() . '://' . $request->getHost() . $request->getParsedUrl(); if ($request->getType() !== Request::TYPE_GET) { $curl = curl_init($url); @@ -467,10 +471,10 @@ class CurlService { } /** - * @param resource $curl + * @param CurlHandle $curl * @param Request $request */ - private function initRequestHeaders($curl, Request $request) { + private function initRequestHeaders(CurlHandle $curl, Request $request): void { $headers = []; foreach ($request->getHeaders() as $name => $value) { $headers[] = $name . ': ' . $value; @@ -481,14 +485,14 @@ class CurlService { /** - * @param resource $curl + * @param CurlHandle $curl * @param Request $request * * @throws RequestContentException * @throws RequestServerException * @throws RequestNetworkException */ - private function parseRequestResult($curl, Request $request): void { + private function parseRequestResult(CurlHandle $curl, Request $request): void { $this->parseRequestResultCurl($curl, $request); $code = curl_getinfo($curl, CURLINFO_HTTP_CODE); @@ -499,12 +503,12 @@ class CurlService { /** - * @param resource $curl + * @param CurlHandle $curl * @param Request $request * * @throws RequestNetworkException */ - private function parseRequestResultCurl($curl, Request $request) { + private function parseRequestResultCurl(CurlHandle $curl, Request $request): void { $errno = curl_errno($curl); if ($errno > 0) { throw new RequestNetworkException( @@ -26,6 +26,7 @@ <errorLevel type="suppress"> <referencedClass name="OC" /> <referencedClass name="OC\DB\Connection" /> + <referencedClass name="Symfony\Component\EventDispatcher\GenericEvent" /> </errorLevel> </UndefinedClass> <UndefinedDocblockClass> @@ -35,6 +36,7 @@ <referencedClass name="Doctrine\DBAL\Driver\Statement" /> <referencedClass name="Doctrine\DBAL\Schema\Table" /> <referencedClass name="OC\DB\Connection" /> + <referencedClass name="Symfony\Component\EventDispatcher\EventDispatcherInterface" /> </errorLevel> </UndefinedDocblockClass> </issueHandlers> diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml index af53a7c5..426fb3b3 100644 --- a/tests/psalm-baseline.xml +++ b/tests/psalm-baseline.xml @@ -1,89 +1,72 @@ <?xml version="1.0" encoding="UTF-8"?> -<files psalm-version="5.4.0@62db5d4f6a7ae0a20f7cc5a4952d730272fc0863"> +<files psalm-version="5.12.0@f90118cdeacd0088e7215e64c0c99ceca819e176"> <file src="lib/Model/ActivityPub/ACore.php"> - <InvalidArgument occurrences="1"> - <code>['a', 'p', 'span', 'br']</code> + <InvalidArgument> + <code><![CDATA[['a', 'p', 'span', 'br']]]></code> </InvalidArgument> - <InvalidClass occurrences="1"> + <InvalidClass> <code>Acore</code> </InvalidClass> - <InvalidNullableReturnType occurrences="1"> + <InvalidNullableReturnType> <code>ACore</code> <code>ACore</code> </InvalidNullableReturnType> - <InvalidPropertyAssignmentValue occurrences="1"> + <InvalidPropertyAssignmentValue> <code>$parent</code> </InvalidPropertyAssignmentValue> - <NullableReturnStatement occurrences="1"> - <code>$this->parent</code> + <NullableReturnStatement> + <code><![CDATA[$this->parent]]></code> </NullableReturnStatement> - <TypeDoesNotContainNull occurrences="1"> + <TypeDoesNotContainNull> <code>$v === null</code> </TypeDoesNotContainNull> - <TypeDoesNotContainType occurrences="2"> + <TypeDoesNotContainType> <code>$v === 0</code> <code>$v === 0</code> </TypeDoesNotContainType> </file> - <file src="lib/Model/ActivityPub/Object/Announce.php"> - <RedundantCondition occurrences="1"> - <code>$object = $cache->getItem($this->getObjectId())</code> - </RedundantCondition> - </file> <file src="lib/Db/CoreRequestBuilder.php"> - <UndefinedMethod occurrences="3"> + <UndefinedMethod> <code>dropTable</code> <code>hasTable</code> <code>hasTable</code> </UndefinedMethod> - <InvalidArgument occurrences="2"/> + <InvalidArgument> + <code>Server::get(Connection::class)</code> + <code>Server::get(Connection::class)</code> + </InvalidArgument> </file> <file src="lib/Service/CheckService.php"> - <RedundantCast occurrences="1"> - <code>(bool)($this->cache->get(self::CACHE_PREFIX . 'wellknown') === 'true')</code> + <RedundantCast> + <code><![CDATA[(bool)($this->cache->get(self::CACHE_PREFIX . 'wellknown') === 'true')]]></code> </RedundantCast> - <UndefinedClass occurrences="1"> + <UndefinedClass> <code>ClientException</code> </UndefinedClass> </file> <file src="lib/Service/CurlService.php"> - <InvalidOperand occurrences="1"> - <code>$this->configService->getAppValue(ConfigService::SOCIAL_MAX_SIZE)</code> + <InvalidOperand> + <code><![CDATA[$this->configService->getAppValue(ConfigService::SOCIAL_MAX_SIZE)]]></code> </InvalidOperand> - <RedundantCondition occurrences="1"> - <code>is_array($result)</code> - </RedundantCondition> - <TypeDoesNotContainType occurrences="1"> - <code>$this->maxDownloadSizeReached === true</code> + <TypeDoesNotContainType> + <code><![CDATA[$this->maxDownloadSizeReached === true]]></code> </TypeDoesNotContainType> - <InvalidArgument occurrences="8"/> </file> <file src="lib/Service/PostService.php"> - <UndefinedMethod occurrences="2"> - <code>setAttributedTo</code> - <code>setContent</code> - </UndefinedMethod> - <TypeDoesNotContainType occurrences="1"> - <code>is_array($_FILES['attachments']['error'])</code> + <TypeDoesNotContainType> + <code><![CDATA[is_array($_FILES['attachments']['error'])]]></code> </TypeDoesNotContainType> </file> <file src="lib/Service/SearchService.php"> - <InvalidOperand occurrences="3"> + <InvalidOperand> <code>!$type</code> <code>!$type</code> <code>!$type</code> </InvalidOperand> </file> <file src="lib/Service/SignatureService.php"> - <RedundantCondition occurrences="1"> + <RedundantCondition> <code>$varr[0] !== null</code> </RedundantCondition> </file> - <file src="lib/Service/TestService.php"> - <TypeDoesNotContainNull occurrences="3"> - <code>$host === null</code> - <code>$username === null</code> - <code>$username === null</code> - </TypeDoesNotContainNull> - </file> </files> |