Merge remote-tracking branch 'origin/1.4' into 2.x

# Conflicts:
#	src/Lib/Cache/RuntimeCacheResolver.php
#	src/Lib/CacheResolver.php
#	src/Lib/ToolResolver.php
#	src/Lib/ToolResolverInterface.php
#	src/Lib/Tools/Authentication/AuthenticationResolver.php

src/Db/DbResolver.php

@@ -19,6 +19,9 @@
 use Doctrine\DBAL\Connection;
 use Pimcore\Db;
 
+/**
+ * @deprecated Will be marked as internal and final in v2.0.0
+ */
 class DbResolver implements DbResolverInterface
 {
     public function getConnection(): Connection

src/Db/DbResolverInterface.php

@@ -18,6 +18,9 @@
 
 use Doctrine\DBAL\Connection;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface DbResolverInterface
 {
     public function getConnection(): Connection;

src/Lib/Cache/RuntimeCacheResolver.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Cache\RuntimeCache;
 
+/**
+ * @deprecated Will be marked as internal and final in v2.0.0
+ */
 final class RuntimeCacheResolver implements RuntimeCacheResolverInterface
 {
     public function load(string $id): mixed

src/Lib/Cache/RuntimeCacheResolverInterface.php

@@ -16,6 +16,9 @@
 
 namespace Pimcore\Bundle\StaticResolverBundle\Lib\Cache;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface RuntimeCacheResolverInterface
 {
     public function load(string $id): mixed;

src/Lib/CacheResolver.php

@@ -19,6 +19,9 @@
 use DateInterval;
 use Pimcore\Cache;
 
+/**
+ * @deprecated Will be marked as internal and final in v2.0.0
+ */
 final class CacheResolver implements CacheResolverInterface
 {
     public function save(

src/Lib/ToolResolver.php

@@ -20,6 +20,9 @@
 use Pimcore\Mail;
 use Pimcore\Tool;
 
+/**
+ * @deprecated Will be marked as internal and final in v2.0.0
+ */
 final class ToolResolver implements ToolResolverInterface
 {
     public function getValidLanguages(): array

src/Lib/ToolResolverInterface.php

@@ -16,9 +16,13 @@
 
 namespace Pimcore\Bundle\StaticResolverBundle\Lib;
 
+
 use Exception;
 use Pimcore\Mail;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface ToolResolverInterface
 {
     public function getValidLanguages(): array;

src/Lib/Tools/Authentication/AuthenticationResolver.php

@@ -20,6 +20,9 @@
 use Pimcore\Tool\Authentication;
 use Symfony\Component\HttpFoundation\Request;
 
+/**
+ * @deprecated Will be marked as internal and final in v2.0.0
+ */
 final class AuthenticationResolver implements AuthenticationResolverInterface
 {
     public function authenticateSession(Request $request = null): ?User

src/Lib/Tools/Authentication/AuthenticationResolverInterface.php

@@ -19,6 +19,9 @@
 use Pimcore\Model\User;
 use Symfony\Component\HttpFoundation\Request;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface AuthenticationResolverInterface
 {
     public function authenticateSession(Request $request = null): ?User;

src/Models/Asset/AssetResolverInterface.php

@@ -19,6 +19,9 @@
 use Pimcore\Model\Asset;
 use Pimcore\Model\Asset\Listing;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface AssetResolverInterface
 {
     public function getById(int|string $id, array $params = []): ?Asset;

src/Models/Asset/AssetServiceResolverInterface.php

@@ -19,6 +19,9 @@
 use Pimcore\Model\Asset;
 use Pimcore\Model\Asset\Folder;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface AssetServiceResolverInterface
 {
     public function rewriteIds(Asset $asset, array $rewriteConfig): Asset;

src/Models/DataObject/ClassDefinitionResolver.php

@@ -19,6 +19,9 @@
 use Exception;
 use Pimcore\Model\DataObject\ClassDefinition;
 
+/**
+ * @deprecated Will be marked as internal and final in v2.0.0
+ */
 class ClassDefinitionResolver implements ClassDefinitionResolverInterface
 {
     /**

src/Models/DataObject/ClassDefinitionResolverInterface.php

@@ -19,6 +19,9 @@
 use Exception;
 use Pimcore\Model\DataObject\ClassDefinition;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface ClassDefinitionResolverInterface
 {
     /**

src/Models/DataObject/ClassificationStore/ServiceResolverInterface.php

@@ -21,6 +21,9 @@
 use Pimcore\Model\DataObject\Classificationstore\KeyConfig;
 use Pimcore\Model\DataObject\Classificationstore\KeyGroupRelation;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface ServiceResolverInterface
 {
     public function getFieldDefinitionFromKeyConfig(

src/Models/DataObject/ConcreteObjectResolver.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Model\DataObject\Concrete;
 
+/**
+ * @deprecated Will be marked as internal and final in v2.0.0
+ */
 class ConcreteObjectResolver implements ConcreteObjectResolverInterface
 {
     public function getById(int $id, array $params = []): null|Concrete

src/Models/DataObject/ConcreteObjectResolverInterface.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Model\DataObject\Concrete;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface ConcreteObjectResolverInterface
 {
     public function getById(int $id, array $params = []): null|Concrete;

src/Models/DataObject/DataObjectResolverInterface.php

@@ -19,6 +19,9 @@
 use Pimcore\Model\DataObject;
 use Pimcore\Model\DataObject\Listing;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface DataObjectResolverInterface
 {
     public function getById(int|string $id, array $params = []): ?DataObject;

src/Models/DataObject/DataObjectServiceResolverInterface.php

@@ -21,6 +21,9 @@
 use Pimcore\Model\DataObject\Concrete;
 use Pimcore\Model\DataObject\Folder;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface DataObjectServiceResolverInterface
 {
     public function useInheritedValues(

src/Models/DataObject/FieldCollection/DefinitionResolverInterface.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Model\DataObject\Fieldcollection\Definition;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface DefinitionResolverInterface
 {
     public function getByKey(string $key): ?Definition;

src/Models/DataObject/Objectbrick/DefinitionResolver.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Model\DataObject\Objectbrick\Definition;
 
+/**
+ * @deprecated Will be marked as internal and final in v2.0.0
+ */
 class DefinitionResolver implements DefinitionResolverInterface
 {
     public function getByKey(string $key): ?Definition

src/Models/DataObject/Objectbrick/DefinitionResolverInterface.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Model\DataObject\Objectbrick\Definition;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface DefinitionResolverInterface
 {
     public function getByKey(string $key): ?Definition;

src/Models/DataObject/QuantityValue/UnitResolverInterface.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Model\DataObject\QuantityValue\Unit;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface UnitResolverInterface
 {
     public function getById(string $id): ?Unit;

src/Models/Document/DocumentResolverInterface.php

@@ -19,6 +19,9 @@
 use Pimcore\Model\Document;
 use Pimcore\Model\Document\Listing;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface DocumentResolverInterface
 {
     public function getById(int|string $id, array $params = []): ?Document;

src/Models/Document/DocumentServiceResolverInterface.php

@@ -20,6 +20,9 @@
 use Pimcore\Model\Document\Folder;
 use Pimcore\Model\Document\PageSnippet;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface DocumentServiceResolverInterface
 {
     public function rewriteIds(

src/Models/Element/ServiceResolver.php

@@ -23,6 +23,9 @@
 use Pimcore\Model\Element\Service;
 use Pimcore\Model\User;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 final class ServiceResolver implements ServiceResolverInterface
 {
     public function getElementById(string $type, int|string $id, array $params = []): Asset|Document|AbstractObject|null

src/Models/Element/ServiceResolverInterface.php

@@ -23,6 +23,9 @@
 use Pimcore\Model\Element\ElementInterface;
 use Pimcore\Model\User;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface ServiceResolverInterface
 {
     public function getElementById(

src/Models/Schedule/TaskResolver.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Model\Schedule\Task;
 
+/**
+ * @deprecated Will be marked as internal and final in v2.0.0
+ */
 class TaskResolver implements TaskResolverInterface
 {
     public function getById(int $id): ?Task

src/Models/Schedule/TaskResolverInterface.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Model\Schedule\Task;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface TaskResolverInterface
 {
     public function getById(int $id): ?Task;

src/Models/Tool/SettingsStoreResolverInterface.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Model\Tool\SettingsStore;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface SettingsStoreResolverInterface
 {
     public function set(string $id, float|bool|int|string $data, string $type = 'string', ?string $scope = null): bool;

src/Models/Tool/TmpStoreResolver.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Model\Tool\TmpStore;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 final class TmpStoreResolver implements TmpStoreResolverInterface
 {
     public function add(string $id, mixed $data, ?string $tag = null, ?int $lifetime = null): bool

src/Models/Tool/TmpStoreResolverInterface.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Model\Tool\TmpStore;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface TmpStoreResolverInterface
 {
     public function add(string $id, mixed $data, ?string $tag, ?int $lifetime): bool;

src/Models/User/Permission/DefinitionResolverInterface.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Model\User\Permission\Definition;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface DefinitionResolverInterface
 {
     public function getByKey(string $permission): ?Definition;

src/Models/User/UserResolver.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Model\User;
 
+/**
+ * @deprecated Will be marked as internal and final in v2.0.0
+ */
 class UserResolver implements UserResolverInterface
 {
     public function getById(int $id): ?User

src/Models/User/UserResolverInterface.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Model\User;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface UserResolverInterface
 {
     public function getById(int $id): ?User;

src/Models/Version/VersionResolver.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Model\Version;
 
+/**
+ * @deprecated Will be marked as internal and final in v2.0.0
+ */
 class VersionResolver implements VersionResolverInterface
 {
     public function enable(): void

src/Models/Version/VersionResolverInterface.php

@@ -18,6 +18,9 @@
 
 use Pimcore\Model\Version;
 
+/**
+ * @deprecated Will be marked as internal in v2.0.0
+ */
 interface VersionResolverInterface
 {
     public function enable(): void;