Fix: test

Author: tatevikg1

src/Controller/PublicSubscribeController.php

@@ -43,7 +43,7 @@ public function unsubscribe(Request $request, int $pageId): Response
         $page = $this->subscribePagesClient->getPublicSubscribePage($pageId);
         $pageData = $page->data;
         $languageFile = $pageData['language_file'] ?? 'english.inc';
-        $languageTexts = $this->languageService->loadLanguageTexts(is_string($languageFile) ? $languageFile : null);
+        $languageTexts = $this->languageService->loadLanguageTexts($languageFile);
 
         $success = false;
         if ($request->isMethod('POST')) {
@@ -97,12 +97,12 @@ public function subscribe(Request $request, int $pageId): Response
         $isSubmitted = $request->isMethod('POST');
 
         $languageFile = $pageData['language_file'] ?? 'english.inc';
-        $languageTexts = $this->languageService->loadLanguageTexts(is_string($languageFile) ? $languageFile : null);
+        $languageTexts = $this->languageService->loadLanguageTexts($languageFile);
 
         $htmlChoice = $this->formBuilder->normalizeHtmlChoice($pageData['htmlchoice'] ?? null);
         $emailDoubleEntry = strtolower((string) ($pageData['emaildoubleentry'] ?? '')) === 'yes';
 
-        $lists = $pageData['lists'];
+        $lists = $pageData['lists'] ?? [];
         $availableListIds = array_map(static fn ($list): int => (int) $list['id'], $lists);
 
         $attributes = $this->formBuilder->buildAttributeConfig($pageData);

tests/Integration/Controller/PublicSubscribeControllerPantherTest.php

@@ -6,9 +6,7 @@
 
 use PHPUnitRetry\RetryAnnotationTrait;
 use PHPUnitRetry\RetryTrait;
-use Symfony\Component\Panther\Client;
 use Symfony\Component\Panther\PantherTestCase;
-use Throwable;
 
 /**
  * @retryAttempts 1
@@ -74,18 +72,11 @@ public function testAnonymousUserCanAccessPublicSubscribeAndUnsubscribePages(str
     public function testSubscribePageDisplaysEmailFieldAndSubmitButton(): void
     {
         $client = static::createPantherClient(self::PANTHER_OPTIONS);
-        try {
-            $client->getCookieJar()->clear();
-            $client->request('GET', '/index.php/subscribe/1');
-
-            $client->takeScreenshot('var/screenshots/public-subscribe-0.png');
-            $client->waitFor('form.legacy-form', 10);
-        } catch (Throwable $throwable) {
-            $client->takeScreenshot('var/screenshots/public-subscribe-error.png');
-            $this->writePublicSubscribeDiagnostics($client, $throwable);
-
-            throw $throwable;
-        }
+        $client->getCookieJar()->clear();
+        $client->request('GET', '/index.php/subscribe/1');
+
+        $client->takeScreenshot('var/screenshots/public-subscribe-0.png');
+        $client->waitFor('form.legacy-form', 10);
         $client->takeScreenshot('var/screenshots/public-subscribe-1.png');
 
         $currentPath = (string) parse_url($client->getCurrentURL(), PHP_URL_PATH);
@@ -107,98 +98,4 @@ public function publicSubscribePageRoutesProvider(): array
             'unsubscribe page route' => ['/index.php/unsubscribe/1'],
         ];
     }
-
-    private function writePublicSubscribeDiagnostics(Client $client, Throwable $throwable): void
-    {
-        $diagnosticsDir = __DIR__ . '/../../../var/screenshots';
-        if (!is_dir($diagnosticsDir)) {
-            mkdir($diagnosticsDir, 0777, true);
-        }
-
-        $pageSource = $this->readPageSource($client);
-        file_put_contents($diagnosticsDir . '/public-subscribe-error.html', $pageSource);
-        file_put_contents(
-            $diagnosticsDir . '/public-subscribe-error.txt',
-            implode("\n\n", [
-                'Exception: ' . $throwable::class,
-                'Message: ' . $throwable->getMessage(),
-                'Current URL: ' . $this->readCurrentUrl($client),
-                'Page title: ' . $this->readPageTitle($client),
-                'Body text: ' . $this->readBodyText($client),
-                'Recent Symfony logs:' . "\n" . $this->readRecentSymfonyLogs(),
-            ])
-        );
-
-        fwrite(STDERR, "Public subscribe diagnostics written to var/screenshots/public-subscribe-error.*\n");
-    }
-
-    private function readPageSource(Client $client): string
-    {
-        try {
-            return $client->getPageSource();
-        } catch (Throwable $throwable) {
-            return 'Unable to read page source: ' . $throwable->getMessage();
-        }
-    }
-
-    private function readCurrentUrl(Client $client): string
-    {
-        try {
-            return $client->getCurrentURL();
-        } catch (Throwable $throwable) {
-            return 'Unable to read current URL: ' . $throwable->getMessage();
-        }
-    }
-
-    private function readPageTitle(Client $client): string
-    {
-        try {
-            return $client->getTitle();
-        } catch (Throwable $throwable) {
-            return 'Unable to read page title: ' . $throwable->getMessage();
-        }
-    }
-
-    private function readBodyText(Client $client): string
-    {
-        try {
-            return $client->getCrawler()->filter('body')->text('', true);
-        } catch (Throwable $throwable) {
-            return 'Unable to read body text: ' . $throwable->getMessage();
-        }
-    }
-
-    private function readRecentSymfonyLogs(): string
-    {
-        $projectDir = dirname(__DIR__, 3);
-        $paths = array_merge(
-            glob($projectDir . '/var/logs/*.log') ?: [],
-            glob($projectDir . '/var/log/*.log') ?: []
-        );
-
-        if ($paths === []) {
-            return sprintf('No log files found under %s/var/logs or %s/var/log.', $projectDir, $projectDir);
-        }
-
-        $logs = [];
-        foreach (array_unique($paths) as $path) {
-            $logs[] = sprintf("==> %s <==\n%s", $path, $this->readRecentLogLines($path));
-        }
-
-        return implode("\n\n", $logs);
-    }
-
-    private function readRecentLogLines(string $path): string
-    {
-        if (!is_file($path)) {
-            return sprintf('Log file %s does not exist.', $path);
-        }
-
-        $lines = file($path, FILE_IGNORE_NEW_LINES);
-        if ($lines === false) {
-            return sprintf('Unable to read log file %s.', $path);
-        }
-
-        return implode("\n", array_slice($lines, -80));
-    }
 }