From 848eefad8f6dc2022b4864140c13d95137e54cc5 Mon Sep 17 00:00:00 2001
From: Adriaan Zonnenberg <a.zonnenberg@sendy.nl>
Date: Mon, 11 May 2026 18:26:41 +0200
Subject: [PATCH 1/2] Update Docker images

---
 .github/workflows/analysis.yml | 2 +-
 CONTRIBUTING.md                | 6 +++---
 docker-compose.1.7.yml         | 4 +---
 docker-compose.8.yml           | 4 +---
 docker-compose.9.yml           | 6 ++----
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index 0a4e5f1..2f16f70 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -32,7 +32,7 @@ jobs:
           - presta-version: '8'
             docker-tag: '8'
           - presta-version: '9'
-            docker-tag: '9.0.0-1.0-classic'
+            docker-tag: '9.1.1'
     steps:
       - name: Checkout
         uses: actions/checkout@v6
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2156c05..d1bd6fb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,9 +30,9 @@ docker compose --file docker-compose.9.yml up -d
 Wait for the containers to start and the PrestaShop installations to complete. This may take a few minutes.
 
 You can then log in to the PrestaShop back office with email `demo@prestashop.com` and password `prestashop_demo` at the following URLs:
-- http://localhost:8017/admin7639
-- http://localhost:8080/admin7639
-- http://localhost:8090/admin7639
+- http://localhost:8017/admin-dev
+- http://localhost:8080/admin-dev
+- http://localhost:8090/admin-dev
 
 ### Testing webhooks
 
diff --git a/docker-compose.1.7.yml b/docker-compose.1.7.yml
index 9d689ab..e207c26 100644
--- a/docker-compose.1.7.yml
+++ b/docker-compose.1.7.yml
@@ -3,7 +3,6 @@ services:
   mysql:
     container_name: sendy-prestashop-1.7-mysql
     image: mysql:latest
-    restart: unless-stopped
     environment:
       MYSQL_ROOT_PASSWORD: admin
       MYSQL_DATABASE: prestashop
@@ -16,7 +15,6 @@ services:
   prestashop:
     container_name: sendy-prestashop-1.7-prestashop
     image: prestashop/prestashop:1.7.8
-    restart: unless-stopped
     depends_on:
       - mysql
     ports:
@@ -31,7 +29,7 @@ services:
       DB_PASSWD: admin
       PS_INSTALL_AUTO: 1
       PS_DOMAIN: localhost:8017
-      PS_FOLDER_ADMIN: admin7639
+      PS_FOLDER_ADMIN: admin-dev
       PS_DEV_MODE: 1
       PS_LANGUAGE: nl
     networks:
diff --git a/docker-compose.8.yml b/docker-compose.8.yml
index ae77452..7de9dd6 100644
--- a/docker-compose.8.yml
+++ b/docker-compose.8.yml
@@ -3,7 +3,6 @@ services:
   mysql:
     container_name: sendy-prestashop-8-mysql
     image: mysql:latest
-    restart: unless-stopped
     environment:
       MYSQL_ROOT_PASSWORD: admin
       MYSQL_DATABASE: prestashop
@@ -16,7 +15,6 @@ services:
   prestashop:
     container_name: sendy-prestashop-8-prestashop
     image: prestashop/prestashop:8
-    restart: unless-stopped
     depends_on:
       - mysql
     ports:
@@ -31,7 +29,7 @@ services:
       DB_PASSWD: admin
       PS_INSTALL_AUTO: 1
       PS_DOMAIN: localhost:8080
-      PS_FOLDER_ADMIN: admin7639
+      PS_FOLDER_ADMIN: admin-dev
       PS_DEV_MODE: 1
       PS_LANGUAGE: nl
     networks:
diff --git a/docker-compose.9.yml b/docker-compose.9.yml
index 448bc18..125727f 100644
--- a/docker-compose.9.yml
+++ b/docker-compose.9.yml
@@ -3,7 +3,6 @@ services:
   mysql:
     container_name: sendy-prestashop-9-mysql
     image: mysql:latest
-    restart: unless-stopped
     environment:
       MYSQL_ROOT_PASSWORD: admin
       MYSQL_DATABASE: prestashop
@@ -15,8 +14,7 @@ services:
       - db_data:/var/lib/mysql
   prestashop:
     container_name: sendy-prestashop-9-prestashop
-    image: prestashop/prestashop:9.0.0-1.0-classic
-    restart: unless-stopped
+    image: prestashop/prestashop:9.1.1
     depends_on:
       - mysql
     ports:
@@ -31,7 +29,7 @@ services:
       DB_PASSWD: admin
       PS_INSTALL_AUTO: 1
       PS_DOMAIN: localhost:8090
-      PS_FOLDER_ADMIN: admin7639
+      PS_FOLDER_ADMIN: admin-dev
       PS_DEV_MODE: 1
       PS_LANGUAGE: nl
       PS_COUNTRY: NL

From c01c41d73c8a56e9d56fd3d1aee9310022e6a284 Mon Sep 17 00:00:00 2001
From: Adriaan Zonnenberg <a.zonnenberg@sendy.nl>
Date: Mon, 13 Jul 2026 10:30:11 +0200
Subject: [PATCH 2/2] Update phpstan baseline

Module::$context is nullable PrestaShop 9.1.
---
 tests/phpstan/phpstan-baseline.9.neon | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/phpstan/phpstan-baseline.9.neon b/tests/phpstan/phpstan-baseline.9.neon
index 0d7afff..67fa5c5 100644
--- a/tests/phpstan/phpstan-baseline.9.neon
+++ b/tests/phpstan/phpstan-baseline.9.neon
@@ -1,5 +1,11 @@
 parameters:
 	ignoreErrors:
+		-
+			message: '#^Cannot access property \$link on Context\|null\.$#'
+			identifier: property.nonObject
+			count: 1
+			path: ../../sendynl.php
+
 		-
 			message: '#^Cannot call method getAdminLink\(\) on Link\|null\.$#'
 			identifier: method.nonObject