From 8e28b06bd77fa183be4bd5ca19e8a3aa800fec41 Mon Sep 17 00:00:00 2001 From: Prokyonn Date: Thu, 20 Jun 2024 13:12:09 +0200 Subject: [PATCH] Fix backward compatibility --- Tests/Application/.env | 2 +- .../Provider/ArticleReferenceProviderTest.php | 21 ++++++++++++------- .../Refresh/ArticleReferenceRefresherTest.php | 1 + 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Tests/Application/.env b/Tests/Application/.env index e0465258..25b858f4 100644 --- a/Tests/Application/.env +++ b/Tests/Application/.env @@ -1,5 +1,5 @@ APP_ENV=test -DATABASE_URL=mysql://root:root@127.0.0.1:3306/sulu_article_test?serverVersion=5.7 +DATABASE_URL=mysql://root:@127.0.0.1:3306/sulu_test?serverVersion=5.7 DATABASE_CHARSET=utf8mb4 DATABASE_COLLATE=utf8mb4_unicode_ci ELASTICSEARCH_HOST=127.0.0.1:9200 diff --git a/Tests/Functional/Reference/Provider/ArticleReferenceProviderTest.php b/Tests/Functional/Reference/Provider/ArticleReferenceProviderTest.php index 844b04f9..7cc523b0 100644 --- a/Tests/Functional/Reference/Provider/ArticleReferenceProviderTest.php +++ b/Tests/Functional/Reference/Provider/ArticleReferenceProviderTest.php @@ -23,27 +23,35 @@ use Sulu\Component\DocumentManager\DocumentManagerInterface; use Sulu\Component\HttpKernel\SuluKernel; use Sulu\Component\Persistence\Repository\ORM\EntityRepository; -use Sulu\Component\PHPCR\SessionManager\SessionManager; class ArticleReferenceProviderTest extends SuluTestCase { - private ArticleReferenceProvider $articleReferenceProvider; - private DocumentManagerInterface $documentManager; - private SessionManager $sessionManager; + /** + * @var ArticleReferenceProvider + */ + private $articleReferenceProvider; + + /** + * @var DocumentManagerInterface + */ + private $documentManager; /** * @var EntityRepository */ - private EntityRepository $referenceRepository; + private $referenceRepository; public function setUp(): void { $this->purgeDatabase(); $this->initPhpcr(); + if (!\interface_exists(ReferenceRefresherInterface::class)) { + return; + } + $this->articleReferenceProvider = $this->getContainer()->get('sulu_article.reference_provider'); $this->documentManager = $this->getContainer()->get('sulu_document_manager.document_manager'); - $this->sessionManager = $this->getContainer()->get('sulu.phpcr.session'); $this->referenceRepository = $this->getContainer()->get('sulu.repository.reference'); } @@ -97,7 +105,6 @@ public function testUpdateUnpublishedReferences(): void // refresh services from new kernel $this->articleReferenceProvider = $this->getContainer()->get('sulu_article.reference_provider'); $this->documentManager = $this->getContainer()->get('sulu_document_manager.document_manager'); - $this->sessionManager = $this->getContainer()->get('sulu.phpcr.session'); $this->referenceRepository = $this->getContainer()->get('sulu.repository.reference'); /** @var ArticleDocument $article */ diff --git a/Tests/Functional/Reference/Refresh/ArticleReferenceRefresherTest.php b/Tests/Functional/Reference/Refresh/ArticleReferenceRefresherTest.php index 3291fcb9..a674ae77 100644 --- a/Tests/Functional/Reference/Refresh/ArticleReferenceRefresherTest.php +++ b/Tests/Functional/Reference/Refresh/ArticleReferenceRefresherTest.php @@ -48,6 +48,7 @@ public function setUp(): void if (!\interface_exists(ReferenceRefresherInterface::class)) { return; } + $this->articleReferenceRefresher = $this->getContainer()->get('sulu_article.article_reference_refresher'); $this->documentManager = $this->getContainer()->get('sulu_document_manager.document_manager'); $this->referenceRepository = $this->getContainer()->get('sulu.repository.reference');