Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 1 addition & 3 deletions docker-compose.1.7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 1 addition & 3 deletions docker-compose.8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -16,7 +15,6 @@ services:
prestashop:
container_name: sendy-prestashop-8-prestashop
image: prestashop/prestashop:8
restart: unless-stopped
depends_on:
- mysql
ports:
Expand All @@ -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:
Expand Down
6 changes: 2 additions & 4 deletions docker-compose.9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down
6 changes: 6 additions & 0 deletions tests/phpstan/phpstan-baseline.9.neon
Original file line number Diff line number Diff line change
@@ -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
Expand Down