Move all actions and filters from Options class to wrapper functions

includes/Database/Options.php

@@ -75,8 +75,6 @@ public function get_all_options() {
             $this->ydb->set_option($name, yourls_maybe_unserialize($value));
         }
 
-        yourls_apply_filter('get_all_options', 'deprecated');
-
         return true;
     }
 
@@ -172,7 +170,7 @@ public function update($name, $newvalue) {
 
         // Cache option value to save a DB query if needed later
         $this->ydb->set_option($name, $newvalue);
-    	yourls_do_action( 'update_option', $name, $oldvalue, $newvalue );
+
         return true;
     }
 
@@ -217,7 +215,6 @@ public function add($name, $value) {
 
         // Cache option value to save a DB query if needed later
         $this->ydb->set_option($name, $value);
-        yourls_do_action('add_option', $name, $_value);
 
         return true;
     }
@@ -246,7 +243,6 @@ public function delete($name) {
             return false;
         }
 
-        yourls_do_action('delete_option', $name);
         $this->ydb->delete_option($name);
         return true;
     }

includes/functions-options.php

@@ -42,17 +42,20 @@ function yourls_get_all_options() {
     // Allow plugins to short-circuit all options. (Note: regular plugins are loaded after all options)
     $pre = yourls_apply_filter( 'shunt_all_options', false );
     if ( false !== $pre ) {
-        return $pre;
+        return;
     }
 
     $options = new \YOURLS\Database\Options(yourls_get_db());
+    $value   = $options->get_all_options();
 
-    if ($options->get_all_options() === false) {
+    if ($value === false) {
         // Zero option found but no unexpected error so far: YOURLS isn't installed
         yourls_set_installed(false);
         return;
     }
 
+    yourls_do_action( 'get_all_options', $value );
+
     yourls_set_installed(true);
 }
 
@@ -67,8 +70,11 @@ function yourls_get_all_options() {
  * @return bool False if value was not updated, true otherwise.
  */
 function yourls_update_option( $option_name, $newvalue ) {
-    $option = new \YOURLS\Database\Options(yourls_get_db());
-    $update = $option->update($option_name, $newvalue);
+    $option   = new \YOURLS\Database\Options(yourls_get_db());
+    $update   = $option->update($option_name, $newvalue);
+    $oldvalue = $oldvalue = yourls_get_option($option_name);
+
+    yourls_do_action( 'update_option', $option_name, $oldvalue, $newvalue, $update );
 
     return $update;
 }
@@ -87,6 +93,8 @@ function yourls_add_option( $name, $value = '' ) {
     $option = new \YOURLS\Database\Options(yourls_get_db());
     $add    = $option->add($name, $value);
 
+    yourls_do_action( 'add_option', $name, $value, $add );
+
     return $add;
 }
 
@@ -103,6 +111,8 @@ function yourls_delete_option( $name ) {
     $option = new \YOURLS\Database\Options(yourls_get_db());
     $delete = $option->delete($name);
 
+    yourls_do_action( 'delete_option', $name, $delete );
+
     return $delete;
 }