Merge pull request #35 from shopware/strip-slash-install

fix: strip slash on sales channel url

src/Services/InstallationManager.php

@@ -40,7 +40,7 @@ public function run(RunConfiguration $configuration, OutputInterface $output): v
         $adminUser = EnvironmentHelper::getVariable('INSTALL_ADMIN_USERNAME', 'admin');
         $adminPassword = EnvironmentHelper::getVariable('INSTALL_ADMIN_PASSWORD', 'shopware');
         $appUrl = EnvironmentHelper::getVariable('APP_URL');
-        $salesChannelUrl = EnvironmentHelper::getVariable('SALES_CHANNEL_URL', $appUrl);
+        $salesChannelUrl = UrlHelper::normalizeSalesChannelUrl(EnvironmentHelper::getVariable('SALES_CHANNEL_URL', $appUrl) ?? '');
 
         $additionalInstallParameters = [];
 

src/Services/UpgradeManager.php

@@ -57,7 +57,7 @@ public function run(RunConfiguration $configuration, OutputInterface $output): v
         $salesChannelUrl = EnvironmentHelper::getVariable('SALES_CHANNEL_URL');
 
         if ($salesChannelUrl !== null && $this->state->isStorefrontInstalled() && !$this->state->isSalesChannelExisting($salesChannelUrl)) {
-            $this->processHelper->console(['sales-channel:create:storefront', '--name=Storefront', '--url=' . $salesChannelUrl]);
+            $this->processHelper->console(['sales-channel:create:storefront', '--name=Storefront', '--url=' . UrlHelper::normalizeSalesChannelUrl($salesChannelUrl)]);
         }
 
         $this->processHelper->console(['plugin:refresh']);

src/Services/UrlHelper.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shopware\Deployment\Services;
+
+class UrlHelper
+{
+    public static function normalizeSalesChannelUrl(string $url): string
+    {
+        $path = parse_url($url, \PHP_URL_PATH);
+
+        if ($path === '/') {
+            return rtrim($url, '/');
+        }
+
+        return $url;
+    }
+}

tests/Services/InstallationManagerTest.php

@@ -17,8 +17,10 @@
 use Shopware\Deployment\Services\ShopwareState;
 use Shopware\Deployment\Struct\RunConfiguration;
 use Symfony\Component\Console\Output\OutputInterface;
+use Zalas\PHPUnit\Globals\Attribute\Env;
 
 #[CoversClass(InstallationManager::class)]
+#[Env('APP_URL', 'http://localhost')]
 class InstallationManagerTest extends TestCase
 {
     public function testRun(): void

tests/Services/UrlHelperTest.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shopware\Deployment\Tests\Services;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+use Shopware\Deployment\Services\UrlHelper;
+
+/**
+ * @internal
+ */
+#[CoversClass(UrlHelper::class)]
+class UrlHelperTest extends TestCase
+{
+    #[DataProvider('normalizeCases')]
+    public function testNormalizeUrls(string $input, string $expected): void
+    {
+        static::assertSame($expected, UrlHelper::normalizeSalesChannelUrl($input));
+    }
+
+    public static function normalizeCases(): \Generator
+    {
+        yield ['http://localhost', 'http://localhost'];
+        yield ['http://localhost/', 'http://localhost'];
+        yield ['http://localhost/foo', 'http://localhost/foo'];
+    }
+}