Merge pull request #23 from sansecio/magento2-baseurl

improve magento2 base url detection

.github/workflows/lint.yml

@@ -14,12 +14,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
-        with:
-          go-version: '1.20'
-          cache: false
       - name: Lint
         uses: golangci/golangci-lint-action@v3
         with:
           version: latest
-          only-new-issues: true
+          only-new-issues: true

.github/workflows/unit.yaml

@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - run: go test
+      - run: go test

go.mod

@@ -1,6 +1,6 @@
 module github.com/sansecio/gocommerce
 
-go 1.20
+go 1.22
 
 require (
 	github.com/go-sql-driver/mysql v1.5.0 // 20190901 last release is incompatible with older mysql servers

magento2.go

@@ -7,7 +7,9 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"slices"
 	"strconv"
+	"strings"
 
 	"github.com/sansecio/gocommerce/phpcfg"
 )
@@ -69,13 +71,15 @@ func (m2 *Magento2) ParseConfig(cfgPath string) (*StoreConfig, error) {
 
 func (m2 *Magento2) BaseURLs(docroot string) ([]string, error) {
 	cfgPath := filepath.Join(docroot, m2.ConfigPath())
-
-	urls, err := m2.getBaseURLsFromDatabase(cfgPath)
-	if err == nil {
-		return urls, nil
+	urls := []string{}
+	if ud, err := m2.getBaseURLsFromDatabase(cfgPath); err == nil {
+		urls = append(urls, ud...)
 	}
-
-	return m2.getBaseURLsFromConfig(cfgPath)
+	if uc, err := m2.getBaseURLsFromConfig(cfgPath); err == nil {
+		urls = append(urls, uc...)
+	}
+	slices.Sort(urls)
+	return slices.Compact(urls), nil
 }
 
 func (m2 *Magento2) Version(docroot string) (string, error) {
@@ -87,20 +91,24 @@ func (m2 *Magento2) Version(docroot string) (string, error) {
 	return getVersionFromJsonFile(docroot + "/composer.json")
 }
 
+func urlIsPlaceholder(url string) bool {
+	return strings.HasPrefix(url, "{{") || strings.HasSuffix(url, "}}")
+}
+
 func (m2 *Magento2) getBaseURLsFromConfig(cfgPath string) ([]string, error) {
 	cm, err := phpcfg.ParsePath(cfgPath)
 	if err != nil {
 		return nil, err
 	}
 
-	r, err := regexp.Compile(`root.system.\w+.web.secure.base_url`)
+	r, err := regexp.Compile(`root.system.\w+.web.(un)?secure.base_url`)
 	if err != nil {
 		return nil, err
 	}
 
 	urls := []string{}
 	for k, v := range cm {
-		if r.MatchString(k) {
+		if r.MatchString(k) && !urlIsPlaceholder(v) {
 			urls = append(urls, v)
 		}
 	}
@@ -135,7 +143,7 @@ func (m2 *Magento2) getBaseURLsFromDatabase(cfgPath string) ([]string, error) {
 	urls := []string{}
 	for rows.Next() {
 		var url string
-		if err := rows.Scan(&url); err == nil {
+		if err := rows.Scan(&url); err == nil && !urlIsPlaceholder(url) {
 			urls = append(urls, url)
 		}
 	}