Currently we have some license issues. We are working on it.

Commit 7b864c26 authored by noplanman's avatar noplanman
Browse files

Merge branch 'bump_deps' into 'develop'

Bump OTPHP to 10.0 and apply necessary fixes, require PHP 7.2

See merge request !14
parents d0d70729 53145b54
Pipeline #4507 passed with stage
in 28 seconds
......@@ -8,12 +8,14 @@ before_script:
- curl -sS https://getcomposer.org/installer | php
- php composer.phar install
test:7.1:
image: php:7.1-cli-alpine
script:
- php composer.phar check-code
test:7.2:
image: php:7.2-cli-alpine
script: php composer.phar check-code
test:7.3:
image: php:7.3-cli-alpine
script:
- php composer.phar check-code
script: php composer.phar check-code
test:7.4:
image: php:7.4-cli-alpine
script: php composer.phar check-code
......@@ -246,12 +246,12 @@ class Wp_Otp_Admin {
*
* @since 0.1.0
*
* @param string $otp_window
* @param string $qr_code_provisioning_uri
*/
$otp_qr_code_uri = $otp->getQrCodeUri( apply_filters(
'wp_otp_qr_code_provisioning_uri',
'https://api.qrserver.com/v1/create-qr-code/?data={PROVISIONING_URI}&qzone=2&size=300x300'
) );
), '{PROVISIONING_URI}' );
$otp_enabled = $user_meta_data->get( 'enabled' );
......
......@@ -23,11 +23,11 @@
}
],
"require": {
"php": "^7.1",
"spomky-labs/otphp": "^9.1"
"php": "^7.2",
"spomky-labs/otphp": "^10.0"
},
"require-dev": {
"wp-coding-standards/wpcs": "^2.2",
"wp-coding-standards/wpcs": "^2.3",
"dealerdirect/phpcodesniffer-composer-installer": "^0.5.0"
},
"scripts": {
......
......@@ -3,9 +3,9 @@ Contributors: noplanman
Donate link: https://noplanman.ch/donate
Tags: login, 2fa, two factor, otp, totp, one time password, security, recovery, google authenticator
Requires at least: 4.6
Tested up to: 5.3
Stable tag: 0.4.1
Requires PHP: 7.1
Tested up to: 5.4.2
Stable tag: unreleased
Requires PHP: 7.2
Author URI: https://noplanman.ch
Plugin URI: https://git.feneas.org/noplanman/wp-otp
License: GPLv2 or later
......@@ -49,7 +49,7 @@ There are a multitude of filters to be adjusted.
* `wp_otp_secret_length`: Length of the secret key.
= Minimum requirements =
WordPress 4.6, PHP 7.1.
WordPress 4.6, PHP 7.2.
= Donate / Support =
......@@ -93,6 +93,10 @@ This means that you will need to add your OTP (or recovery) code at the end of y
== Changelog ==
= Unreleased =
* Require at least PHP 7.2.
* Update OTPHP to 10.0.
= 0.4.1 =
* Fix nullable return type when checking if OTP is enabled.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment