Merge pull request #69 from osDXP/1.1.3

1.1.3

Author: al-esc

includes/dependencies/plugin-update-checker/class-osdxp-module-update-checker-ui.php

@@ -4,7 +4,7 @@
  * Module Update Checker UI
  * This adds extra links to module table view to check for updates & extra
  *
- * @see   Puc_v4p8_Plugin_Ui
+ * @see   Puc_v4p10_Plugin_Ui
  */
 
 namespace OSDXP_Dashboard;

includes/dependencies/plugin-update-checker/class-osdxp-module-update-checker.php

@@ -3,12 +3,12 @@
 /**
  * Module update checker extended from vendor PUC
  *
- * @see   Puc_v4p8_Plugin_UpdateChecker
+ * @see   Puc_v4p10_Plugin_UpdateChecker
  */
 
 namespace OSDXP_Dashboard;
 
-class OsdxpModuleUpdateChecker extends \Puc_v4p8_UpdateChecker
+class OsdxpModuleUpdateChecker extends \Puc_v4p10_UpdateChecker
 {
 	protected $updateTransient = 'update_plugins';
 	protected $translationType = 'plugin';
@@ -18,7 +18,7 @@ class OsdxpModuleUpdateChecker extends \Puc_v4p8_UpdateChecker
 	public $muPluginFile = ''; //For MU modules, the module filename relative to the mu-plugins directory.
 
 	/**
-	 * @var Puc_v4p8_Plugin_Package
+	 * @var Puc_v4p10_Plugin_Package
 	 */
 	protected $package;
 
@@ -84,11 +84,11 @@ public function __construct(
 	 * Create an instance of the scheduler.
 	 *
 	 * @param int $checkPeriod
-	 * @return Puc_v4p8_Scheduler
+	 * @return Puc_v4p10_Scheduler
 	 */
 	protected function createScheduler($checkPeriod)
 	{
-		$scheduler = new \Puc_v4p8_Scheduler($this, $checkPeriod, array('load-plugins.php'));
+		$scheduler = new \Puc_v4p10_Scheduler($this, $checkPeriod, array('load-plugins.php'));
 		register_deactivation_hook($this->pluginFile, array($scheduler, 'removeUpdaterCron'));
 		return $scheduler;
 	}
@@ -136,14 +136,14 @@ public function removeHooks()
 	 * @uses wp_remote_get()
 	 *
 	 * @param array $queryArgs Additional query arguments to append to the request. Optional.
-	 * @return Puc_v4p8_Plugin_Info
+	 * @return Puc_v4p10_Plugin_Info
 	 */
 	public function requestInfo($queryArgs = array())
 	{
-		list($pluginInfo, $result) = $this->requestMetadata('Puc_v4p8_Plugin_Info', 'request_info', $queryArgs);
+		list($pluginInfo, $result) = $this->requestMetadata('Puc_v4p10_Plugin_Info', 'request_info', $queryArgs);
 
 		if ($pluginInfo !== null) {
-			/** @var Puc_v4p8_Plugin_Info $pluginInfo */
+			/** @var Puc_v4p10_Plugin_Info $pluginInfo */
 			$pluginInfo->filename = $this->pluginFile;
 			$pluginInfo->slug = $this->slug;
 		}
@@ -157,7 +157,7 @@ public function requestInfo($queryArgs = array())
 	 *
 	 * @uses PluginUpdateChecker::requestInfo()
 	 *
-	 * @return Puc_v4p8_Update|null An instance of Plugin_Update, or NULL when no updates are available.
+	 * @return Puc_v4p10_Update|null An instance of Plugin_Update, or NULL when no updates are available.
 	 */
 	public function requestUpdate()
 	{
@@ -167,7 +167,7 @@ public function requestUpdate()
 		if ($pluginInfo === null) {
 			return null;
 		}
-		$update = \Puc_v4p8_Plugin_Update::fromPluginInfo($pluginInfo);
+		$update = \Puc_v4p10_Plugin_Update::fromPluginInfo($pluginInfo);
 
 		$update = $this->filterUpdateResult($update);
 
@@ -284,13 +284,13 @@ public function isBeingUpgraded($upgrader = null)
 	 * Uses cached update data. To retrieve update information straight from
 	 * the metadata URL, call requestUpdate() instead.
 	 *
-	 * @return Puc_v4p8_Plugin_Update|null
+	 * @return Puc_v4p10_Plugin_Update|null
 	 */
 	public function getUpdate()
 	{
 		$update = parent::getUpdate();
 		if (isset($update)) {
-			/** @var Puc_v4p8_Plugin_Update $update */
+			/** @var Puc_v4p10_Plugin_Update $update */
 			$update->filename = $this->pluginFile;
 		}
 		return $update;
@@ -404,21 +404,21 @@ public function addResultFilter($callback)
 
 	protected function createDebugBarExtension()
 	{
-		return new \Puc_v4p8_DebugBar_PluginExtension($this);
+		return new \Puc_v4p10_DebugBar_PluginExtension($this);
 	}
 
 	/**
 	 * Create a package instance that represents this plugin or theme.
 	 *
-	 * @return Puc_v4p8_InstalledPackage
+	 * @return Puc_v4p10_InstalledPackage
 	 */
 	protected function createInstalledPackage()
 	{
-		return new \Puc_v4p8_Plugin_Package($this->pluginAbsolutePath, $this);
+		return new \Puc_v4p10_Plugin_Package($this->pluginAbsolutePath, $this);
 	}
 
 	/**
-	 * @return Puc_v4p8_Plugin_Package
+	 * @return Puc_v4p10_Plugin_Package
 	 */
 	public function getInstalledPackage()
 	{
@@ -436,7 +436,7 @@ public function getInstalledPackage()
 	 * @param string $metaClass Parse the JSON as an instance of this class. It must have a static fromJson method.
 	 * @param string $filterRoot
 	 * @param array $queryArgs Additional query arguments.
-	 * @return array [Puc_v4p8_Metadata|null, array|WP_Error]
+	 * @return array [Puc_v4p10_Metadata|null, array|WP_Error]
 	 * A metadata instance and the value returned by wp_remote_get().
 	 */
 	protected function requestMetadata($metaClass, $filterRoot, $queryArgs = array())

osdxp-dashboard.php

@@ -8,7 +8,7 @@
  * Author URI:          https://osdxp.org
  * Requires at least:   5.2
  * Requires PHP:        7.2
- * Version:             1.1.2
+ * Version:             1.1.3
  * License:             GPL2
  * License URI:         https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  * Text domain:         osdxp-dashboard
@@ -42,7 +42,7 @@
 define('OSDXP_DASHBOARD_URL', plugins_url('/', OSDXP_DASHBOARD_FILE));
 
 // Always mention the plugin version (enclose in quotes so it is processed as a string).
-define('OSDXP_DASHBOARD_VER', '1.1.2');
+define('OSDXP_DASHBOARD_VER', '1.1.3');
 define('OSDXP_DASHBOARD_SITE', 'https://osdxp.org/');
 
 define('OSDXP_DASHBOARD_PLUGIN_NAME', 'Open Source DXP Dashboard');