Skip to content

Commit

Permalink
Merge pull request #90 from PrestaShop/dev
Browse files Browse the repository at this point in the history
Release 1.2.0
  • Loading branch information
jolelievre authored Nov 28, 2024
2 parents 2509b15 + ac5cba0 commit 9ee7db0
Show file tree
Hide file tree
Showing 12 changed files with 273 additions and 747 deletions.
17 changes: 13 additions & 4 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ jobs:
- name: PHP syntax checker 8.2
uses: prestashop/github-action-php-lint/8.2@master

- name: PHP syntax checker 8.3
uses: prestashop/github-action-php-lint/8.3@master

- name: PHP syntax checker 8.4
uses: prestashop/github-action-php-lint/8.4@master

# Check the PHP code follow the coding standards
php-cs-fixer:
name: PHP-CS-Fixer
Expand Down Expand Up @@ -46,12 +52,15 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
presta-versions: ['nightly']
presta-version: [ 'nightly', '9.0.x' ]
# The 8.4 compatibility is not available yet, this should be uncommented whe the dockers are ready
# php-version: [ '8.1', '8.2', '8.3', '8.4' ]
php-version: [ '8.1', '8.2', '8.3' ]
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: ${{ matrix.php-version }}

- name: Checkout
uses: actions/[email protected]
Expand All @@ -73,5 +82,5 @@ jobs:
- run: composer install

# Docker images prestashop/prestashop may be used, even if the shop remains uninstalled
- name: Execute PHPStan on PrestaShop (Tag ${{ matrix.presta-versions }})
run: ./tests/phpstan.sh ${{ matrix.presta-versions }}
- name: Execute PHPStan on PrestaShop (Tag ${{ matrix.presta-version }}-${{ matrix.php-version }})
run: ./tests/phpstan.sh ${{ matrix.presta-version }} ${{ matrix.php-version }}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ A keycloak docker is available in this module, along with a realm containing def
To start the docker container run this command from the root folder of this module:

```bash
docker-composer up
docker compose up
# OR if you want keycloak to keep running in background
docker-composer up -d
docker compose up -d
```

You will then have access to the server administration via `http://localhost:8003` where you will find a realm named `prestashop`
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
}
},
"require-dev": {
"prestashop/php-dev-tools": "^4.3",
"prestashop/php-dev-tools": "^5",
"friendsofphp/php-cs-fixer": "^3",
"phpstan/phpstan": "^1.9"
},
"config": {
Expand Down
Loading

0 comments on commit 9ee7db0

Please sign in to comment.