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

Bump min compatibility to PHP 7.1.3 and PS 1.7.7, module version to 6.0.0 #562

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
6 changes: 3 additions & 3 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ 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 7.1 => 8.2
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/[email protected]

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

- name: PHP syntax checker 7.2
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
presta-versions: ['1.7.1.2', '1.7.2.5', '1.7.3.4', '1.7.4.4', '1.7.5.1', '1.7.6', '1.7.7', '1.7.8', 'latest']
presta-versions: ['1.7.7', '1.7.8', '8.0', 'latest']
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Connect with your visitors and reassure them about secure payment, free shipping

## Compatibility

PrestaShop: `1.7.0.0` or later
PrestaShop: `1.7.7.0` or later

## Multistore compatibility

Expand Down
18 changes: 9 additions & 9 deletions blockreassurance.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public function __construct()
// Settings
$this->name = 'blockreassurance';
$this->tab = 'front_office_features';
$this->version = '5.1.4';
$this->version = '6.0.0';
$this->author = 'PrestaShop';
$this->need_instance = false;

Expand Down Expand Up @@ -126,7 +126,7 @@ public function __construct()
// Confirm uninstall
$this->confirmUninstall = $this->trans('Are you sure you want to uninstall this module?', [], 'Modules.Blockreassurance.Admin');
$this->ps_url = $this->context->link->getBaseLink();
$this->ps_versions_compliancy = ['min' => '1.7', 'max' => _PS_VERSION_];
$this->ps_versions_compliancy = ['min' => '1.7.7', 'max' => _PS_VERSION_];
$this->templateFile = 'module:blockreassurance/views/templates/hook/blockreassurance.tpl';
}

Expand Down Expand Up @@ -186,13 +186,13 @@ public function install()
Configuration::updateValue('PSR_TEXT_COLOR', '#000000');

// Hooks
if (parent::install() &&
$this->registerHook('displayAfterBodyOpeningTag') &&
$this->registerHook('displayNavFullWidth') &&
$this->registerHook('displayFooterAfter') &&
$this->registerHook('displayFooterBefore') &&
$this->registerHook('displayReassurance') &&
$this->registerHook('actionFrontControllerSetMedia')
if (parent::install()
&& $this->registerHook('displayAfterBodyOpeningTag')
&& $this->registerHook('displayNavFullWidth')
&& $this->registerHook('displayFooterAfter')
&& $this->registerHook('displayFooterBefore')
&& $this->registerHook('displayReassurance')
&& $this->registerHook('actionFrontControllerSetMedia')
) {
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion classes/ReassuranceActivity.php
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public static function getAllBlockByStatus($id_lang = 1)
$xmlMimes = ['image/svg', 'image/svg+xml'];
foreach ($result as &$item) {
$item['is_svg'] = !empty($item['custom_icon'])
&& (in_array(self::getMimeType(_PS_ROOT_DIR_ . $item['custom_icon']), $xmlMimes));
&& in_array(self::getMimeType(_PS_ROOT_DIR_ . $item['custom_icon']), $xmlMimes);
}

return $result;
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
],
"require": {
"php": ">=5.6.0"
"php": ">=7.1.3"
},
"require-dev": {
"prestashop/php-dev-tools": "^4.3"
Expand Down
Loading