Fix issue with none existing webspace in requestAnalyzer in asnyc pro…

…cesses
sulu · Nov 26, 2024 · 21c03cc · 21c03cc
1 parent ef1f0dc
commit 21c03cc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/Document/Structure/ContentProxyFactory.php b/Document/Structure/ContentProxyFactory.php
@@ -43,7 +43,7 @@ class ContentProxyFactory
     public function __construct(
         ContentTypeManagerInterface $contentTypeManager,
         LazyLoadingValueHolderFactory $proxyFactory,
-        RequestStack $requestStack,
+        RequestStack $requestStack
     ) {
         $this->contentTypeManager = $contentTypeManager;
         $this->proxyFactory = $proxyFactory;
@@ -150,17 +150,16 @@ private function getWebspaceKey(): ?string
             return null;
         }
 
-        if ($attributes->hasAttribute('webspaceKey')) {
-            return $attributes->getAttribute('webspaceKey');
+        $webspaceKey = $attributes->getAttribute('webspaceKey');
+        if (\is_string($webspaceKey) && '' !== $webspaceKey) {
+            return $webspaceKey;
         }
 
-        if ($attributes->hasAttribute('webspace')) {
-            $webspace = $attributes->getAttribute('webspace');
-            if ($webspace instanceof Webspace) {
-                return $webspace->getKey();
-            } elseif (\is_string($webspace) && '' !== $webspace) {
-                return $webspace;
-            }
+        $webspace = $attributes->getAttribute('webspace');
+        if ($webspace instanceof Webspace) {
+            return $webspace->getKey();
+        } elseif (\is_string($webspace) && '' !== $webspace) {
+            return $webspace;
         }
 
         return null;

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1460,11 +1460,6 @@ parameters:
 			count: 1
 			path: Document/Structure/ContentProxyFactory.php
 
-		-
-			message: "#^Negated boolean expression is always false\\.$#"
-			count: 1
-			path: Document/Structure/ContentProxyFactory.php
-
 		-
 			message: "#^Parameter \\#1 \\$webspace of method Sulu\\\\Component\\\\Content\\\\Compat\\\\StructureInterface\\:\\:setWebspaceKey\\(\\) expects string, string\\|null given\\.$#"
 			count: 2