fixed minor phpstan issues

ViniTou · ViniTou · commit 8f5226732d4f · 2024-10-25T08:34:35.000+02:00
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/src/lib/FieldType/BinaryBase/BinaryBaseStorage.php b/src/lib/FieldType/BinaryBase/BinaryBaseStorage.php
@@ -131,7 +131,6 @@ public function copyLegacyField(VersionInfo $versionInfo, Field $field, Field $o
      *
      * @param mixed $fieldId
      * @param string $versionNo
-     * @param array $context
      */
     protected function removeOldFile($fieldId, $versionNo)
     {
diff --git a/src/lib/FieldType/Keyword/KeywordStorage.php b/src/lib/FieldType/Keyword/KeywordStorage.php
@@ -26,10 +26,6 @@ class KeywordStorage extends GatewayBasedStorage
     /**
      * @see \Ibexa\Contracts\Core\FieldType\FieldStorage
      *
-     * @param \Ibexa\Contracts\Core\Persistence\Content\VersionInfo $versionInfo
-     * @param \Ibexa\Contracts\Core\Persistence\Content\Field $field
-     * @param array $context
-     *
      * @return mixed
      */
     public function storeFieldData(VersionInfo $versionInfo, Field $field)
@@ -45,11 +41,7 @@ public function getFieldData(VersionInfo $versionInfo, Field $field)
     }
 
     /**
-     * @param \Ibexa\Contracts\Core\Persistence\Content\VersionInfo $versionInfo
      * @param array $fieldIds
-     * @param array $context
-     *
-     * @return bool
      */
     public function deleteFieldData(VersionInfo $versionInfo, array $fieldIds): bool
     {
@@ -60,11 +52,6 @@ public function deleteFieldData(VersionInfo $versionInfo, array $fieldIds): bool
         return true;
     }
 
-    /**
-     * Checks if field type has external data to deal with.
-     *
-     * @return bool
-     */
     public function hasFieldData(): bool
     {
         return true;
diff --git a/src/lib/FieldType/User/UserStorage.php b/src/lib/FieldType/User/UserStorage.php
@@ -46,9 +46,7 @@ public function getFieldData(VersionInfo $versionInfo, Field $field)
     }
 
     /**
-     * @param \Ibexa\Contracts\Core\Persistence\Content\VersionInfo $versionInfo
      * @param int[] $fieldIds Array of field Ids
-     * @param array $context
      *
      * @return bool
      *
diff --git a/src/lib/Helper/PreviewLocationProvider.php b/src/lib/Helper/PreviewLocationProvider.php
@@ -8,7 +8,6 @@
 namespace Ibexa\Core\Helper;
 
 use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as PersistenceLocationHandler;
-use Ibexa\Contracts\Core\Repository\ContentService;
 use Ibexa\Contracts\Core\Repository\LocationService;
 use Ibexa\Contracts\Core\Repository\Values\Content\Content as APIContent;
 use Ibexa\Contracts\Core\Repository\Values\Content\Location as APILocation;
@@ -22,24 +21,18 @@ class PreviewLocationProvider
     /** @var \Ibexa\Contracts\Core\Repository\LocationService */
     private $locationService;
 
-    /** @var \Ibexa\Contracts\Core\Repository\ContentService */
-    private $contentService;
-
     /** @var \Ibexa\Contracts\Core\Persistence\Content\Location\Handler */
     private $locationHandler;
 
     /**
      * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService
-     * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService
      * @param \Ibexa\Contracts\Core\Persistence\Content\Location\Handler $locationHandler
      */
     public function __construct(
         LocationService $locationService,
-        ContentService $contentService,
         PersistenceLocationHandler $locationHandler
     ) {
         $this->locationService = $locationService;
-        $this->contentService = $contentService;
         $this->locationHandler = $locationHandler;
     }
 
diff --git a/src/lib/MVC/Symfony/Component/Serializer/SimplifiedRequestNormalizer.php b/src/lib/MVC/Symfony/Component/Serializer/SimplifiedRequestNormalizer.php
@@ -16,13 +16,13 @@ final class SimplifiedRequestNormalizer extends PropertyNormalizer
      * @param \Ibexa\Core\MVC\Symfony\Routing\SimplifiedRequest $object
      *
      * @return array{
-     *     scheme: string,
-     *     host: string,
-     *     port: string,
-     *     pathinfo: string,
-     *     queryParams: array<mixed>,
-     *     languages: string[],
-     *     headers: array{}
+     *     scheme: ?string,
+     *     host: ?string,
+     *     port: ?int,
+     *     pathinfo: ?string,
+     *     queryParams: ?array<mixed>,
+     *     languages: ?string[],
+     *     headers: ?array{}
      * }
      *
      * @see \Symfony\Component\Serializer\Normalizer\NormalizerInterface::normalize
diff --git a/src/lib/MVC/Symfony/SiteAccess/Matcher/HostElement.php b/src/lib/MVC/Symfony/SiteAccess/Matcher/HostElement.php
@@ -83,7 +83,7 @@ public function getRequest()
 
     public function reverseMatch($siteAccessName)
     {
-        $hostElements = explode('.', $this->request->getHost());
+        $hostElements = explode('.', (string)$this->request->getHost());
         $elementNumber = $this->elementNumber - 1;
         if (!isset($hostElements[$elementNumber])) {
             return null;
diff --git a/src/lib/MVC/Symfony/SiteAccess/Matcher/HostText.php b/src/lib/MVC/Symfony/SiteAccess/Matcher/HostText.php
@@ -30,7 +30,7 @@ public function getName(): string
     public function setRequest(SimplifiedRequest $request): void
     {
         if (!$this->element) {
-            $this->setMatchElement($request->getHost());
+            $this->setMatchElement((string)$request->getHost());
         }
 
         parent::setRequest($request);
diff --git a/src/lib/MVC/Symfony/SiteAccess/Matcher/Map/Host.php b/src/lib/MVC/Symfony/SiteAccess/Matcher/Map/Host.php
@@ -25,7 +25,7 @@ public function getName(): string
     public function setRequest(SimplifiedRequest $request)
     {
         if (!$this->key) {
-            $this->setMapKey($request->getHost());
+            $this->setMapKey((string)$request->getHost());
         }
 
         parent::setRequest($request);
diff --git a/src/lib/MVC/Symfony/SiteAccess/Matcher/Map/Port.php b/src/lib/MVC/Symfony/SiteAccess/Matcher/Map/Port.php
@@ -39,7 +39,7 @@ public function setRequest(SimplifiedRequest $request)
                 }
             }
 
-            $this->setMapKey($key);
+            $this->setMapKey((string)$key);
         }
 
         parent::setRequest($request);
@@ -49,7 +49,7 @@ public function reverseMatch($siteAccessName)
     {
         $matcher = parent::reverseMatch($siteAccessName);
         if ($matcher instanceof self) {
-            $matcher->getRequest()->setPort($matcher->getMapKey());
+            $matcher->getRequest()->setPort((int)$matcher->getMapKey());
         }
 
         return $matcher;
diff --git a/src/lib/MVC/Symfony/SiteAccess/Matcher/Map/URI.php b/src/lib/MVC/Symfony/SiteAccess/Matcher/Map/URI.php
@@ -21,7 +21,7 @@ class URI extends Map implements URILexer
     public function setRequest(SimplifiedRequest $request)
     {
         if (!$this->key) {
-            sscanf($request->getPathInfo(), '/%[^/]', $key);
+            sscanf((string)$request->getPathInfo(), '/%[^/]', $key);
             $this->setMapKey(rawurldecode((string)$key));
         }
 
@@ -82,7 +82,7 @@ public function reverseMatch($siteAccessName)
         if ($matcher instanceof self) {
             $request = $matcher->getRequest();
             // Clean up "old" siteaccess prefix and add the new prefix.
-            $request->setPathinfo($this->analyseLink($request->getPathInfo()));
+            $request->setPathinfo($this->analyseLink((string)$request->getPathInfo()));
         }
 
         return $matcher;
diff --git a/src/lib/MVC/Symfony/SiteAccess/Matcher/URIElement.php b/src/lib/MVC/Symfony/SiteAccess/Matcher/URIElement.php
@@ -178,7 +178,7 @@ public function reverseMatch($siteAccessName)
             return null;
         }
 
-        $pathinfo = '/' . implode('/', $elements) . '/' . ltrim($this->request->getPathInfo(), '/');
+        $pathinfo = '/' . implode('/', $elements) . '/' . ltrim((string)$this->request->getPathInfo(), '/');
         $this->request->setPathinfo($pathinfo);
 
         return $this;
diff --git a/src/lib/MVC/Symfony/SiteAccess/Matcher/URIText.php b/src/lib/MVC/Symfony/SiteAccess/Matcher/URIText.php
@@ -31,7 +31,7 @@ public function getName(): string
     public function setRequest(SimplifiedRequest $request): void
     {
         if (!$this->element) {
-            $this->setMatchElement($request->getPathInfo());
+            $this->setMatchElement((string)$request->getPathInfo());
         }
 
         parent::setRequest($request);
diff --git a/src/lib/MVC/Symfony/SiteAccess/Router.php b/src/lib/MVC/Symfony/SiteAccess/Router.php
@@ -222,7 +222,7 @@ public function matchByName($siteAccessName): ?SiteAccess
         $request = clone $this->request;
         // Be sure to have a clean pathinfo, without SiteAccess part in it.
         if ($this->siteAccess && $this->siteAccess->matcher instanceof URILexer) {
-            $request->setPathinfo($this->siteAccess->matcher->analyseURI($request->getPathInfo()));
+            $request->setPathinfo($this->siteAccess->matcher->analyseURI((string)$request->getPathInfo()));
         }
 
         $siteAccessClass = $this->siteAccessClass;
diff --git a/src/lib/Repository/URLWildcardService.php b/src/lib/Repository/URLWildcardService.php
@@ -317,10 +317,6 @@ private function validateUrls(string $sourceUrl, string $destinationUrl): void
         preg_match_all('(\\*)', $sourceUrl, $patterns);
         preg_match_all('({(\d+)})', $destinationUrl, $placeholders);
 
-        if (empty($patterns) || empty($placeholders)) {
-            throw new ContentValidationException('Invalid URL wildcards provided.');
-        }
-
         $patterns = array_map('intval', $patterns[0]);
         $placeholders = array_map('intval', $placeholders[1]);
 
diff --git a/tests/integration/Core/Repository/ContentServiceAuthorizationTest.php b/tests/integration/Core/Repository/ContentServiceAuthorizationTest.php
@@ -11,6 +11,7 @@
 use Ibexa\Contracts\Core\Repository\Repository;
 use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
 use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Content\Relation;
 use Ibexa\Contracts\Core\Repository\Values\User\Limitation\LanguageLimitation;
 use Ibexa\Contracts\Core\Repository\Values\User\Limitation\LocationLimitation;
 use Ibexa\Contracts\Core\Repository\Values\User\Limitation\SubtreeLimitation;
@@ -1199,6 +1200,7 @@ public function testLoadRelationsWithUnauthorizedRelations()
          * @var \Ibexa\Contracts\Core\Repository\Values\Content\RelationList\RelationListItemInterface $relationListItem
          */
         foreach ($actualRelations as $relationListItem) {
+            /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Relation $relation */
             $relation = $relationListItem->getRelation();
             $destination = $relation->destinationContentInfo;
             $expected = $expectedRelations[$destination->id]->destinationContentInfo;
diff --git a/tests/integration/Core/Repository/ContentServiceTest.php b/tests/integration/Core/Repository/ContentServiceTest.php
@@ -2419,7 +2419,7 @@ public function testLoadContentDraftsReturnsEmptyArrayByDefault()
      *
      * @depends testCreateContentDraft
      */
-    public function testLoadContentDraftList()
+    public function testLoadContentDraftList(): void
     {
         // "Media" content object
         $mediaContentInfo = $this->contentService->loadContentInfoByRemoteId(self::MEDIA_REMOTE_ID);
@@ -2435,11 +2435,17 @@ public function testLoadContentDraftList()
         /** @var \Ibexa\Contracts\Core\Repository\Values\Content\DraftList\ContentDraftListItemInterface[] $draftedVersions */
         $draftedVersions = iterator_to_array($this->contentService->loadContentDraftList()->getIterator());
 
+        /** @var \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo $draftedVersionInfo0 */
+        $draftedVersionInfo0 = $draftedVersions[0]->getVersionInfo();
+
+        /** @var \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo $draftedVersionInfo1 */
+        $draftedVersionInfo1 = $draftedVersions[1]->getVersionInfo();
+
         $actual = [
-            $draftedVersions[0]->getVersionInfo()->status,
-            $draftedVersions[0]->getVersionInfo()->getContentInfo()->remoteId,
-            $draftedVersions[1]->getVersionInfo()->status,
-            $draftedVersions[1]->getVersionInfo()->getContentInfo()->remoteId,
+            $draftedVersionInfo0->status,
+            $draftedVersionInfo0->getContentInfo()->remoteId,
+            $draftedVersionInfo1->status,
+            $draftedVersionInfo1->getContentInfo()->remoteId,
         ];
         sort($actual, SORT_STRING);
 
@@ -2483,27 +2489,29 @@ public function testLoadContentDraftsWithFirstParameter()
 
         self::assertSame([], $oldCurrentUserDrafts);
 
+        /** @var \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo $newCurrentUserDraftVersionInfo */
+        $newCurrentUserDraftVersionInfo = $newCurrentUserDrafts[0]->getVersionInfo();
         self::assertEquals(
             [
                 VersionInfo::STATUS_DRAFT,
                 self::MEDIA_REMOTE_ID,
             ],
             [
-                $newCurrentUserDrafts[0]->getVersionInfo()->status,
-                $newCurrentUserDrafts[0]->getVersionInfo()->getContentInfo()->remoteId,
+                $newCurrentUserDraftVersionInfo->status,
+                $newCurrentUserDraftVersionInfo->getContentInfo()->remoteId,
             ]
         );
-        self::assertTrue($newCurrentUserDrafts[0]->getVersionInfo()->isDraft());
-        self::assertFalse($newCurrentUserDrafts[0]->getVersionInfo()->isArchived());
-        self::assertFalse($newCurrentUserDrafts[0]->getVersionInfo()->isPublished());
+        self::assertTrue($newCurrentUserDraftVersionInfo->isDraft());
+        self::assertFalse($newCurrentUserDraftVersionInfo->isArchived());
+        self::assertFalse($newCurrentUserDraftVersionInfo->isPublished());
     }
 
     /**
      * Test for the loadContentDraftList() method.
      *
      * @covers \Ibexa\Contracts\Core\Repository\ContentService::loadContentDraftList()
      */
-    public function testLoadContentDraftListWithPaginationParameters()
+    public function testLoadContentDraftListWithPaginationParameters(): void
     {
         // Create some drafts
         $publishedContent = $this->createContentVersion1();
@@ -2529,7 +2537,7 @@ public function testLoadContentDraftListWithPaginationParameters()
      *
      * @covers \Ibexa\Contracts\Core\Repository\ContentService::loadContentDraftList($user)
      */
-    public function testLoadContentDraftListWithForUserWithLimitation()
+    public function testLoadContentDraftListWithForUserWithLimitation(): void
     {
         $oldUser = $this->permissionResolver->getCurrentUserReference();
 
@@ -2568,7 +2576,7 @@ public function testLoadContentDraftListWithForUserWithLimitation()
      *
      * @covers \Ibexa\Contracts\Core\Repository\ContentService::loadContentDraftList()
      */
-    public function testLoadAllContentDraftList()
+    public function testLoadAllContentDraftList(): void
     {
         // Create more drafts then default pagination limit
         $this->createContentDrafts(12);
@@ -6757,7 +6765,7 @@ private function createParentLocationsForHideReveal(int $parentLocationId): arra
             $this->createFolder([self::ENG_US => 'P3'], $parentLocationId)->contentInfo->mainLocationId,
         ];
 
-        return array_values($this->locationService->loadLocationList($parentFoldersLocationsIds));
+        return array_values([...$this->locationService->loadLocationList($parentFoldersLocationsIds)]);
     }
 
     /**
diff --git a/tests/integration/Core/Repository/FieldType/RelationIntegrationTest.php b/tests/integration/Core/Repository/FieldType/RelationIntegrationTest.php
@@ -109,7 +109,7 @@ public function getSettingsSchema()
     }
 
     /**
-     * @covers \Ibexa\Contracts\Core\Repository\Tests\FieldType\BaseIntegrationTest::getValidatorSchema()
+     * @covers \Ibexa\Tests\Integration\Core\Repository\FieldType\BaseIntegrationTest::getValidatorSchema()
      */
     public function getValidatorSchema()
     {
@@ -230,10 +230,8 @@ public function provideInvalidCreationFieldData()
 
     /**
      * Get update field externals data.
-     *
-     * @return array
      */
-    public function getValidUpdateFieldData()
+    public function getValidUpdateFieldData(): RelationValue
     {
         return new RelationValue(49);
     }
@@ -242,10 +240,8 @@ public function getValidUpdateFieldData()
      * Get externals updated field data values.
      *
      * This is a PHPUnit data provider
-     *
-     * @return array
      */
-    public function assertUpdatedFieldDataLoadedCorrect(Field $field)
+    public function assertUpdatedFieldDataLoadedCorrect(Field $field): void
     {
         self::assertInstanceOf(RelationValue::class, $field->value);
 
@@ -271,7 +267,7 @@ public function provideInvalidUpdateFieldData()
      *
      * @param \Ibexa\Contracts\Core\Repository\Values\Content\Field $field
      */
-    public function assertCopiedFieldDataLoadedCorrectly(Field $field)
+    public function assertCopiedFieldDataLoadedCorrectly(Field $field): void
     {
         self::assertInstanceOf(
             RelationValue::class,
diff --git a/tests/integration/Core/Repository/FieldType/RelationListIntegrationTest.php b/tests/integration/Core/Repository/FieldType/RelationListIntegrationTest.php
@@ -259,10 +259,8 @@ public function provideInvalidCreationFieldData()
 
     /**
      * Get update field externals data.
-     *
-     * @return array
      */
-    public function getValidUpdateFieldData()
+    public function getValidUpdateFieldData(): RelationListValue
     {
         return new RelationListValue([49, 54, 4]);
     }
@@ -271,10 +269,8 @@ public function getValidUpdateFieldData()
      * Get externals updated field data values.
      *
      * This is a PHPUnit data provider
-     *
-     * @return array
      */
-    public function assertUpdatedFieldDataLoadedCorrect(Field $field)
+    public function assertUpdatedFieldDataLoadedCorrect(Field $field): void
     {
         self::assertInstanceOf(RelationListValue::class, $field->value);
 
@@ -300,7 +296,7 @@ public function provideInvalidUpdateFieldData()
      *
      * @param \Ibexa\Contracts\Core\Repository\Values\Content\Field $field
      */
-    public function assertCopiedFieldDataLoadedCorrectly(Field $field)
+    public function assertCopiedFieldDataLoadedCorrectly(Field $field): void
     {
         self::assertInstanceOf(
             RelationListValue::class,
diff --git a/tests/integration/Core/Repository/FieldType/RelationSearchBaseIntegrationTestTrait.php b/tests/integration/Core/Repository/FieldType/RelationSearchBaseIntegrationTestTrait.php
diff --git a/tests/lib/Helper/PreviewLocationProviderTest.php b/tests/lib/Helper/PreviewLocationProviderTest.php
diff --git a/tests/lib/IO/IOServiceTest.php b/tests/lib/IO/IOServiceTest.php
diff --git a/tests/lib/IO/TolerantIOServiceTest.php b/tests/lib/IO/TolerantIOServiceTest.php
diff --git a/tests/lib/MVC/Symfony/SiteAccess/RouterHostPortURITest.php b/tests/lib/MVC/Symfony/SiteAccess/RouterHostPortURITest.php
diff --git a/tests/lib/Repository/Decorator/ContentServiceDecoratorTest.php b/tests/lib/Repository/Decorator/ContentServiceDecoratorTest.php

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,6 @@ public function copyLegacyField(VersionInfo $versionInfo, Field $field, Field $o`
`131`	`131`	`*`
`132`	`132`	`* @param mixed $fieldId`
`133`	`133`	`* @param string $versionNo`
`134`		`- * @param array $context`
`135`	`134`	`*/`
`136`	`135`	`protected function removeOldFile($fieldId, $versionNo)`
`137`	`136`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,7 @@ public function getFieldData(VersionInfo $versionInfo, Field $field)`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/**`
`49`		`- * @param \Ibexa\Contracts\Core\Persistence\Content\VersionInfo $versionInfo`
`50`	`49`	`* @param int[] $fieldIds Array of field Ids`
`51`		`- * @param array $context`
`52`	`50`	`*`
`53`	`51`	`* @return bool`
`54`	`52`	`*`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function getRequest()`
`83`	`83`
`84`	`84`	`public function reverseMatch($siteAccessName)`
`85`	`85`	`{`
`86`		`- $hostElements = explode('.', $this->request->getHost());`
	`86`	`+ $hostElements = explode('.', (string)$this->request->getHost());`
`87`	`87`	`$elementNumber = $this->elementNumber - 1;`
`88`	`88`	`if (!isset($hostElements[$elementNumber])) {`
`89`	`89`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function getName(): string`
`30`	`30`	`public function setRequest(SimplifiedRequest $request): void`
`31`	`31`	`{`
`32`	`32`	`if (!$this->element) {`
`33`		`- $this->setMatchElement($request->getHost());`
	`33`	`+ $this->setMatchElement((string)$request->getHost());`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`parent::setRequest($request);`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function getName(): string`
`25`	`25`	`public function setRequest(SimplifiedRequest $request)`
`26`	`26`	`{`
`27`	`27`	`if (!$this->key) {`
`28`		`- $this->setMapKey($request->getHost());`
	`28`	`+ $this->setMapKey((string)$request->getHost());`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`parent::setRequest($request);`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function setRequest(SimplifiedRequest $request)`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`- $this->setMapKey($key);`
	`42`	`+ $this->setMapKey((string)$key);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`parent::setRequest($request);`
`@@ -49,7 +49,7 @@ public function reverseMatch($siteAccessName)`
`49`	`49`	`{`
`50`	`50`	`$matcher = parent::reverseMatch($siteAccessName);`
`51`	`51`	`if ($matcher instanceof self) {`
`52`		`- $matcher->getRequest()->setPort($matcher->getMapKey());`
	`52`	`+ $matcher->getRequest()->setPort((int)$matcher->getMapKey());`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`return $matcher;`