IBX-12192: Added SiteAccess::MATCHING_TYPE_UNINITIALIZED constant

phpstan-baseline.neon

@@ -15294,18 +15294,6 @@ parameters:
 			count: 1
 			path: src/lib/MVC/Symfony/SiteAccess/SiteAccessProviderInterface.php
 
-		-
-			message: '#^Property Ibexa\\Core\\MVC\\Symfony\\SiteAccess\\SiteAccessService\:\:\$siteAccess \(Ibexa\\Core\\MVC\\Symfony\\SiteAccess\) does not accept Ibexa\\Core\\MVC\\Symfony\\SiteAccess\|null\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: src/lib/MVC/Symfony/SiteAccess/SiteAccessService.php
-
-		-
-			message: '#^Property Ibexa\\Core\\MVC\\Symfony\\SiteAccess\\SiteAccessService\:\:\$siteAccess \(Ibexa\\Core\\MVC\\Symfony\\SiteAccess\) on left side of \?\? is not nullable\.$#'
-			identifier: nullCoalesce.property
-			count: 1
-			path: src/lib/MVC/Symfony/SiteAccess/SiteAccessService.php
-
 		-
 			message: '#^Method Ibexa\\Core\\MVC\\Symfony\\Templating\\Exception\\InvalidResponseException\:\:addParameter\(\) has no return type specified\.$#'
 			identifier: missingType.return

src/bundle/Core/DependencyInjection/Configuration/ConfigResolver.php

@@ -222,7 +222,7 @@
         $this->defaultScope = $scope;
 
         // On scope change check if siteaccess has been updated so we can log warnings if there are any
-        if ($this->siteAccess->matchingType !== 'uninitialized') {
+        if ($this->siteAccess->matchingType !== SiteAccess::MATCHING_TYPE_UNINITIALIZED) {
             $this->warnAboutTooEarlyLoadedParams();
         }
     }
@@ -253,13 +253,13 @@
      *
      * @return string
      */
     private function logTooEarlyLoadedListIfNeeded($paramName)
     {
         if ($this->container instanceof ContainerBuilder) {
             return;
         }
 
-        if ($this->siteAccess->matchingType !== 'uninitialized') {
+        if ($this->siteAccess->matchingType !== SiteAccess::MATCHING_TYPE_UNINITIALIZED) {
             return;
         }
 

src/bundle/Core/Resources/config/services.yml

@@ -14,7 +14,7 @@ services:
     # Siteaccess is injected in the container at runtime
     Ibexa\Core\MVC\Symfony\SiteAccess:
         class: Ibexa\Core\MVC\Symfony\SiteAccess
-        arguments: ['%ibexa.site_access.default.name%', 'uninitialized']
+        arguments: ['%ibexa.site_access.default.name%', !php/const Ibexa\Core\MVC\Symfony\SiteAccess::MATCHING_TYPE_UNINITIALIZED]
 
     Ibexa\Bundle\Core\DependencyInjection\Configuration\ConfigResolver\DefaultScopeConfigResolver:
         arguments:
@@ -392,4 +392,3 @@ services:
         decoration_priority: 500
         arguments:
             $inner: '@.inner'
-

src/lib/MVC/Symfony/SiteAccess.php

@@ -16,6 +16,8 @@ class SiteAccess extends ValueObject implements JsonSerializable
 {
     public const DEFAULT_MATCHING_TYPE = 'default';
 
+    public const MATCHING_TYPE_UNINITIALIZED = 'uninitialized';
+
     /**
      * Name of the siteaccess.
      *

src/lib/MVC/Symfony/SiteAccess/SiteAccessService.php

@@ -9,20 +9,18 @@
 namespace Ibexa\Core\MVC\Symfony\SiteAccess;
 
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
+use Ibexa\Core\Base\Exceptions\InvalidArgumentException;
 use Ibexa\Core\Base\Exceptions\NotFoundException;
 use Ibexa\Core\MVC\Symfony\SiteAccess;
 use function iterator_to_array;
 
 class SiteAccessService implements SiteAccessServiceInterface, SiteAccessAware
 {
-    /** @var \Ibexa\Core\MVC\Symfony\SiteAccess\SiteAccessProviderInterface */
-    private $provider;
+    private SiteAccessProviderInterface $provider;
 
-    /** @var \Ibexa\Core\MVC\Symfony\SiteAccess */
-    private $siteAccess;
+    private ?SiteAccess $siteAccess = null;
 
-    /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */
-    private $configResolver;
+    private ConfigResolverInterface $configResolver;
 
     public function __construct(
         SiteAccessProviderInterface $provider,
@@ -64,6 +62,10 @@ public function getCurrent(): ?SiteAccess
     public function getSiteAccessesRelation(?SiteAccess $siteAccess = null): array
     {
         $siteAccess = $siteAccess ?? $this->siteAccess;
+        if ($siteAccess === null) {
+            throw new InvalidArgumentException('siteAccess', 'no SiteAccess given and none currently set');
+        }
+
         $saRelationMap = [];
 
         /** @var \Ibexa\Core\MVC\Symfony\SiteAccess[] $saList */

src/lib/MVC/Symfony/SiteAccess/SiteAccessServiceInterface.php

@@ -33,6 +33,8 @@ public function getCurrent(): ?SiteAccess;
      * Handles relation between SiteAccesses. Related SiteAccesses share the same repository and root location id.
      *
      * @return string[]
+     *
+     * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentException if no SiteAccess is given and none is currently set
      */
     public function getSiteAccessesRelation(?SiteAccess $siteAccess = null): array;
 }

tests/integration/Core/Resources/settings/common.yml

@@ -70,7 +70,7 @@ services:
 
     Ibexa\Core\MVC\Symfony\SiteAccess:
         class: Ibexa\Core\MVC\Symfony\SiteAccess
-        arguments: ['default', 'uninitialized']
+        arguments: ['default', !php/const Ibexa\Core\MVC\Symfony\SiteAccess::MATCHING_TYPE_UNINITIALIZED]
 
     Ibexa\Core\MVC\Symfony\SiteAccess\SiteAccessService:
         class: Ibexa\Core\MVC\Symfony\SiteAccess\SiteAccessService