Skip to content

Commit 22eca72

Browse files
committed
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
2 parents 695458d + ee1c5e1 commit 22eca72

36 files changed

+109
-0
lines changed

src/Db/DbResolver.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
use Doctrine\DBAL\Connection;
2020
use Pimcore\Db;
2121

22+
/**
23+
* @deprecated Will be marked as internal and final in v2.0.0
24+
*/
2225
class DbResolver implements DbResolverInterface
2326
{
2427
public function getConnection(): Connection

src/Db/DbResolverInterface.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818

1919
use Doctrine\DBAL\Connection;
2020

21+
/**
22+
* @deprecated Will be marked as internal in v2.0.0
23+
*/
2124
interface DbResolverInterface
2225
{
2326
public function getConnection(): Connection;

src/Lib/Cache/RuntimeCacheResolver.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818

1919
use Pimcore\Cache\RuntimeCache;
2020

21+
/**
22+
* @deprecated Will be marked as internal and final in v2.0.0
23+
*/
2124
final class RuntimeCacheResolver implements RuntimeCacheResolverInterface
2225
{
2326
public function load(string $id): mixed

src/Lib/Cache/RuntimeCacheResolverInterface.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
namespace Pimcore\Bundle\StaticResolverBundle\Lib\Cache;
1818

19+
/**
20+
* @deprecated Will be marked as internal in v2.0.0
21+
*/
1922
interface RuntimeCacheResolverInterface
2023
{
2124
public function load(string $id): mixed;

src/Lib/CacheResolver.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
use DateInterval;
2020
use Pimcore\Cache;
2121

22+
/**
23+
* @deprecated Will be marked as internal and final in v2.0.0
24+
*/
2225
final class CacheResolver implements CacheResolverInterface
2326
{
2427
public function save(

src/Lib/ToolResolver.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
use Pimcore\Mail;
2121
use Pimcore\Tool;
2222

23+
/**
24+
* @deprecated Will be marked as internal and final in v2.0.0
25+
*/
2326
final class ToolResolver implements ToolResolverInterface
2427
{
2528
public function getValidLanguages(): array

src/Lib/ToolResolverInterface.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,13 @@
1616

1717
namespace Pimcore\Bundle\StaticResolverBundle\Lib;
1818

19+
1920
use Exception;
2021
use Pimcore\Mail;
2122

23+
/**
24+
* @deprecated Will be marked as internal in v2.0.0
25+
*/
2226
interface ToolResolverInterface
2327
{
2428
public function getValidLanguages(): array;

src/Lib/Tools/Authentication/AuthenticationResolver.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
use Pimcore\Tool\Authentication;
2121
use Symfony\Component\HttpFoundation\Request;
2222

23+
/**
24+
* @deprecated Will be marked as internal and final in v2.0.0
25+
*/
2326
final class AuthenticationResolver implements AuthenticationResolverInterface
2427
{
2528
public function authenticateSession(Request $request = null): ?User

src/Lib/Tools/Authentication/AuthenticationResolverInterface.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
use Pimcore\Model\User;
2020
use Symfony\Component\HttpFoundation\Request;
2121

22+
/**
23+
* @deprecated Will be marked as internal in v2.0.0
24+
*/
2225
interface AuthenticationResolverInterface
2326
{
2427
public function authenticateSession(Request $request = null): ?User;

src/Models/Asset/AssetResolverInterface.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
use Pimcore\Model\Asset;
2020
use Pimcore\Model\Asset\Listing;
2121

22+
/**
23+
* @deprecated Will be marked as internal in v2.0.0
24+
*/
2225
interface AssetResolverInterface
2326
{
2427
public function getById(int|string $id, array $params = []): ?Asset;

0 commit comments

Comments
 (0)