Skip to content

Commit 279caea

Browse files
authored
feat: update explain sql query (#413)
1 parent 31c267a commit 279caea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1243
-1491
lines changed

.github/workflows/quality-check.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,12 @@ jobs:
6666
path: vendor
6767
key: php-${{ hashFiles('composer.lock') }}
6868
- name: PHPStan PrestaShop ${{ matrix.ps_version }}
69-
run: PS_VERSION="${{ matrix.ps_version }}" make docker-phpstan
69+
run: |
70+
if [[ "${{ matrix.ps_version }}" == 1.6.* ]]; then
71+
PS_VERSION="${{ matrix.ps_version }}" make docker-phpstan-1-6
72+
else
73+
PS_VERSION="${{ matrix.ps_version }}" make docker-phpstan
74+
fi
7075
7176
phpunit:
7277
name: PHP Unit

Makefile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ VERSION ?= $(shell git describe --tags 2> /dev/null || echo "v0.0.0")
44
SEM_VERSION ?= $(shell echo ${VERSION} | sed 's/^v//')
55
BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD | sed -e 's/\//_/g')
66
PACKAGE ?= ${MODULE_NAME}-${VERSION}
7-
PS_VERSION ?= 8.1.7
7+
PS_VERSION ?= 8.1.6
88
TESTING_IMAGE ?= prestashop/prestashop-flashlight:${PS_VERSION}
99
PS_ROOT_DIR ?= $(shell pwd)/prestashop/prestashop-${PS_VERSION}
1010
WORKDIR ?= ./
@@ -154,6 +154,9 @@ phpstan: tools/vendor prestashop/prestashop-${PS_VERSION}
154154
docker-phpstan: tools/vendor
155155
@$(call in_docker,/usr/bin/phpstan,analyse --memory-limit=-1 --configuration=./tests/phpstan/phpstan-docker.neon)
156156

157+
docker-phpstan-1-6: tools/vendor
158+
@$(call in_docker_1_6,/usr/bin/phpstan,analyse --memory-limit=-1 --configuration=./modules/ps_eventbus/tests/phpstan/phpstan-docker.neon)
159+
157160
# target: header-stamp - check Headers of PHP files
158161
.PHONY:header-stamp
159162
header-stamp:
@@ -209,3 +212,9 @@ define in_docker
209212
--volume $(shell pwd):/var/www/html/modules/${MODULE_NAME}:rw \
210213
--entrypoint $1 ${TESTING_IMAGE} $2
211214
endef
215+
216+
define in_docker_1_6
217+
docker run --rm \
218+
--volume $(shell pwd):/var/www/html/modules/${MODULE_NAME}:rw \
219+
--entrypoint $1 ${TESTING_IMAGE} $2
220+
endef

e2e-env/.env.dist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
COMPOSE_PROJECT_NAME=ps_eventbus
2+
COMPOSE_PROFILES=localhost
23

34
# Infrastructure dependencies
45
DOCKER_IMAGE_PRESTASHOP=prestashop/prestashop-flashlight:latest

e2e/jest.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"rootDir": "src",
44
"testRegex": ".*\\.spec\\.ts$",
55
"transform": {
6-
"^.+\\.ts$": "@swc/jest"
6+
"^.+\\.ts$": "ts-jest"
77
},
88
"collectCoverageFrom": ["**/*.(t|j)s"],
99
"coverageDirectory": "../coverage",

e2e/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"private": true,
55
"scripts": {
6-
"test:e2e": "jest --config=jest.config.json",
6+
"test:e2e": "jest --config=jest.config.json --runInBand",
77
"test:e2e:watch": "jest --config=jest.config.json --watchAll",
88
"test:e2e:detectOpenHandles": "jest --config=jest.config.json --detectOpenHandles",
99
"lint": "eslint 'src/**/*.ts'",
@@ -15,8 +15,6 @@
1515
"devDependencies": {
1616
"@eslint/js": "^9.10.0",
1717
"@jest/globals": "^29.7.0",
18-
"@swc/core": "^1.11.7",
19-
"@swc/jest": "^0.2.37",
2018
"@types/eslint__js": "^8.42.3",
2119
"@types/jest": "^29.5.13",
2220
"@types/node": "^22.5.4",

0 commit comments

Comments
 (0)