From b1c7d69b1cca6f7799e140d6262b83889f5b5c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20D=C3=BCnser?= Date: Thu, 25 Mar 2021 11:33:18 +0100 Subject: [PATCH 1/4] Fixed route provider regarding published state and ghost content --- Routing/ArticleRouteDefaultProvider.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Routing/ArticleRouteDefaultProvider.php b/Routing/ArticleRouteDefaultProvider.php index 9ec36b0fc..83e48fc26 100644 --- a/Routing/ArticleRouteDefaultProvider.php +++ b/Routing/ArticleRouteDefaultProvider.php @@ -118,7 +118,13 @@ public function getByEntity($entityClass, $id, $locale, $object = null) */ public function isPublished($entityClass, $id, $locale) { - $object = $this->documentManager->find($id, $locale); + $object = $this->documentManager->find( + $id, + $locale, + [ + 'load_ghost_content' => false, + ] + ); if (!$object instanceof ArticleInterface || WorkflowStage::PUBLISHED !== $object->getWorkflowStage()) { return false; From 4068ac0b170336f87949d759b642086707a7aab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20D=C3=BCnser?= Date: Thu, 25 Mar 2021 11:54:54 +0100 Subject: [PATCH 2/4] Added locale to test --- Tests/Unit/Routing/ArticleRouteDefaultProviderTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tests/Unit/Routing/ArticleRouteDefaultProviderTest.php b/Tests/Unit/Routing/ArticleRouteDefaultProviderTest.php index bb6c0205b..6c3fc7db7 100644 --- a/Tests/Unit/Routing/ArticleRouteDefaultProviderTest.php +++ b/Tests/Unit/Routing/ArticleRouteDefaultProviderTest.php @@ -100,9 +100,11 @@ public function setUp() public function publishedDataProvider() { $articleDocument = new ArticleDocument(); + $articleDocument->setLocale($this->locale); $articleDocument->setWorkflowStage(WorkflowStage::TEST); $articleDocumentPublished = new ArticleDocument(); + $articleDocumentPublished->setLocale($this->locale); $articleDocumentPublished->setWorkflowStage(WorkflowStage::PUBLISHED); $unknownDocument = new UnknownDocument(); From 0530977f5f416629ebf472d88d9c3c31bf49b145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20D=C3=BCnser?= Date: Thu, 25 Mar 2021 11:55:36 +0100 Subject: [PATCH 3/4] Replaced tab with spaces --- Tests/Unit/Routing/ArticleRouteDefaultProviderTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/Unit/Routing/ArticleRouteDefaultProviderTest.php b/Tests/Unit/Routing/ArticleRouteDefaultProviderTest.php index 6c3fc7db7..107b21a1e 100644 --- a/Tests/Unit/Routing/ArticleRouteDefaultProviderTest.php +++ b/Tests/Unit/Routing/ArticleRouteDefaultProviderTest.php @@ -100,11 +100,11 @@ public function setUp() public function publishedDataProvider() { $articleDocument = new ArticleDocument(); - $articleDocument->setLocale($this->locale); + $articleDocument->setLocale($this->locale); $articleDocument->setWorkflowStage(WorkflowStage::TEST); $articleDocumentPublished = new ArticleDocument(); - $articleDocumentPublished->setLocale($this->locale); + $articleDocumentPublished->setLocale($this->locale); $articleDocumentPublished->setWorkflowStage(WorkflowStage::PUBLISHED); $unknownDocument = new UnknownDocument(); From 2d99e416c787409b3de2edebed2c63e79aa27058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20D=C3=BCnser?= Date: Thu, 25 Mar 2021 12:54:30 +0100 Subject: [PATCH 4/4] Fixed test --- Tests/Unit/Routing/ArticleRouteDefaultProviderTest.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Tests/Unit/Routing/ArticleRouteDefaultProviderTest.php b/Tests/Unit/Routing/ArticleRouteDefaultProviderTest.php index 107b21a1e..fce25d558 100644 --- a/Tests/Unit/Routing/ArticleRouteDefaultProviderTest.php +++ b/Tests/Unit/Routing/ArticleRouteDefaultProviderTest.php @@ -100,11 +100,9 @@ public function setUp() public function publishedDataProvider() { $articleDocument = new ArticleDocument(); - $articleDocument->setLocale($this->locale); $articleDocument->setWorkflowStage(WorkflowStage::TEST); $articleDocumentPublished = new ArticleDocument(); - $articleDocumentPublished->setLocale($this->locale); $articleDocumentPublished->setWorkflowStage(WorkflowStage::PUBLISHED); $unknownDocument = new UnknownDocument(); @@ -132,7 +130,13 @@ public function testIsPublished( $this->webspaceResolver->resolveAdditionalWebspaces($document)->willReturn($documentAdditionalWebspaces); } - $this->documentManager->find($this->entityId, $this->locale)->willReturn($document); + $this->documentManager->find( + $this->entityId, + $this->locale, + [ + 'load_ghost_content' => false, + ] + )->willReturn($document); $webspace = $this->prophesize(Webspace::class); $webspace->getKey()->willReturn($webspaceKey);