removed plugins_api hook from main plugin, handled by PucFactory

Author: thetoine

README.txt

@@ -2,20 +2,17 @@
 Contributors: MILL3 Studio
 Donate link: https://mill3.studio/
 Tags: custom
-Requires at least: 6.0.0
-Tested up to: 6.5
+Requires at least: 6.3.0
+Tested up to: 6.3
 License: GPLv2 or later
+Requires: PHP8
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
 MILL3 WP utils, includes Gutenberg editor sidebar resizer.
 
 == Description ==
 
-TODO
-
-== Screenshots ==
-
-TODO
+MILL3 WP utils, includes Gutenberg editor sidebar resizer.
 
 == Changelog ==
 
@@ -25,7 +22,13 @@ TODO
 = 0.0.2 =
 * Gutenberg Sidebar : added max-width CSS rule on container
 
+= 0.0.3.x =
+* Self-update class era
+
+= 0.0.4 =
+* First release
+
 == TODO ==
 
-[ ] class-mill3-wp-utils-updater.php : use plugin-update-checker library https://github.com/YahnisElsts/plugin-update-checker
+[X] class-mill3-wp-utils-updater.php : use plugin-update-checker library https://github.com/YahnisElsts/plugin-update-checker
 [ ] Built admin interface for settings and enabling components

includes/class-mill3-wp-utils-updater.php

@@ -10,8 +10,6 @@ class Mill3_Wp_Utils_Updater
 
   private $api_url;
 
-  private $plugin_version;
-
   private $plugin_file;
 
   private $plugin_slug;
@@ -22,52 +20,16 @@ function __construct()
   {
     $this->api_url = MILL3_WP_UTILS_PLUGINS_API;
     $this->plugin_file = MILL3_WP_UTILS_PLUGIN_FILE;
-    $this->plugin_version = MILL3_WP_UTILS_VERSION;
     $this->plugin_slug = MILL3_WP_UTILS_PLUGIN_SLUG;
 
     $this->updater = PucFactory::buildUpdateChecker(
       $this->api_url,
       $this->plugin_file,
       $this->plugin_slug
     );
-
     $this->updater->setBranch('master');
   }
 
-  /**
-   * Force the plugin directory to match existing directory structure, Github releases are structured differently, ie: plugin-name-x.x.x.zip
-   */
-  public function upgrader_package_options($options)
-  {
-    // get data from the updater instance
-    $update = $this->updater->getUpdate();
-
-    // stop here if the plugin is not the one we want to modify
-    if (isset($options['hook_extra']['plugin']) && $options['hook_extra']['plugin'] !== $update->filename) {
-      return $options;
-    }
-
-    $destination = $options['destination'] ?? '';
-    $package     = $options['package'] ?? '';
-    $dirname     = isset($options['hook_extra']['plugin'])
-      ? dirname($options['hook_extra']['plugin'])
-      : '';
-
-    if (empty($dirname) || '.' === $dirname) {
-      return $options;
-    }
-
-    if ('api.github.com' !== parse_url($package, PHP_URL_HOST)) {
-      return $options;
-    }
-
-    if (WP_PLUGIN_DIR === $destination) {
-      $options['destination'] = path_join($destination, $dirname);
-    }
-
-    return $options;
-  }
-
   public function check_for_update($transient)
   {
     // Only proceed if the transient contains the 'checked' array
@@ -93,48 +55,4 @@ public function check_for_update($transient)
     return $transient;
   }
 
-  public function plugins_api($false, $action, $args)
-  {
-    if ($action !== 'plugin_information' || $args->slug !== MILL3_WP_UTILS_PLUGIN_SLUG) {
-      return false;
-    }
-
-    // get response from the API
-    $response = $this->get_remote_version('/infos');
-
-    // decode the response
-    $plugin_info = json_decode(wp_remote_retrieve_body($response), true);
-
-    // Populate the plugin information
-    $result = (object) array(
-      'name'          => $plugin_info['name'],
-      'slug'          => $plugin_info['slug'],
-      'version'       => $plugin_info['version'],
-      'author'        => $plugin_info['author'],
-      'author_profile' => $plugin_info['author_profile'],
-      'homepage'      => $plugin_info['homepage'],
-      'download_link' => $plugin_info['download_link'],
-      // 'trunk'         => $plugin_info['trunk'],
-      // 'requires'      => $plugin_info['requires'],
-      'tested'        => $plugin_info['tested'],
-      'requires_php'  => $plugin_info['requires_php'],
-      'sections'      => array(
-        'description'  => $plugin_info['sections']['description'],
-        'installation' => $plugin_info['sections']['installation'],
-        'changelog'    => $plugin_info['sections']['changelog'],
-      )
-      // 'banners'       => array(
-      //     'low'  => $plugin_info['banners']['low'],
-      //     'high' => $plugin_info['banners']['high'],
-      // ),
-    );
-
-    return $result;
-  }
-
-  public function get_remote_version($uri = '')
-  {
-    $response = wp_remote_get($this->api_url . $uri);
-    return $response;
-  }
 }

includes/class-mill3-wp-utils.php

@@ -158,15 +158,7 @@ private function set_updates()
     $plugin_updates = new \Mill3_Plugins\Utils\Updater\Mill3_Wp_Utils_Updater();
 
     // register the hooks to WP core update process
-
-    // after the plugin is downloaded, force the plugin directory to match existing directory structure
-    // $this->loader->add_filter('upgrader_package_options', $plugin_updates, 'upgrader_package_options', 10, 1);
-
-    // check for updates
     $this->loader->add_filter('pre_set_site_transient_update_plugins', $plugin_updates, 'check_for_update');
-
-    // the 'View details' link in the plugin list
-    $this->loader->add_filter('plugins_api', $plugin_updates, 'plugins_api', 10, 3);
   }
 
   /**

mill3-wp-utils.php

@@ -3,7 +3,7 @@
  * Plugin Name:       MILL3 WP Utils
  * Plugin URI:        https://github.com/Mill3/mill3-wp-utils-plugin
  * Description:       MILL3 WP utils, includes Gutenberg editor sidebar resizer.
- * Version:           0.0.3.9.1
+ * Version:           0.0.3.9.2
  * Author:            MILL3 Studio
  * Author URI:        https://mill3.studio/
  * Tested up to:      6.6.6
@@ -27,7 +27,7 @@
  * Start at version 0.0.1 and use SemVer - https://semver.org
  * Rename this for your plugin and update it as you release new versions.
  */
-define( 'MILL3_WP_UTILS_VERSION', '0.0.3.9.1' );
+define( 'MILL3_WP_UTILS_VERSION', '0.0.3.9.2' );
 
 
 /**