Merge pull request #4 from BrianHenryIE/dev

v1.0.2

Author: BrianHenryIE

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.0.2
+
+* Fixed PHP warning when loading settings page first time due to empty values.
+
 ### 1.0.1 
 * Fixed bug with IPv6 where : was a disallowed character in the cache key.
 * Changed the HTML "step" from 60 to 1 – I had thought it would step by 60 but still allow % values.

README.md

@@ -1,4 +1,4 @@
-[![WordPress tested 5.7](https://img.shields.io/badge/WordPress-v5.7%20tested-0073aa.svg)](https://wordpress.org/plugins/plugin_slug) [![PHPCS WPCS](https://img.shields.io/badge/PHPCS-WordPress%20Coding%20Standards-8892BF.svg)](https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards) [![PHPStan ](.github/phpstan.svg)](https://github.com/szepeviktor/phpstan-wordpress)  [![PHPUnit ](.github/coverage.svg)](https://brianhenryie.github.io/bh-wc-checkout-rate-limiter/)
+[![WordPress tested 5.7](https://img.shields.io/badge/WordPress-v5.7%20tested-0073aa.svg)](https://wordpress.org/plugins/bh-wc-checkout-rate-limiter) [![PHPCS WPCS](https://img.shields.io/badge/PHPCS-WordPress%20Coding%20Standards-8892BF.svg)](https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards) [![PHPStan ](.github/phpstan.svg)](https://github.com/szepeviktor/phpstan-wordpress)  [![PHPUnit ](.github/coverage.svg)](https://brianhenryie.github.io/bh-wc-checkout-rate-limiter/)
 
 # Checkout Rate Limiter
 

src/README.txt

@@ -68,13 +68,14 @@ directory take precedence. For example, `/assets/screenshot-1.png` would win ove
 
 == Changelog ==
 
+= 1.0.2 =
+
+Fixed PHP warning when loading settings page first time due to empty values.
+
 = 1.0.1 =
 * Fixed bug with IPv6 where : was a disallowed character in the cache key.
 * Changed the HTML "step" from 60 to 1 – I had thought it would step by 60 but still allow % values.
 
-= 0.5 =
-* List versions from most recent at top to oldest at bottom.
-
 == Upgrade Notice ==
 
 = 1.0 =

src/WooCommerce/class-settings-advanced.php

@@ -162,6 +162,14 @@ public function print_attempts_per_interval_settings_field( array $value ): void
 
 		$option_value = $value['value'];
 
+        if( !isset( $option_value['attempts'] ) ) {
+            $option_value['attempts'] = '';
+        }
+
+        if( !isset( $option_value['interval'] ) ) {
+            $option_value['interval'] = '';
+        }
+
 		// Description handling... copied from WooCommerce WC_Admin_Settings.
 		$field_description = WC_Admin_Settings::get_field_description( $value );
 		$description       = $field_description['description'];

src/bh-wc-checkout-rate-limiter.php

@@ -15,7 +15,7 @@
  * Plugin Name:       Checkout Rate Limiter
  * Plugin URI:        http://github.com/brianhenryie/bh-wc-checkout-rate-limiter/
  * Description:       Rate limit the WooCommerce checkout to prevent card attacks.
- * Version:           1.0.1
+ * Version:           1.0.2
  * Author:            BrianHenryIE
  * Author URI:        https://BrianHenry.IE
  * License:           GPL-2.0+
@@ -44,7 +44,7 @@
  * Start at version 1.0.0 and use SemVer - https://semver.org
  * Rename this for your plugin and update it as you release new versions.
  */
-define( 'BH_WC_CHECKOUT_RATE_LIMITER_VERSION', '1.0.1' );
+define( 'BH_WC_CHECKOUT_RATE_LIMITER_VERSION', '1.0.2' );
 
 register_activation_hook( __FILE__, array( Activator::class, 'activate' ) );
 register_deactivation_hook( __FILE__, array( Deactivator::class, 'deactivate' ) );

tests/wpunit/WooCommerce/class-settings-advanced-wpunit-Test.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace BrianHenryIE\Checkout_Rate_Limiter\WooCommerce;
+
+use BrianHenryIE\Checkout_Rate_Limiter\API\Settings_Interface;
+use BrianHenryIE\Checkout_Rate_Limiter\Psr\Log\NullLogger;
+use \Exception;
+
+/**
+ * @covers BrianHenryIE\Checkout_Rate_Limiter\WooCommerce\Settings_Advanced
+ *
+ * Class Ajax_WPUnit_Test
+ * @package BrianHenryIE\Checkout_Rate_Limiter\WooCommerce
+ */
+class Settings_Advanced_WPUnit_Test extends \Codeception\TestCase\WPTestCase {
+
+    /**
+     * When the settings page is first loaded, the values for the rates are not yet set, causing a PHP warning:
+     *
+     * `PHP Warning: Illegal string offset 'interval' in .../WooCommerce/class-settings-advanced.php on line 196`
+     */
+    public function test_first_run_empty_variables() {
+
+        $settings = $this->makeEmpty( Settings_Interface::class );
+        $logger = new NullLogger();
+
+        $sut = new Settings_Advanced( $settings, $logger );
+
+        $value = array(
+            'value' => array(),
+            'id' => '',
+            'class' => '',
+            'title' => '',
+            'desc_tip' => '',
+        );
+
+        $exception = null;
+        try {
+            $sut->print_attempts_per_interval_settings_field($value);
+        } catch ( \PHPUnit\Framework\Exception $e ) {
+            $exception = $e;
+        }
+
+        $this->assertNull( $exception );
+
+    }
+
+}