Php 7.2 compatibility (#144)

* Updating syntax to comply with php 7.2 * Updating changelog
OneSignal · Aug 10, 2018 · 62c778c · 62c778c
1 parent 0e0de87
commit 62c778c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/onesignal-settings.php b/onesignal-settings.php
@@ -119,31 +119,31 @@ public static function get_onesignal_settings() {
     // Assign defaults if the key doesn't exist in $onesignal_wp_settings
     // Except for those with value CALCULATE_LEGACY_VALUE -- we need special logic for legacy values that used to exist in previous plugin versions
     reset($defaults);
-    while (list($key, $value) = each($defaults)) {
-        if ($value === "CALCULATE_LEGACY_VALUE") {
-            if (!array_key_exists($key, $onesignal_wp_settings)) {
-               $legacyKey = $legacies[$key . '.legacyKey'];
-               $inverted = (array_key_exists($key . '.invertLegacyValue', $legacies) && $legacies[$key . '.invertLegacyValue']);
-               $default = $legacies[$key . '.default'];
-               if (array_key_exists($legacyKey, $onesignal_wp_settings)) {
-                 if ($inverted) {
-                    $onesignal_wp_settings[$key] = !$onesignal_wp_settings[$legacyKey];
-                 } else {
-                    $onesignal_wp_settings[$key] = $onesignal_wp_settings[$legacyKey];
-                 }
-               } else {
-                 $onesignal_wp_settings[$key] = $default;
-               }
-            }
-        }
-        else if ($value === "CALCULATE_SPECIAL_VALUE") {
-	        // Do nothing, handle below
-        }
-        else {
-            if (!array_key_exists($key, $onesignal_wp_settings)) {
-               $onesignal_wp_settings[$key] = $value;
-            }
-        }
+    foreach ($defaults as $key => $value) {
+      if ($value === "CALCULATE_LEGACY_VALUE") {
+          if (!array_key_exists($key, $onesignal_wp_settings)) {
+              $legacyKey = $legacies[$key . '.legacyKey'];
+              $inverted = (array_key_exists($key . '.invertLegacyValue', $legacies) && $legacies[$key . '.invertLegacyValue']);
+              $default = $legacies[$key . '.default'];
+              if (array_key_exists($legacyKey, $onesignal_wp_settings)) {
+                if ($inverted) {
+                  $onesignal_wp_settings[$key] = !$onesignal_wp_settings[$legacyKey];
+                } else {
+                  $onesignal_wp_settings[$key] = $onesignal_wp_settings[$legacyKey];
+                }
+              } else {
+                $onesignal_wp_settings[$key] = $default;
+              }
+          }
+      }
+      else if ($value === "CALCULATE_SPECIAL_VALUE") {
+        // Do nothing, handle below
+      }
+      else {
+          if (!array_key_exists($key, $onesignal_wp_settings)) {
+              $onesignal_wp_settings[$key] = $value;
+          }
+      }
     }
 
     /*

diff --git a/onesignal-widget.php b/onesignal-widget.php
@@ -43,6 +43,6 @@ function widget($args, $instance) {
 	}
 }
 
-add_action('widgets_init', create_function('', 'return register_widget("OneSignalWidget");'));
+add_action('widgets_init', function(){register_widget("OneSignalWidget");});
 
 ?>
diff --git a/readme.txt b/readme.txt
@@ -56,7 +56,7 @@ Features:
 
 = 1.16.8 =
 
-This release makes HTTP switch match the dashboard. Renamed to "My site is not fully HTTPS".
+This release makes HTTP switch match the dashboard (renamed to "My site is not fully HTTPS") and removes deprecation warnings for php 7.2.
 
 = 1.16.7 =