fix: phpstan error, bug

sitepark · Sep 16, 2024 · 5704214 · 5704214
1 parent 550d184
commit 5704214
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/src/SiteKitResourceChannelFactory.php b/src/SiteKitResourceChannelFactory.php
@@ -8,6 +8,12 @@
 
 /**
  * @phpstan-type ContextPhp array{
+ *     tenant: array{
+ *         id: string,
+ *         name: string,
+ *         anchor: string,
+ *         attributes: array<string, mixed>
+ *     },
  *     publisher: array{
  *          id: int,
  *          name: string,
@@ -17,7 +23,7 @@
  *          nature: ?string,
  *          locale: ?string,
  *          encoding: ?string,
- *          translationLocales: ?string[]
+ *          translationLocales: ?string[],
  *     }
  * }
  */
@@ -64,10 +70,19 @@ public function create(): ResourceChannel
             $this->configDir,
             $searchIndex,
             $data['publisher']['translationLocales'] ?? [],
-            $this->createTenant($data['tanent'] ?? $data['client'] /* deprecated */ ?? []),
+            $this->createTenant($data['tenant']),
         );
     }
 
+    /**
+     * @param array{
+     *     id: string,
+     *     name: string,
+     *     anchor: string,
+     *     attributes: array<string, mixed>,
+     * } $data
+     * @return ResourceTenant
+     */
     private function createTenant(array $data): ResourceTenant
     {
         return new ResourceTenant(
@@ -90,6 +105,11 @@ private function loadContextPhpFile(): array
             );
         }
 
+        if (isset($context['client'])) {
+            $context['tenant'] = $context['client'];
+            unset($context['client']);
+        }
+
         /** @var ContextPhp $context */
         return $context;
     }

diff --git a/test/resources/SiteKitResourceChannelFactory/documentRootLayout/WEB-IES/context.php b/test/resources/SiteKitResourceChannelFactory/documentRootLayout/WEB-IES/context.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'tanent' => [
+    'client' => [
         'id' => '2',
         'name' => 'Test-Tanent',
         'anchor' => 'test-tanent',

diff --git a/test/resources/SiteKitResourceChannelFactory/resourceLayout/context.php b/test/resources/SiteKitResourceChannelFactory/resourceLayout/context.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'tanent' => [
+    'tenant' => [
         'id' => '2',
         'name' => 'Test-Tanent',
         'anchor' => 'test-tanent',