Skip to content

Commit

Permalink
Get rid of not needed symfony translation component
Browse files Browse the repository at this point in the history
  • Loading branch information
sowbiba committed Feb 19, 2024
1 parent e2f9445 commit d83b7a2
Show file tree
Hide file tree
Showing 25 changed files with 1,035 additions and 439 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ jobs:
strategy:
matrix:
prestashop_version: [
"https://github.com/PrestaShop/PrestaShop/releases/download/8.0.0/prestashop_8.0.0.zip",
"https://github.com/PrestaShop/PrestaShop/releases/download/1.7.4.4/prestashop_1.7.4.4.zip",
"https://github.com/PrestaShop/PrestaShop/releases/download/1.7.8.11/prestashop_1.7.8.11.zip",
"https://github.com/PrestaShop/PrestaShop/releases/download/8.0.2/prestashop_8.0.2.zip",
"https://github.com/PrestaShop/PrestaShop/releases/download/8.1.3/prestashop_8.1.3.zip",
]
steps:
- name: Download PrestaShop code source
Expand Down Expand Up @@ -111,8 +112,11 @@ jobs:
- name: Install dependencies
run: composer install

- name: PHPUnit tests 1.7
run: DOCKER_INTERNAL="1.7" make phpunit
- name: PHPUnit tests 1.7.8.11
run: DOCKER_INTERNAL="1.7.8.11" make phpunit

- name: PHPUnit tests with PS 8
run: DOCKER_INTERNAL=8 make phpunit
- name: PHPUnit tests with PS 8.0.2
run: DOCKER_INTERNAL="8.0.2" make phpunit

- name: PHPUnit tests with PS latest
run: DOCKER_INTERNAL="latest" make phpunit
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ifndef DOCKER
endif

phpunit: check-docker
docker pull prestashop/docker-internal-images:${DOCKER_INTERNAL}
docker build -f tests/.docker/${DOCKER_INTERNAL}/Dockerfile -t mbo-lib-installer/phpunit:${DOCKER_INTERNAL} tests/.docker/${DOCKER_INTERNAL}
@docker run --rm \
--name phpunit \
-e PS_DOMAIN=localhost \
Expand All @@ -17,7 +17,7 @@ phpunit: check-docker
-e XDEBUG_ENABLED=1 \
-v ${PWD}:/var/www/html/test-lib \
-w /var/www/html/test-lib \
prestashop/docker-internal-images:${DOCKER_INTERNAL} \
mbo-lib-installer/phpunit:${DOCKER_INTERNAL} \
sh -c " \
service mariadb start && \
service apache2 start && \
Expand Down
6 changes: 2 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"require": {
"php": ">=7.2.5",
"prestashop/module-lib-guzzle-adapter": "^1.0",
"ext-json": "*",
"symfony/translation": "^5.4"
"ext-json": "*"
},
"config": {
"platform": {
Expand All @@ -15,8 +14,7 @@
},
"autoload": {
"psr-4": {
"Prestashop\\ModuleLibMboInstaller\\": "src/",
"Symfony\\Component\\Translation\\": "vendor/symfony/translation"
"Prestashop\\ModuleLibMboInstaller\\": "src/"
}
},
"authors": [
Expand Down
Loading

0 comments on commit d83b7a2

Please sign in to comment.