IBX-9727: Improved SiteaccessGuesser after core content VO strict types changes (#92)

For more details see https://issues.ibexa.co/browse/IBX-9727 and #92

Key changes:

* Improved SiteaccessGuesser after core content VO strict types changes

* [PHPStan] Removed resolved issues from the baseline

Author: alongosz

phpstan-baseline.neon

@@ -816,30 +816,6 @@ parameters:
 			count: 1
 			path: src/lib/Resolver/SelectionFieldResolver.php
 
-		-
-			message: '#^Method Ibexa\\GraphQL\\Resolver\\SiteaccessGuesser\\SiteaccessGuesser\:\:__construct\(\) has parameter \$siteAccessGroups with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/lib/Resolver/SiteaccessGuesser/SiteaccessGuesser.php
-
-		-
-			message: '#^Method Ibexa\\GraphQL\\Resolver\\SiteaccessGuesser\\SiteaccessGuesser\:\:guessForLocation\(\) should return Ibexa\\Core\\MVC\\Symfony\\SiteAccess but returns Ibexa\\Core\\MVC\\Symfony\\SiteAccess\|null\.$#'
-			identifier: return.type
-			count: 1
-			path: src/lib/Resolver/SiteaccessGuesser/SiteaccessGuesser.php
-
-		-
-			message: '#^Property Ibexa\\GraphQL\\Resolver\\SiteaccessGuesser\\SiteaccessGuesser\:\:\$siteAccessGroups type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/lib/Resolver/SiteaccessGuesser/SiteaccessGuesser.php
-
-		-
-			message: '#^Variable \$saList in PHPDoc tag @var does not match assigned variable \$matchingSiteaccessRootDepth\.$#'
-			identifier: varTag.differentVariable
-			count: 1
-			path: src/lib/Resolver/SiteaccessGuesser/SiteaccessGuesser.php
-
 		-
 			message: '#^Method Ibexa\\GraphQL\\Resolver\\ThumbnailResolver\:\:resolveThumbnail\(\) return type has no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue

src/lib/Resolver/SiteaccessGuesser/SiteaccessGuesser.php

@@ -24,8 +24,12 @@ class SiteaccessGuesser
 
     private SiteAccessServiceInterface $siteAccessService;
 
+    /** @var array<string, string> */
     private array $siteAccessGroups;
 
+    /**
+     * @param array<string, string> $siteAccessGroups
+     */
     public function __construct(
         SiteAccessServiceInterface $siteAccessService,
         SiteAccessProviderInterface $provider,
@@ -45,56 +49,55 @@ public function guessForLocation(Location $location): SiteAccess
     {
         // Test if the location is part of the current tree root, as it is the most likely
         $treeRootLocationId = $this->configResolver->getParameter('content.tree_root.location_id');
-        if ($this->isInSubtree($location, $treeRootLocationId)) {
-            return $this->siteAccessService->getCurrent();
+        if ($this->getDepthInSubtree($location, $treeRootLocationId) !== false) {
+            return $this->siteAccessService->getCurrent() ?? throw new NoValidSiteaccessException($location);
         }
 
-        // we won't look into siteaccesses that don't use the same repository
+        // we won't look into SiteAccess-es that don't use the same repository
         $currentRepository = $this->configResolver->getParameter('repository');
 
+        $matchingSiteAccessRootDepth = 0;
         /** @var \Ibexa\Core\MVC\Symfony\SiteAccess[] $saList */
-        $matchingSiteaccessRootDepth = 0;
         $saList = iterator_to_array($this->provider->getSiteAccesses());
 
-        foreach ($saList as $siteaccess) {
-            $repository = $this->configResolver->getParameter('repository', 'ibexa.site_access.config', $siteaccess->name);
-
-            if ($repository !== $currentRepository) {
-                continue;
-            }
+        foreach ($saList as $siteAccess) {
+            $repository = $this->configResolver->getParameter('repository', 'ibexa.site_access.config', $siteAccess->name);
 
-            if ($this->isAdminSiteaccess($siteaccess)) {
+            if ($repository !== $currentRepository || $this->isAdminSiteAccess($siteAccess)) {
                 continue;
             }
 
-            $treeRootLocationId = $this->configResolver->getParameter('content.tree_root.location_id', 'ibexa.site_access.config', $siteaccess->name);
-            if (($rootDepth = $this->isInSubtree($location, $treeRootLocationId)) !== false) {
-                if ($rootDepth > $matchingSiteaccessRootDepth) {
-                    $matchingSiteaccess = $siteaccess;
-                    $matchingSiteaccessRootDepth = $rootDepth;
-                }
+            $treeRootLocationId = $this->configResolver->getParameter(
+                'content.tree_root.location_id',
+                'ibexa.site_access.config',
+                $siteAccess->name
+            );
+            $rootDepth = $this->getDepthInSubtree($location, $treeRootLocationId);
+            if ($rootDepth !== false && $rootDepth > $matchingSiteAccessRootDepth) {
+                $matchingSiteAccess = $siteAccess;
+                $matchingSiteAccessRootDepth = $rootDepth;
             }
         }
 
-        if (!isset($matchingSiteaccess)) {
+        if (!isset($matchingSiteAccess)) {
             throw new NoValidSiteaccessException($location);
         }
 
-        return $matchingSiteaccess;
+        return $matchingSiteAccess;
     }
 
     /**
      * Tests if $location is part of a subtree, and returns the root depth.
      *
      * @return int|false The root depth (used to select the deepest, most specific tree root), false if it isn't part of that subtree.
      */
-    private function isInSubtree(Location $location, int $treeRootLocationId): int|string|false
+    private function getDepthInSubtree(Location $location, int $treeRootLocationId): int|false
     {
-        return array_search($treeRootLocationId, $location->path);
+        return array_search($treeRootLocationId, array_map('intval', $location->getPath()), true);
     }
 
-    private function isAdminSiteaccess(SiteAccess $siteaccess): bool
+    private function isAdminSiteAccess(SiteAccess $siteAccess): bool
     {
-        return (new IsAdmin($this->siteAccessGroups))->isSatisfiedBy($siteaccess);
+        return (new IsAdmin($this->siteAccessGroups))->isSatisfiedBy($siteAccess);
     }
 }