Skip to content

Commit cbf3bbe

Browse files
committed
Merge branch 'develop' into stable
2 parents c33b941 + 3c392bc commit cbf3bbe

10 files changed

+497
-408
lines changed

.github/workflows/test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
runs-on: ubuntu-latest
66
strategy:
77
matrix:
8-
php: [ '7.4', '8.0', '8.1' ]
8+
php: [ '7.4', '8.0', '8.1', '8.2' ]
99
steps:
1010
- name: Checkout
1111
uses: actions/checkout@v3
@@ -19,7 +19,7 @@ jobs:
1919
- name: Unit tests
2020
run: composer test
2121
- name: Coverage Report
22-
if: matrix.php == '8.0'
22+
if: matrix.php == '8.1'
2323
uses: codecov/codecov-action@v3
2424
quality:
2525
runs-on: ubuntu-latest
@@ -29,12 +29,12 @@ jobs:
2929
- name: Setup PHP
3030
uses: shivammathur/setup-php@v2
3131
with:
32-
php-version: '8.0'
32+
php-version: '8.1'
3333
tools: composer
3434
- name: Setup Node
3535
uses: actions/setup-node@v2
3636
with:
37-
node-version: '16'
37+
node-version: '18'
3838
- name: Install
3939
run: |
4040
composer install --no-interaction

.github/workflows/wordpress-plugin-asset-update.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Setup PHP
1414
uses: shivammathur/setup-php@v2
1515
with:
16-
php-version: '8.0'
16+
php-version: '8.1'
1717
tools: composer
1818
- name: Build
1919
run: composer install

.github/workflows/wordpress-plugin-deploy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup PHP
1515
uses: shivammathur/setup-php@v2
1616
with:
17-
php-version: '8.0'
17+
php-version: '8.1'
1818
tools: composer
1919
- name: Build
2020
run: composer install

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
### 1.4.4 ###
4+
* Fix warning on SafeBrowsing API errors with PHP 8.1+ (#123)
5+
* Tested up to WordPress 6.2
6+
37
### 1.4.3 ###
48
* Point Safe Browsing link on settings page to site-specific URL (#106)
59
* Increase the size of the Safe Browsing API input to show the entire key (#109)

README.md

+9-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=TD4AMD2D8EMZW
55
* Requires at least: 4.1
66
* Requires PHP: 5.2
7-
* Tested up to: 6.1
8-
* Stable tag: 1.4.3
7+
* Tested up to: 6.2
8+
* Stable tag: 1.4.4
99
* License: GPLv2 or later
1010
* License URI: https://www.gnu.org/licenses/gpl-2.0.html
1111

@@ -41,6 +41,10 @@ A complete documentation is available on the [AntiVirus website](https://antivir
4141

4242
## Changelog ##
4343

44+
### 1.4.4 ###
45+
* Fix warning on SafeBrowsing API errors with PHP 8.1+ (#123)
46+
* Tested up to WordPress 6.2
47+
4448
### 1.4.3 ###
4549
* Point Safe Browsing link on settings page to site-specific URL (#106)
4650
* Increase the size of the Safe Browsing API input to show the entire key (#109)
@@ -86,6 +90,9 @@ For the complete changelog, check out our [GitHub repository](https://github.com
8690

8791
## Upgrade Notice ##
8892

93+
### 1.4.4 ###
94+
This is a small maintenance release which fixes a PHP warning on Safe Browsing API errors with PHP 8.1.
95+
8996
### 1.4.3 ###
9097
Please note that we will discontinue providing a built-in API key for the Google Safe Browsing feature.
9198
If you have enabled this check, please provide your own API key before the next update.

antivirus.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Text Domain: antivirus
99
* License: GPLv2 or later
1010
* License URI: http://www.gnu.org/licenses/gpl-2.0.html
11-
* Version: 1.4.3
11+
* Version: 1.4.4
1212
*
1313
* @package AntiVirus
1414
*/

composer.lock

+43-41
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

inc/class-antivirus-safebrowsing.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public static function check_safe_browsing() {
101101
$mail_body .= sprintf(
102102
"\r\n\r\n%s:\r\n %s\r\n",
103103
esc_html__( 'Error message from API', 'antivirus' ),
104-
filter_var( $response_json['error']['message'], FILTER_SANITIZE_STRING )
104+
esc_html( $response_json['error']['message'] )
105105
);
106106
}
107107

0 commit comments

Comments
 (0)