fixes #436 Illegal string offset and Invalid argument in FlashMessages

Jon007 · Jon007 · commit feedc68431bc · 2019-06-29T09:18:26.000+01:00
fixes #436 error occurs when trying to add message to messages when messages is not a valid array, permitted in php7.0 and earlier but not in php 7.1. Not reproduced but fixed by adding defensive code to ensure array is always initialised.
diff --git a/src/Hyyan/WPI/Tools/FlashMessages.php b/src/Hyyan/WPI/Tools/FlashMessages.php
@@ -132,6 +132,11 @@ public static function getOptionName()
      */
     private static function getMessages()
     {
+        $messages = get_option( static::getOptionName(), array() );
+        if ( ! is_array( $messages ) ) {
+            $messages = array();
+        }
+        return $messages;
         return get_option(static::getOptionName(), array());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,11 @@ public static function getOptionName()`
`132`	`132`	`*/`
`133`	`133`	`private static function getMessages()`
`134`	`134`	`{`
	`135`	`+ $messages = get_option( static::getOptionName(), array() );`
	`136`	`+ if ( ! is_array( $messages ) ) {`
	`137`	`+ $messages = array();`
	`138`	`+ }`
	`139`	`+ return $messages;`
`135`	`140`	`return get_option(static::getOptionName(), array());`
`136`	`141`	`}`
`137`	`142`	`}`