kopia lustrzana https://github.com/nextcloud/social
rodzic
acceb582ed
commit
a7eaa83520
|
@ -30,6 +30,7 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace OCA\Social\Service;
|
namespace OCA\Social\Service;
|
||||||
|
|
||||||
|
use CurlHandle;
|
||||||
use Exception;
|
use Exception;
|
||||||
use OCA\Social\AP;
|
use OCA\Social\AP;
|
||||||
use OCA\Social\Exceptions\HostMetaException;
|
use OCA\Social\Exceptions\HostMetaException;
|
||||||
|
@ -386,9 +387,9 @@ class CurlService {
|
||||||
/**
|
/**
|
||||||
* @param Request $request
|
* @param Request $request
|
||||||
*
|
*
|
||||||
* @return resource
|
* @return CurlHandle
|
||||||
*/
|
*/
|
||||||
private function initRequest(Request $request) {
|
private function initRequest(Request $request): CurlHandle {
|
||||||
$curl = $this->generateCurlRequest($request);
|
$curl = $this->generateCurlRequest($request);
|
||||||
$this->initRequestHeaders($curl, $request);
|
$this->initRequestHeaders($curl, $request);
|
||||||
|
|
||||||
|
@ -404,7 +405,8 @@ class CurlService {
|
||||||
|
|
||||||
curl_setopt($curl, CURLOPT_BUFFERSIZE, 128);
|
curl_setopt($curl, CURLOPT_BUFFERSIZE, 128);
|
||||||
curl_setopt($curl, CURLOPT_NOPROGRESS, false);
|
curl_setopt($curl, CURLOPT_NOPROGRESS, false);
|
||||||
curl_setopt($curl, CURLOPT_PROGRESSFUNCTION,
|
curl_setopt(
|
||||||
|
$curl, CURLOPT_PROGRESSFUNCTION,
|
||||||
/**
|
/**
|
||||||
* @param $downloadSize
|
* @param $downloadSize
|
||||||
* @param int $downloaded
|
* @param int $downloaded
|
||||||
|
@ -430,8 +432,10 @@ class CurlService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param Request $request
|
* @param Request $request
|
||||||
|
*
|
||||||
|
* @return CurlHandle
|
||||||
*/
|
*/
|
||||||
private function generateCurlRequest(Request $request) {
|
private function generateCurlRequest(Request $request): CurlHandle {
|
||||||
$url = $request->getUsedProtocol() . '://' . $request->getHost() . $request->getParsedUrl();
|
$url = $request->getUsedProtocol() . '://' . $request->getHost() . $request->getParsedUrl();
|
||||||
if ($request->getType() !== Request::TYPE_GET) {
|
if ($request->getType() !== Request::TYPE_GET) {
|
||||||
$curl = curl_init($url);
|
$curl = curl_init($url);
|
||||||
|
@ -467,10 +471,10 @@ class CurlService {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param resource $curl
|
* @param CurlHandle $curl
|
||||||
* @param Request $request
|
* @param Request $request
|
||||||
*/
|
*/
|
||||||
private function initRequestHeaders($curl, Request $request) {
|
private function initRequestHeaders(CurlHandle $curl, Request $request): void {
|
||||||
$headers = [];
|
$headers = [];
|
||||||
foreach ($request->getHeaders() as $name => $value) {
|
foreach ($request->getHeaders() as $name => $value) {
|
||||||
$headers[] = $name . ': ' . $value;
|
$headers[] = $name . ': ' . $value;
|
||||||
|
@ -481,14 +485,14 @@ class CurlService {
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param resource $curl
|
* @param CurlHandle $curl
|
||||||
* @param Request $request
|
* @param Request $request
|
||||||
*
|
*
|
||||||
* @throws RequestContentException
|
* @throws RequestContentException
|
||||||
* @throws RequestServerException
|
* @throws RequestServerException
|
||||||
* @throws RequestNetworkException
|
* @throws RequestNetworkException
|
||||||
*/
|
*/
|
||||||
private function parseRequestResult($curl, Request $request): void {
|
private function parseRequestResult(CurlHandle $curl, Request $request): void {
|
||||||
$this->parseRequestResultCurl($curl, $request);
|
$this->parseRequestResultCurl($curl, $request);
|
||||||
|
|
||||||
$code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
|
$code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
|
||||||
|
@ -499,12 +503,12 @@ class CurlService {
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param resource $curl
|
* @param CurlHandle $curl
|
||||||
* @param Request $request
|
* @param Request $request
|
||||||
*
|
*
|
||||||
* @throws RequestNetworkException
|
* @throws RequestNetworkException
|
||||||
*/
|
*/
|
||||||
private function parseRequestResultCurl($curl, Request $request) {
|
private function parseRequestResultCurl(CurlHandle $curl, Request $request): void {
|
||||||
$errno = curl_errno($curl);
|
$errno = curl_errno($curl);
|
||||||
if ($errno > 0) {
|
if ($errno > 0) {
|
||||||
throw new RequestNetworkException(
|
throw new RequestNetworkException(
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
<errorLevel type="suppress">
|
<errorLevel type="suppress">
|
||||||
<referencedClass name="OC" />
|
<referencedClass name="OC" />
|
||||||
<referencedClass name="OC\DB\Connection" />
|
<referencedClass name="OC\DB\Connection" />
|
||||||
|
<referencedClass name="Symfony\Component\EventDispatcher\GenericEvent" />
|
||||||
</errorLevel>
|
</errorLevel>
|
||||||
</UndefinedClass>
|
</UndefinedClass>
|
||||||
<UndefinedDocblockClass>
|
<UndefinedDocblockClass>
|
||||||
|
@ -35,6 +36,7 @@
|
||||||
<referencedClass name="Doctrine\DBAL\Driver\Statement" />
|
<referencedClass name="Doctrine\DBAL\Driver\Statement" />
|
||||||
<referencedClass name="Doctrine\DBAL\Schema\Table" />
|
<referencedClass name="Doctrine\DBAL\Schema\Table" />
|
||||||
<referencedClass name="OC\DB\Connection" />
|
<referencedClass name="OC\DB\Connection" />
|
||||||
|
<referencedClass name="Symfony\Component\EventDispatcher\EventDispatcherInterface" />
|
||||||
</errorLevel>
|
</errorLevel>
|
||||||
</UndefinedDocblockClass>
|
</UndefinedDocblockClass>
|
||||||
</issueHandlers>
|
</issueHandlers>
|
||||||
|
|
|
@ -1,89 +1,72 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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">
|
<file src="lib/Model/ActivityPub/ACore.php">
|
||||||
<InvalidArgument occurrences="1">
|
<InvalidArgument>
|
||||||
<code>['a', 'p', 'span', 'br']</code>
|
<code><![CDATA[['a', 'p', 'span', 'br']]]></code>
|
||||||
</InvalidArgument>
|
</InvalidArgument>
|
||||||
<InvalidClass occurrences="1">
|
<InvalidClass>
|
||||||
<code>Acore</code>
|
<code>Acore</code>
|
||||||
</InvalidClass>
|
</InvalidClass>
|
||||||
<InvalidNullableReturnType occurrences="1">
|
<InvalidNullableReturnType>
|
||||||
<code>ACore</code>
|
<code>ACore</code>
|
||||||
<code>ACore</code>
|
<code>ACore</code>
|
||||||
</InvalidNullableReturnType>
|
</InvalidNullableReturnType>
|
||||||
<InvalidPropertyAssignmentValue occurrences="1">
|
<InvalidPropertyAssignmentValue>
|
||||||
<code>$parent</code>
|
<code>$parent</code>
|
||||||
</InvalidPropertyAssignmentValue>
|
</InvalidPropertyAssignmentValue>
|
||||||
<NullableReturnStatement occurrences="1">
|
<NullableReturnStatement>
|
||||||
<code>$this->parent</code>
|
<code><![CDATA[$this->parent]]></code>
|
||||||
</NullableReturnStatement>
|
</NullableReturnStatement>
|
||||||
<TypeDoesNotContainNull occurrences="1">
|
<TypeDoesNotContainNull>
|
||||||
<code>$v === null</code>
|
<code>$v === null</code>
|
||||||
</TypeDoesNotContainNull>
|
</TypeDoesNotContainNull>
|
||||||
<TypeDoesNotContainType occurrences="2">
|
<TypeDoesNotContainType>
|
||||||
<code>$v === 0</code>
|
<code>$v === 0</code>
|
||||||
<code>$v === 0</code>
|
<code>$v === 0</code>
|
||||||
</TypeDoesNotContainType>
|
</TypeDoesNotContainType>
|
||||||
</file>
|
</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">
|
<file src="lib/Db/CoreRequestBuilder.php">
|
||||||
<UndefinedMethod occurrences="3">
|
<UndefinedMethod>
|
||||||
<code>dropTable</code>
|
<code>dropTable</code>
|
||||||
<code>hasTable</code>
|
<code>hasTable</code>
|
||||||
<code>hasTable</code>
|
<code>hasTable</code>
|
||||||
</UndefinedMethod>
|
</UndefinedMethod>
|
||||||
<InvalidArgument occurrences="2"/>
|
<InvalidArgument>
|
||||||
|
<code>Server::get(Connection::class)</code>
|
||||||
|
<code>Server::get(Connection::class)</code>
|
||||||
|
</InvalidArgument>
|
||||||
</file>
|
</file>
|
||||||
<file src="lib/Service/CheckService.php">
|
<file src="lib/Service/CheckService.php">
|
||||||
<RedundantCast occurrences="1">
|
<RedundantCast>
|
||||||
<code>(bool)($this->cache->get(self::CACHE_PREFIX . 'wellknown') === 'true')</code>
|
<code><![CDATA[(bool)($this->cache->get(self::CACHE_PREFIX . 'wellknown') === 'true')]]></code>
|
||||||
</RedundantCast>
|
</RedundantCast>
|
||||||
<UndefinedClass occurrences="1">
|
<UndefinedClass>
|
||||||
<code>ClientException</code>
|
<code>ClientException</code>
|
||||||
</UndefinedClass>
|
</UndefinedClass>
|
||||||
</file>
|
</file>
|
||||||
<file src="lib/Service/CurlService.php">
|
<file src="lib/Service/CurlService.php">
|
||||||
<InvalidOperand occurrences="1">
|
<InvalidOperand>
|
||||||
<code>$this->configService->getAppValue(ConfigService::SOCIAL_MAX_SIZE)</code>
|
<code><![CDATA[$this->configService->getAppValue(ConfigService::SOCIAL_MAX_SIZE)]]></code>
|
||||||
</InvalidOperand>
|
</InvalidOperand>
|
||||||
<RedundantCondition occurrences="1">
|
<TypeDoesNotContainType>
|
||||||
<code>is_array($result)</code>
|
<code><![CDATA[$this->maxDownloadSizeReached === true]]></code>
|
||||||
</RedundantCondition>
|
|
||||||
<TypeDoesNotContainType occurrences="1">
|
|
||||||
<code>$this->maxDownloadSizeReached === true</code>
|
|
||||||
</TypeDoesNotContainType>
|
</TypeDoesNotContainType>
|
||||||
<InvalidArgument occurrences="8"/>
|
|
||||||
</file>
|
</file>
|
||||||
<file src="lib/Service/PostService.php">
|
<file src="lib/Service/PostService.php">
|
||||||
<UndefinedMethod occurrences="2">
|
<TypeDoesNotContainType>
|
||||||
<code>setAttributedTo</code>
|
<code><![CDATA[is_array($_FILES['attachments']['error'])]]></code>
|
||||||
<code>setContent</code>
|
|
||||||
</UndefinedMethod>
|
|
||||||
<TypeDoesNotContainType occurrences="1">
|
|
||||||
<code>is_array($_FILES['attachments']['error'])</code>
|
|
||||||
</TypeDoesNotContainType>
|
</TypeDoesNotContainType>
|
||||||
</file>
|
</file>
|
||||||
<file src="lib/Service/SearchService.php">
|
<file src="lib/Service/SearchService.php">
|
||||||
<InvalidOperand occurrences="3">
|
<InvalidOperand>
|
||||||
<code>!$type</code>
|
<code>!$type</code>
|
||||||
<code>!$type</code>
|
<code>!$type</code>
|
||||||
<code>!$type</code>
|
<code>!$type</code>
|
||||||
</InvalidOperand>
|
</InvalidOperand>
|
||||||
</file>
|
</file>
|
||||||
<file src="lib/Service/SignatureService.php">
|
<file src="lib/Service/SignatureService.php">
|
||||||
<RedundantCondition occurrences="1">
|
<RedundantCondition>
|
||||||
<code>$varr[0] !== null</code>
|
<code>$varr[0] !== null</code>
|
||||||
</RedundantCondition>
|
</RedundantCondition>
|
||||||
</file>
|
</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>
|
</files>
|
||||||
|
|
Ładowanie…
Reference in New Issue