Merge branch '2.4' of https://github.com/sulu/sulu into 2.5

Conflicts: src/Sulu/Component/Content/Tests/Unit/Document/Subscriber/WebspaceSubscriberTest.php
sulu · Feb 15, 2023 · 675ea77 · 675ea77
2 parents af5f440 + cad4ed9
commit 675ea77
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -42805,11 +42805,6 @@ parameters:
 			count: 1
 			path: src/Sulu/Component/Content/Document/Subscriber/TitleSubscriber.php
 
-		-
-			message: "#^Cannot call method getAllLocalizations\\(\\) on Sulu\\\\Component\\\\Webspace\\\\Webspace\\|null\\.$#"
-			count: 1
-			path: src/Sulu/Component/Content/Document/Subscriber/WebspaceSubscriber.php
-
 		-
 			message: "#^Cannot call method remove\\(\\) on mixed\\.$#"
 			count: 1

diff --git a/src/Sulu/Component/Content/Document/Subscriber/WebspaceSubscriber.php b/src/Sulu/Component/Content/Document/Subscriber/WebspaceSubscriber.php
@@ -86,6 +86,9 @@ public function deleteUnavailableLocales(CopyEvent $event)
         );
 
         $webspace = $this->webspaceManager->findWebspaceByKey($this->documentInspector->getWebspace($copiedDocument));
+        if (!$webspace) {
+            return;
+        }
 
         $webspaceLocales = \array_map(function($localization) {
             return $localization->getLocale();

diff --git a/src/Sulu/Component/Content/Tests/Unit/Document/Subscriber/WebspaceSubscriberTest.php b/src/Sulu/Component/Content/Tests/Unit/Document/Subscriber/WebspaceSubscriberTest.php
@@ -13,11 +13,13 @@
 
 use PHPCR\NodeInterface;
 use PHPCR\PropertyInterface;
+use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Sulu\Bundle\DocumentManagerBundle\Bridge\DocumentInspector;
 use Sulu\Component\Content\Document\Behavior\WebspaceBehavior;
 use Sulu\Component\Content\Document\Subscriber\WebspaceSubscriber;
+use Sulu\Component\DocumentManager\Document\UnknownDocument;
 use Sulu\Component\DocumentManager\DocumentManagerInterface;
 use Sulu\Component\DocumentManager\Event\CopyEvent;
 use Sulu\Component\Localization\Localization;
@@ -122,4 +124,28 @@ public function testDeleteUnavailableLocales(): void
         $germanProperty2->remove()->shouldBeCalled();
         $englishProperty1->remove()->shouldNotBeCalled();
     }
+
+    public function testDeleteUnavailableLocalesNoneWebspaceDocument(): void
+    {
+        $copyEvent = $this->prophesize(CopyEvent::class);
+
+        $document = $this->prophesize(UnknownDocument::class);
+        $this->inspector->getLocale($document)->willReturn('fr');
+        $copyEvent->getDocument()->willReturn($document->reveal());
+
+        $copyEvent->getCopiedPath()->willReturn('/cmf/test_io/contents');
+
+        $copiedNode = $this->prophesize(NodeInterface::class);
+        $copyEvent->getCopiedNode()->willReturn($copiedNode->reveal());
+
+        $copiedDocument = $this->prophesize(UnknownDocument::class);
+        $this->documentManager->find('/cmf/test_io/contents', 'fr')->willReturn($copiedDocument->reveal());
+        $this->inspector->getWebspace($copiedDocument)->willReturn(null);
+
+        $this->webspaceManager->findWebspaceByKey(null)->willReturn(null);
+
+        $this->inspector->getLocales(Argument::any())->shouldNotBecalled();
+
+        $this->subscriber->deleteUnavailableLocales($copyEvent->reveal());
+    }
 }