Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WebP support #94

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open
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
16 changes: 4 additions & 12 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,19 @@ on: [push, pull_request]
jobs:
# Check there is no syntax errors in the project
php-linter:
name: PHP Syntax check 5.6 => 8.1
name: PHP Syntax check 8.1
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/[email protected]

- name: PHP syntax checker 5.6
Copy link
Contributor

@kpodemski kpodemski Aug 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@patrocle I think it would be better to keep PHP checks for 7.2 to 8.1. As you probably know, PrestaShop 8.0 is compatible with PHP 7.2 to 8.1.

uses: prestashop/github-action-php-lint/5.6@master

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

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

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

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

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

Expand All @@ -35,7 +27,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.1'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused about the impact of this php-version change 😕


- name: Checkout
uses: actions/[email protected]
Expand All @@ -58,12 +50,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
presta-versions: ['1.7.4.4', '1.7.5.1', '1.7.6', '1.7.7', '1.7.8', 'latest']
presta-versions: ['8.0.0', '8.1.0', 'latest']
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we should use '8.0', '8.1' here (they mean 8.0.x and 8.1.x :)

steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.1'

- name: Checkout
uses: actions/[email protected]
Expand Down
5 changes: 3 additions & 2 deletions ps_imageslider.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public function __construct()

$this->displayName = $this->trans('Image slider', [], 'Modules.Imageslider.Admin');
$this->description = $this->trans('Add sliding images to your homepage to welcome your visitors in a visual and friendly way.', [], 'Modules.Imageslider.Admin');
$this->ps_versions_compliancy = ['min' => '1.7.4.0', 'max' => _PS_VERSION_];
$this->ps_versions_compliancy = ['min' => '8.0.0', 'max' => _PS_VERSION_];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

module version need to be bumped to 4.0.0 accordingly


$this->templateFile = 'module:ps_imageslider/views/templates/hook/slider.tpl';
}
Expand Down Expand Up @@ -480,9 +480,10 @@ protected function _postProcess()
'gif',
'jpeg',
'png',
'webp',
]
) &&
in_array($type, ['jpg', 'gif', 'jpeg', 'png'])
in_array($type, ['jpg', 'gif', 'jpeg', 'png', 'webp'])
) {
$temp_name = tempnam(_PS_TMP_IMG_DIR_, 'PS');
$salt = sha1(microtime());
Expand Down
2 changes: 0 additions & 2 deletions tests/phpstan/phpstan-1.7.6.neon

This file was deleted.

2 changes: 0 additions & 2 deletions tests/phpstan/phpstan-1.7.7.neon

This file was deleted.

2 changes: 0 additions & 2 deletions tests/phpstan/phpstan-1.7.8.neon

This file was deleted.

File renamed without changes.
File renamed without changes.