Merged branch '4.6'

phpstan-baseline.neon

@@ -9210,11 +9210,6 @@ parameters:
 			count: 1
 			path: src/lib/FieldType/Image/ImageStorage/Gateway/DoctrineStorage.php
 
-		-
-			message: "#^Cannot call method warning\\(\\) on Psr\\\\Log\\\\LoggerInterface\\|null\\.$#"
-			count: 2
-			path: src/lib/FieldType/Image/ImageThumbnailStrategy.php
-
 		-
 			message: "#^Parameter \\#3 \\$pad_string of function str_pad expects string, int given\\.$#"
 			count: 1
@@ -58050,11 +58045,6 @@ parameters:
 			count: 1
 			path: tests/lib/Repository/SiteAccessAware/AbstractServiceTest.php
 
-		-
-			message: "#^Trying to invoke Closure\\|null but it might not be a callable\\.$#"
-			count: 2
-			path: tests/lib/Repository/SiteAccessAware/AbstractServiceTest.php
-
 		-
 			message: "#^Unable to resolve the template type T in call to method PHPUnit\\\\Framework\\\\TestCase\\:\\:getMockBuilder\\(\\)$#"
 			count: 1

src/contracts/Persistence/Content/ContentInfo.php

@@ -20,7 +20,7 @@ class ContentInfo extends ValueObject
     public const STATUS_PUBLISHED = 1;
     public const STATUS_TRASHED = 2;
 
-    /** @deprecated Use ContentInfo::STATUS_TRASHED */
+    /** @deprecated Use {@see ContentInfo::STATUS_TRASHED} */
     public const STATUS_ARCHIVED = self::STATUS_TRASHED;
 
     /**
@@ -60,7 +60,7 @@ class ContentInfo extends ValueObject
     public $currentVersionNo;
 
     /**
-     * @deprecated Use SPI\ContentInfo::$status (with value ContentInfo::STATUS_PUBLISHED)
+     * @deprecated Use {@see ContentInfo::$status} (with value {@see ContentInfo::STATUS_PUBLISHED})
      *
      * Flag indicating if content is currently published.
      *
@@ -123,7 +123,7 @@ class ContentInfo extends ValueObject
     /**
      * Status of the content.
      *
-     * Replaces deprecated SPI\ContentInfo::$isPublished.
+     * Replaces deprecated {@see ContentInfo::$isPublished}.
      *
      * @var int
      */

src/contracts/Persistence/Content/Handler.php

@@ -284,7 +284,7 @@ public function removeRelation($relationId, $type, ?int $destinationContentId =
     /**
      * Loads relations from $sourceContentId. Optionally, loads only those with $type and $sourceContentVersionNo.
      *
-     * @deprecated 4.5.7 The "ContentService::loadRelations()" method is deprecated, will be removed in 5.0.
+     * @deprecated 4.5.7 It will be removed in 5.0. Use {@see \Ibexa\Contracts\Core\Repository\ContentService::loadRelationList()} instead.
      *
      * @param mixed $sourceContentId Source Content ID
      * @param mixed|null $sourceContentVersionNo Source Content Version, null if not specified