app.api_base_url

tatevikg1 · tatevikg1 · commit 3f390027d8af · 2026-07-26T13:25:10.000+04:00
diff --git a/config/services.yml b/config/services.yml
@@ -1,7 +1,4 @@
 # config/services.yaml
-parameters:
-  api_base_url: '%app.api_base_url%'
-
 services:
   _defaults:
     autowire: true
@@ -26,7 +23,7 @@ services:
   Symfony\Component\HttpFoundation\Session\SessionInterface: '@session'
 
   PhpList\RestApiClient\Client:
-    $baseUrl: '%api_base_url%'
+    $baseUrl: '%app.api_base_url%'
 
   PhpList\WebFrontend\EventListener\ApiSessionListener:
     tags:
diff --git a/src/Controller/AnalyticsController.php b/src/Controller/AnalyticsController.php
@@ -18,7 +18,7 @@ public function index(Request $request): Response
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Analytics',
             'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
+            'api_base_url' => $this->getParameter('app.api_base_url'),
         ]);
     }
 }
diff --git a/src/Controller/BouncesController.php b/src/Controller/BouncesController.php
@@ -24,7 +24,7 @@ public function index(Request $request): Response
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Bounces',
             'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
+            'api_base_url' => $this->getParameter('app.api_base_url'),
             'bounce_actions' => $bounceActions,
         ]);
     }
diff --git a/src/Controller/CampaignsController.php b/src/Controller/CampaignsController.php
@@ -18,7 +18,7 @@ public function index(Request $request): Response
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Campaigns',
             'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
+            'api_base_url' => $this->getParameter('app.api_base_url'),
         ]);
     }
 
@@ -28,7 +28,7 @@ public function create(Request $request): Response
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Create Campaign',
             'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
+            'api_base_url' => $this->getParameter('app.api_base_url'),
         ]);
     }
 
@@ -38,7 +38,7 @@ public function edit(Request $request, int $campaignId): Response
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => sprintf('Edit Campaign #%d', $campaignId),
             'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
+            'api_base_url' => $this->getParameter('app.api_base_url'),
         ]);
     }
 }
diff --git a/src/Controller/DashboardController.php b/src/Controller/DashboardController.php
@@ -33,7 +33,7 @@ public function index(Request $request): Response
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Dashboard',
             'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
+            'api_base_url' => $this->getParameter('app.api_base_url'),
             'dashboard_stats' => $dashboardStats,
             'dashboard_error' => $dashboardError,
         ]);
diff --git a/src/Controller/ListsController.php b/src/Controller/ListsController.php
@@ -27,7 +27,7 @@ public function index(Request $request): JsonResponse|Response
             return $this->render('@PhpListFrontend/spa.html.twig', [
                 'page' => 'Lists',
                 'api_token' => $request->getSession()->get('auth_token'),
-                'api_base_url' => $this->getParameter('api_base_url'),
+                'api_base_url' => $this->getParameter('app.api_base_url'),
             ]);
         }
         $initialData = $this->listClient->getLists();
@@ -41,7 +41,7 @@ public function view(Request $request, int $listId): JsonResponse|Response
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'List Subscribers',
             'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
+            'api_base_url' => $this->getParameter('app.api_base_url'),
         ]);
     }
 }
diff --git a/src/Controller/PublicPagesController.php b/src/Controller/PublicPagesController.php
@@ -18,7 +18,7 @@ public function index(Request $request): Response
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Subscribe Pages',
             'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
+            'api_base_url' => $this->getParameter('app.api_base_url'),
         ]);
     }
 
@@ -28,7 +28,7 @@ public function create(Request $request): Response
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Create Subscribe Page',
             'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
+            'api_base_url' => $this->getParameter('app.api_base_url'),
         ]);
     }
 
@@ -38,7 +38,7 @@ public function edit(Request $request, int $pageId): Response
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => sprintf('Edit Subscribe Page #%d', $pageId),
             'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
+            'api_base_url' => $this->getParameter('app.api_base_url'),
         ]);
     }
 }
diff --git a/src/Controller/SettingsController.php b/src/Controller/SettingsController.php
@@ -18,7 +18,7 @@ public function index(Request $request): Response
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Settings',
             'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
+            'api_base_url' => $this->getParameter('app.api_base_url'),
         ]);
     }
 }
diff --git a/src/Controller/SubscribersController.php b/src/Controller/SubscribersController.php
@@ -38,7 +38,7 @@ public function index(Request $request): JsonResponse|Response
             return $this->render('@PhpListFrontend/spa.html.twig', [
                 'page' => 'Subscribers',
                 'api_token' => $request->getSession()->get('auth_token'),
-                'api_base_url' => $this->getParameter('api_base_url'),
+                'api_base_url' => $this->getParameter('app.api_base_url'),
             ]);
         }
 
diff --git a/src/Controller/TemplatesController.php b/src/Controller/TemplatesController.php
@@ -18,7 +18,7 @@ public function index(Request $request): Response
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Templates',
             'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
+            'api_base_url' => $this->getParameter('app.api_base_url'),
         ]);
     }
 
@@ -28,7 +28,7 @@ public function create(Request $request): Response
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => 'Create Template',
             'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
+            'api_base_url' => $this->getParameter('app.api_base_url'),
         ]);
     }
 
@@ -38,7 +38,7 @@ public function edit(Request $request, int $templateId): Response
         return $this->render('@PhpListFrontend/spa.html.twig', [
             'page' => sprintf('Edit Template #%d', $templateId),
             'api_token' => $request->getSession()->get('auth_token'),
-            'api_base_url' => $this->getParameter('api_base_url'),
+            'api_base_url' => $this->getParameter('app.api_base_url'),
         ]);
     }
 }
diff --git a/tests/Integration/Controller/AnalyticsControllerTest.php b/tests/Integration/Controller/AnalyticsControllerTest.php
@@ -27,7 +27,7 @@ public function testAnalyticsPageRendersExpectedSpaPayload(): void
         self::bootKernel();
         /** @var AnalyticsController $controller */
         $controller = static::getContainer()->get(AnalyticsController::class);
-        $apiBaseUrl = (string) static::getContainer()->getParameter('api_base_url');
+        $apiBaseUrl = (string) static::getContainer()->getParameter('app.api_base_url');
 
         $request = Request::create('/analytics/');
         $session = new Session(new MockArraySessionStorage());
diff --git a/tests/Integration/Controller/BouncesControllerTest.php b/tests/Integration/Controller/BouncesControllerTest.php
@@ -27,7 +27,7 @@ public function testBouncesPageRendersExpectedSpaPayload(): void
         self::bootKernel();
         /** @var BouncesController $controller */
         $controller = static::getContainer()->get(BouncesController::class);
-        $apiBaseUrl = (string) static::getContainer()->getParameter('api_base_url');
+        $apiBaseUrl = (string) static::getContainer()->getParameter('app.api_base_url');
 
         $request = Request::create('/bounces/');
         $session = new Session(new MockArraySessionStorage());
diff --git a/tests/Integration/Controller/DashboardControllerTest.php b/tests/Integration/Controller/DashboardControllerTest.php
@@ -29,7 +29,7 @@ public function testDashboardRouteIsRegistered(): void
     public function testDashboardRendersSpaPayloadWithStats(): void
     {
         self::bootKernel();
-        $apiBaseUrl = (string) static::getContainer()->getParameter('api_base_url');
+        $apiBaseUrl = (string) static::getContainer()->getParameter('app.api_base_url');
 
         $statsClient = $this->createMock(StatisticsClient::class);
         $statsClient->expects(self::once())
diff --git a/tests/Integration/Controller/ListsControllerTest.php b/tests/Integration/Controller/ListsControllerTest.php
@@ -31,7 +31,7 @@ public function testListRoutesAreRegistered(string $routeName, array $parameters
     public function testListsIndexRendersSpaForHtmlRequests(): void
     {
         self::bootKernel();
-        $apiBaseUrl = (string) static::getContainer()->getParameter('api_base_url');
+        $apiBaseUrl = (string) static::getContainer()->getParameter('app.api_base_url');
 
         $listClient = $this->createMock(ListClient::class);
         $listClient->expects(self::never())->method('getLists');
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\Dotenv\Dotenv;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+if (method_exists(Dotenv::class, 'bootEnv')) {
+    (new Dotenv())->bootEnv(dirname(__DIR__) . '/.env');
+}

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public function index(Request $request): Response`
`18`	`18`	`return $this->render('@PhpListFrontend/spa.html.twig', [`
`19`	`19`	`'page' => 'Analytics',`
`20`	`20`	`'api_token' => $request->getSession()->get('auth_token'),`
`21`		`- 'api_base_url' => $this->getParameter('api_base_url'),`
	`21`	`+ 'api_base_url' => $this->getParameter('app.api_base_url'),`
`22`	`22`	`]);`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function index(Request $request): Response`
`24`	`24`	`return $this->render('@PhpListFrontend/spa.html.twig', [`
`25`	`25`	`'page' => 'Bounces',`
`26`	`26`	`'api_token' => $request->getSession()->get('auth_token'),`
`27`		`- 'api_base_url' => $this->getParameter('api_base_url'),`
	`27`	`+ 'api_base_url' => $this->getParameter('app.api_base_url'),`
`28`	`28`	`'bounce_actions' => $bounceActions,`
`29`	`29`	`]);`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function index(Request $request): JsonResponse\|Response`
`27`	`27`	`return $this->render('@PhpListFrontend/spa.html.twig', [`
`28`	`28`	`'page' => 'Lists',`
`29`	`29`	`'api_token' => $request->getSession()->get('auth_token'),`
`30`		`- 'api_base_url' => $this->getParameter('api_base_url'),`
	`30`	`+ 'api_base_url' => $this->getParameter('app.api_base_url'),`
`31`	`31`	`]);`
`32`	`32`	`}`
`33`	`33`	`$initialData = $this->listClient->getLists();`
`@@ -41,7 +41,7 @@ public function view(Request $request, int $listId): JsonResponse\|Response`
`41`	`41`	`return $this->render('@PhpListFrontend/spa.html.twig', [`
`42`	`42`	`'page' => 'List Subscribers',`
`43`	`43`	`'api_token' => $request->getSession()->get('auth_token'),`
`44`		`- 'api_base_url' => $this->getParameter('api_base_url'),`
	`44`	`+ 'api_base_url' => $this->getParameter('app.api_base_url'),`
`45`	`45`	`]);`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function index(Request $request): JsonResponse\|Response`
`38`	`38`	`return $this->render('@PhpListFrontend/spa.html.twig', [`
`39`	`39`	`'page' => 'Subscribers',`
`40`	`40`	`'api_token' => $request->getSession()->get('auth_token'),`
`41`		`- 'api_base_url' => $this->getParameter('api_base_url'),`
	`41`	`+ 'api_base_url' => $this->getParameter('app.api_base_url'),`
`42`	`42`	`]);`
`43`	`43`	`}`
`44`	`44`