futtta / autoptimize

classes/external/php/plugin-update-checker/Puc/v4p4/Plugin/Info.php

Indentation +125 added lines, -125 removed lines

@@ -1,130 +1,130 @@
 <?php
 if ( !class_exists('Puc_v4p4_Plugin_Info', false) ):
 
-	/**
-	 * A container class for holding and transforming various plugin metadata.
-	 *
-	 * @author Janis Elsts
-	 * @copyright 2016
-	 * @access public
-	 */
-	class Puc_v4p4_Plugin_Info extends Puc_v4p4_Metadata {
-		//Most fields map directly to the contents of the plugin's info.json file.
-		//See the relevant docs for a description of their meaning.
-		public $name;
-		public $slug;
-		public $version;
-		public $homepage;
-		public $sections = array();
-		public $download_url;
-
-		public $banners;
-		public $icons = array();
-		public $translations = array();
-
-		public $author;
-		public $author_homepage;
-
-		public $requires;
-		public $tested;
-		public $upgrade_notice;
-
-		public $rating;
-		public $num_ratings;
-		public $downloaded;
-		public $active_installs;
-		public $last_updated;
-
-		public $id = 0; //The native WP.org API returns numeric plugin IDs, but they're not used for anything.
-
-		public $filename; //Plugin filename relative to the plugins directory.
-
-		/**
-		 * Create a new instance of Plugin Info from JSON-encoded plugin info
-		 * returned by an external update API.
-		 *
-		 * @param string $json Valid JSON string representing plugin info.
-		 * @return self|null New instance of Plugin Info, or NULL on error.
-		 */
-		public static function fromJson($json){
-			$instance = new self();
-
-			if ( !parent::createFromJson($json, $instance) ) {
-				return null;
-			}
-
-			//json_decode decodes assoc. arrays as objects. We want them as arrays.
-			$instance->sections = (array)$instance->sections;
-			$instance->icons = (array)$instance->icons;
-
-			return $instance;
-		}
-
-		/**
-		 * Very, very basic validation.
-		 *
-		 * @param StdClass $apiResponse
-		 * @return bool|WP_Error
-		 */
-		protected function validateMetadata($apiResponse) {
-			if (
-				!isset($apiResponse->name, $apiResponse->version)
-				|| empty($apiResponse->name)
-				|| empty($apiResponse->version)
-			) {
-				return new WP_Error(
-					'puc-invalid-metadata',
-					"The plugin metadata file does not contain the required 'name' and/or 'version' keys."
-				);
-			}
-			return true;
-		}
-
-
-		/**
-		 * Transform plugin info into the format used by the native WordPress.org API
-		 *
-		 * @return object
-		 */
-		public function toWpFormat(){
-			$info = new stdClass;
-
-			//The custom update API is built so that many fields have the same name and format
-			//as those returned by the native WordPress.org API. These can be assigned directly.
-			$sameFormat = array(
-				'name', 'slug', 'version', 'requires', 'tested', 'rating', 'upgrade_notice',
-				'num_ratings', 'downloaded', 'active_installs', 'homepage', 'last_updated',
-			);
-			foreach($sameFormat as $field){
-				if ( isset($this->$field) ) {
-					$info->$field = $this->$field;
-				} else {
-					$info->$field = null;
-				}
-			}
-
-			//Other fields need to be renamed and/or transformed.
-			$info->download_link = $this->download_url;
-			$info->author = $this->getFormattedAuthor();
-			$info->sections = array_merge(array('description' => ''), $this->sections);
-
-			if ( !empty($this->banners) ) {
-				//WP expects an array with two keys: "high" and "low". Both are optional.
-				//Docs: https://wordpress.org/plugins/about/faq/#banners
-				$info->banners = is_object($this->banners) ? get_object_vars($this->banners) : $this->banners;
-				$info->banners = array_intersect_key($info->banners, array('high' => true, 'low' => true));
-			}
-
-			return $info;
-		}
-
-		protected function getFormattedAuthor() {
-			if ( !empty($this->author_homepage) ){
-				/** @noinspection HtmlUnknownTarget */
-				return sprintf('<a href="%s">%s</a>', $this->author_homepage, $this->author);
-			}
-			return $this->author;
-		}
-	}
+    /**
+     * A container class for holding and transforming various plugin metadata.
+     *
+     * @author Janis Elsts
+     * @copyright 2016
+     * @access public
+     */
+    class Puc_v4p4_Plugin_Info extends Puc_v4p4_Metadata {
+        //Most fields map directly to the contents of the plugin's info.json file.
+        //See the relevant docs for a description of their meaning.
+        public $name;
+        public $slug;
+        public $version;
+        public $homepage;
+        public $sections = array();
+        public $download_url;
+
+        public $banners;
+        public $icons = array();
+        public $translations = array();
+
+        public $author;
+        public $author_homepage;
+
+        public $requires;
+        public $tested;
+        public $upgrade_notice;
+
+        public $rating;
+        public $num_ratings;
+        public $downloaded;
+        public $active_installs;
+        public $last_updated;
+
+        public $id = 0; //The native WP.org API returns numeric plugin IDs, but they're not used for anything.
+
+        public $filename; //Plugin filename relative to the plugins directory.
+
+        /**
+         * Create a new instance of Plugin Info from JSON-encoded plugin info
+         * returned by an external update API.
+         *
+         * @param string $json Valid JSON string representing plugin info.
+         * @return self|null New instance of Plugin Info, or NULL on error.
+         */
+        public static function fromJson($json){
+            $instance = new self();
+
+            if ( !parent::createFromJson($json, $instance) ) {
+                return null;
+            }
+
+            //json_decode decodes assoc. arrays as objects. We want them as arrays.
+            $instance->sections = (array)$instance->sections;
+            $instance->icons = (array)$instance->icons;
+
+            return $instance;
+        }
+
+        /**
+         * Very, very basic validation.
+         *
+         * @param StdClass $apiResponse
+         * @return bool|WP_Error
+         */
+        protected function validateMetadata($apiResponse) {
+            if (
+                !isset($apiResponse->name, $apiResponse->version)
+                || empty($apiResponse->name)
+                || empty($apiResponse->version)
+            ) {
+                return new WP_Error(
+                    'puc-invalid-metadata',
+                    "The plugin metadata file does not contain the required 'name' and/or 'version' keys."
+                );
+            }
+            return true;
+        }
+
+
+        /**
+         * Transform plugin info into the format used by the native WordPress.org API
+         *
+         * @return object
+         */
+        public function toWpFormat(){
+            $info = new stdClass;
+
+            //The custom update API is built so that many fields have the same name and format
+            //as those returned by the native WordPress.org API. These can be assigned directly.
+            $sameFormat = array(
+                'name', 'slug', 'version', 'requires', 'tested', 'rating', 'upgrade_notice',
+                'num_ratings', 'downloaded', 'active_installs', 'homepage', 'last_updated',
+            );
+            foreach($sameFormat as $field){
+                if ( isset($this->$field) ) {
+                    $info->$field = $this->$field;
+                } else {
+                    $info->$field = null;
+                }
+            }
+
+            //Other fields need to be renamed and/or transformed.
+            $info->download_link = $this->download_url;
+            $info->author = $this->getFormattedAuthor();
+            $info->sections = array_merge(array('description' => ''), $this->sections);
+
+            if ( !empty($this->banners) ) {
+                //WP expects an array with two keys: "high" and "low". Both are optional.
+                //Docs: https://wordpress.org/plugins/about/faq/#banners
+                $info->banners = is_object($this->banners) ? get_object_vars($this->banners) : $this->banners;
+                $info->banners = array_intersect_key($info->banners, array('high' => true, 'low' => true));
+            }
+
+            return $info;
+        }
+
+        protected function getFormattedAuthor() {
+            if ( !empty($this->author_homepage) ){
+                /** @noinspection HtmlUnknownTarget */
+                return sprintf('<a href="%s">%s</a>', $this->author_homepage, $this->author);
+            }
+            return $this->author;
+        }
+    }
 
 endif;
\ No newline at end of file

classes/external/php/plugin-update-checker/Puc/v4p4/Plugin/UpdateChecker.php

Indentation +735 added lines, -735 removed lines

@@ -1,740 +1,740 @@
 <?php
 if ( !class_exists('Puc_v4p4_Plugin_UpdateChecker', false) ):
 
-	/**
-	 * A custom plugin update checker.
-	 *
-	 * @author Janis Elsts
-	 * @copyright 2016
-	 * @access public
-	 */
-	class Puc_v4p4_Plugin_UpdateChecker extends Puc_v4p4_UpdateChecker {
-		protected $updateTransient = 'update_plugins';
-		protected $translationType = 'plugin';
-
-		public $pluginAbsolutePath = ''; //Full path of the main plugin file.
-		public $pluginFile = '';  //Plugin filename relative to the plugins directory. Many WP APIs use this to identify plugins.
-		public $muPluginFile = ''; //For MU plugins, the plugin filename relative to the mu-plugins directory.
-
-		private $cachedInstalledVersion = null;
-		private $manualCheckErrorTransient = '';
-
-		/**
-		 * Class constructor.
-		 *
-		 * @param string $metadataUrl The URL of the plugin's metadata file.
-		 * @param string $pluginFile Fully qualified path to the main plugin file.
-		 * @param string $slug The plugin's 'slug'. If not specified, the filename part of $pluginFile sans '.php' will be used as the slug.
-		 * @param integer $checkPeriod How often to check for updates (in hours). Defaults to checking every 12 hours. Set to 0 to disable automatic update checks.
-		 * @param string $optionName Where to store book-keeping info about update checks. Defaults to 'external_updates-$slug'.
-		 * @param string $muPluginFile Optional. The plugin filename relative to the mu-plugins directory.
-		 */
-		public function __construct($metadataUrl, $pluginFile, $slug = '', $checkPeriod = 12, $optionName = '', $muPluginFile = ''){
-			$this->pluginAbsolutePath = $pluginFile;
-			$this->pluginFile = plugin_basename($this->pluginAbsolutePath);
-			$this->muPluginFile = $muPluginFile;
-
-			//If no slug is specified, use the name of the main plugin file as the slug.
-			//For example, 'my-cool-plugin/cool-plugin.php' becomes 'cool-plugin'.
-			if ( empty($slug) ){
-				$slug = basename($this->pluginFile, '.php');
-			}
-
-			//Plugin slugs must be unique.
-			$slugCheckFilter = 'puc_is_slug_in_use-' . $this->slug;
-			$slugUsedBy = apply_filters($slugCheckFilter, false);
-			if ( $slugUsedBy ) {
-				$this->triggerError(sprintf(
-					'Plugin slug "%s" is already in use by %s. Slugs must be unique.',
-					htmlentities($this->slug),
-					htmlentities($slugUsedBy)
-				), E_USER_ERROR);
-			}
-			add_filter($slugCheckFilter, array($this, 'getAbsolutePath'));
-
-			//Backwards compatibility: If the plugin is a mu-plugin but no $muPluginFile is specified, assume
-			//it's the same as $pluginFile given that it's not in a subdirectory (WP only looks in the base dir).
-			if ( (strpbrk($this->pluginFile, '/\\') === false) && $this->isUnknownMuPlugin() ) {
-				$this->muPluginFile = $this->pluginFile;
-			}
-
-			//To prevent a crash during plugin uninstallation, remove updater hooks when the user removes the plugin.
-			//Details: https://github.com/YahnisElsts/plugin-update-checker/issues/138#issuecomment-335590964
-			add_action('uninstall_' . $this->pluginFile, array($this, 'removeHooks'));
-
-			$this->manualCheckErrorTransient = $this->getUniqueName('manual_check_errors');
-
-			parent::__construct($metadataUrl, dirname($this->pluginFile), $slug, $checkPeriod, $optionName);
-		}
-
-		/**
-		 * Create an instance of the scheduler.
-		 *
-		 * @param int $checkPeriod
-		 * @return Puc_v4p4_Scheduler
-		 */
-		protected function createScheduler($checkPeriod) {
-			$scheduler = new Puc_v4p4_Scheduler($this, $checkPeriod, array('load-plugins.php'));
-			register_deactivation_hook($this->pluginFile, array($scheduler, 'removeUpdaterCron'));
-			return $scheduler;
-		}
-
-		/**
-		 * Install the hooks required to run periodic update checks and inject update info
-		 * into WP data structures.
-		 *
-		 * @return void
-		 */
-		protected function installHooks(){
-			//Override requests for plugin information
-			add_filter('plugins_api', array($this, 'injectInfo'), 20, 3);
-
-			add_filter('plugin_row_meta', array($this, 'addViewDetailsLink'), 10, 3);
-			add_filter('plugin_row_meta', array($this, 'addCheckForUpdatesLink'), 10, 2);
-			add_action('admin_init', array($this, 'handleManualCheck'));
-			add_action('all_admin_notices', array($this, 'displayManualCheckResult'));
-
-			//Clear the version number cache when something - anything - is upgraded or WP clears the update cache.
-			add_filter('upgrader_post_install', array($this, 'clearCachedVersion'));
-			add_action('delete_site_transient_update_plugins', array($this, 'clearCachedVersion'));
-
-			parent::installHooks();
-		}
-
-		/**
-		 * Remove update checker hooks.
-		 *
-		 * The intent is to prevent a fatal error that can happen if the plugin has an uninstall
-		 * hook. During uninstallation, WP includes the main plugin file (which creates a PUC instance),
-		 * the uninstall hook runs, WP deletes the plugin files and then updates some transients.
-		 * If PUC hooks are still around at this time, they could throw an error while trying to
-		 * autoload classes from files that no longer exist.
-		 *
-		 * The "site_transient_{$transient}" filter is the main problem here, but let's also remove
-		 * most other PUC hooks to be safe.
-		 *
-		 * @internal
-		 */
-		public function removeHooks() {
-			parent::removeHooks();
-
-			remove_filter('plugins_api', array($this, 'injectInfo'), 20);
-
-			remove_filter('plugin_row_meta', array($this, 'addViewDetailsLink'), 10);
-			remove_filter('plugin_row_meta', array($this, 'addCheckForUpdatesLink'), 10);
-			remove_action('admin_init', array($this, 'handleManualCheck'));
-			remove_action('all_admin_notices', array($this, 'displayManualCheckResult'));
-
-			remove_filter('upgrader_post_install', array($this, 'clearCachedVersion'));
-			remove_action('delete_site_transient_update_plugins', array($this, 'clearCachedVersion'));
-		}
-
-		/**
-		 * Retrieve plugin info from the configured API endpoint.
-		 *
-		 * @uses wp_remote_get()
-		 *
-		 * @param array $queryArgs Additional query arguments to append to the request. Optional.
-		 * @return Puc_v4p4_Plugin_Info
-		 */
-		public function requestInfo($queryArgs = array()) {
-			list($pluginInfo, $result) = $this->requestMetadata('Puc_v4p4_Plugin_Info', 'request_info', $queryArgs);
-
-			if ( $pluginInfo !== null ) {
-				/** @var Puc_v4p4_Plugin_Info $pluginInfo */
-				$pluginInfo->filename = $this->pluginFile;
-				$pluginInfo->slug = $this->slug;
-			}
-
-			$pluginInfo = apply_filters($this->getUniqueName('request_info_result'), $pluginInfo, $result);
-			return $pluginInfo;
-		}
-
-		/**
-		 * Retrieve the latest update (if any) from the configured API endpoint.
-		 *
-		 * @uses PluginUpdateChecker::requestInfo()
-		 *
-		 * @return Puc_v4p4_Update|null An instance of Plugin_Update, or NULL when no updates are available.
-		 */
-		public function requestUpdate() {
-			//For the sake of simplicity, this function just calls requestInfo()
-			//and transforms the result accordingly.
-			$pluginInfo = $this->requestInfo(array('checking_for_updates' => '1'));
-			if ( $pluginInfo === null ){
-				return null;
-			}
-			$update = Puc_v4p4_Plugin_Update::fromPluginInfo($pluginInfo);
-
-			$update = $this->filterUpdateResult($update);
-
-			return $update;
-		}
-
-		/**
-		 * Get the currently installed version of the plugin.
-		 *
-		 * @return string Version number.
-		 */
-		public function getInstalledVersion(){
-			if ( isset($this->cachedInstalledVersion) ) {
-				return $this->cachedInstalledVersion;
-			}
-
-			$pluginHeader = $this->getPluginHeader();
-			if ( isset($pluginHeader['Version']) ) {
-				$this->cachedInstalledVersion = $pluginHeader['Version'];
-				return $pluginHeader['Version'];
-			} else {
-				//This can happen if the filename points to something that is not a plugin.
-				$this->triggerError(
-					sprintf(
-						"Can't to read the Version header for '%s'. The filename is incorrect or is not a plugin.",
-						$this->pluginFile
-					),
-					E_USER_WARNING
-				);
-				return null;
-			}
-		}
-
-		/**
-		 * Get plugin's metadata from its file header.
-		 *
-		 * @return array
-		 */
-		protected function getPluginHeader() {
-			if ( !is_file($this->pluginAbsolutePath) ) {
-				//This can happen if the plugin filename is wrong.
-				$this->triggerError(
-					sprintf(
-						"Can't to read the plugin header for '%s'. The file does not exist.",
-						$this->pluginFile
-					),
-					E_USER_WARNING
-				);
-				return array();
-			}
-
-			if ( !function_exists('get_plugin_data') ){
-				/** @noinspection PhpIncludeInspection */
-				require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
-			}
-			return get_plugin_data($this->pluginAbsolutePath, false, false);
-		}
-
-		/**
-		 * @return array
-		 */
-		protected function getHeaderNames() {
-			return array(
-				'Name' => 'Plugin Name',
-				'PluginURI' => 'Plugin URI',
-				'Version' => 'Version',
-				'Description' => 'Description',
-				'Author' => 'Author',
-				'AuthorURI' => 'Author URI',
-				'TextDomain' => 'Text Domain',
-				'DomainPath' => 'Domain Path',
-				'Network' => 'Network',
-
-				//The newest WordPress version that this plugin requires or has been tested with.
-				//We support several different formats for compatibility with other libraries.
-				'Tested WP' => 'Tested WP',
-				'Requires WP' => 'Requires WP',
-				'Tested up to' => 'Tested up to',
-				'Requires at least' => 'Requires at least',
-			);
-		}
-
-
-		/**
-		 * Intercept plugins_api() calls that request information about our plugin and
-		 * use the configured API endpoint to satisfy them.
-		 *
-		 * @see plugins_api()
-		 *
-		 * @param mixed $result
-		 * @param string $action
-		 * @param array|object $args
-		 * @return mixed
-		 */
-		public function injectInfo($result, $action = null, $args = null){
-			$relevant = ($action == 'plugin_information') && isset($args->slug) && (
-					($args->slug == $this->slug) || ($args->slug == dirname($this->pluginFile))
-				);
-			if ( !$relevant ) {
-				return $result;
-			}
-
-			$pluginInfo = $this->requestInfo();
-			$pluginInfo = apply_filters($this->getUniqueName('pre_inject_info'), $pluginInfo);
-			if ( $pluginInfo ) {
-				return $pluginInfo->toWpFormat();
-			}
-
-			return $result;
-		}
-
-		protected function shouldShowUpdates() {
-			//No update notifications for mu-plugins unless explicitly enabled. The MU plugin file
-			//is usually different from the main plugin file so the update wouldn't show up properly anyway.
-			return !$this->isUnknownMuPlugin();
-		}
-
-		/**
-		 * @param stdClass|null $updates
-		 * @param stdClass $updateToAdd
-		 * @return stdClass
-		 */
-		protected function addUpdateToList($updates, $updateToAdd) {
-			if ( $this->isMuPlugin() ) {
-				//WP does not support automatic update installation for mu-plugins, but we can
-				//still display a notice.
-				$updateToAdd->package = null;
-			}
-			return parent::addUpdateToList($updates, $updateToAdd);
-		}
-
-		/**
-		 * @param stdClass|null $updates
-		 * @return stdClass|null
-		 */
-		protected function removeUpdateFromList($updates) {
-			$updates = parent::removeUpdateFromList($updates);
-			if ( !empty($this->muPluginFile) && isset($updates, $updates->response) ) {
-				unset($updates->response[$this->muPluginFile]);
-			}
-			return $updates;
-		}
-
-		/**
-		 * For plugins, the update array is indexed by the plugin filename relative to the "plugins"
-		 * directory. Example: "plugin-name/plugin.php".
-		 *
-		 * @return string
-		 */
-		protected function getUpdateListKey() {
-			if ( $this->isMuPlugin() ) {
-				return $this->muPluginFile;
-			}
-			return $this->pluginFile;
-		}
-
-		/**
-		 * Alias for isBeingUpgraded().
-		 *
-		 * @deprecated
-		 * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
-		 * @return bool
-		 */
-		public function isPluginBeingUpgraded($upgrader = null) {
-			return $this->isBeingUpgraded($upgrader);
-		}
-
-		/**
-		 * Is there an update being installed for this plugin, right now?
-		 *
-		 * @param WP_Upgrader|null $upgrader
-		 * @return bool
-		 */
-		public function isBeingUpgraded($upgrader = null) {
-			return $this->upgraderStatus->isPluginBeingUpgraded($this->pluginFile, $upgrader);
-		}
-
-		/**
-		 * Get the details of the currently available update, if any.
-		 *
-		 * If no updates are available, or if the last known update version is below or equal
-		 * to the currently installed version, this method will return NULL.
-		 *
-		 * Uses cached update data. To retrieve update information straight from
-		 * the metadata URL, call requestUpdate() instead.
-		 *
-		 * @return Puc_v4p4_Plugin_Update|null
-		 */
-		public function getUpdate() {
-			$update = parent::getUpdate();
-			if ( isset($update) ) {
-				/** @var Puc_v4p4_Plugin_Update $update */
-				$update->filename = $this->pluginFile;
-			}
-			return $update;
-		}
-
-		/**
-		 * Add a "Check for updates" link to the plugin row in the "Plugins" page. By default,
-		 * the new link will appear after the "Visit plugin site" link if present, otherwise
-		 * after the "View plugin details" link.
-		 *
-		 * You can change the link text by using the "puc_manual_check_link-$slug" filter.
-		 * Returning an empty string from the filter will disable the link.
-		 *
-		 * @param array $pluginMeta Array of meta links.
-		 * @param string $pluginFile
-		 * @return array
-		 */
-		public function addCheckForUpdatesLink($pluginMeta, $pluginFile) {
-			$isRelevant = ($pluginFile == $this->pluginFile)
-				|| (!empty($this->muPluginFile) && $pluginFile == $this->muPluginFile);
-
-			if ( $isRelevant && $this->userCanInstallUpdates() ) {
-				$linkUrl = wp_nonce_url(
-					add_query_arg(
-						array(
-							'puc_check_for_updates' => 1,
-							'puc_slug' => $this->slug,
-						),
-						self_admin_url('plugins.php')
-					),
-					'puc_check_for_updates'
-				);
-
-				$linkText = apply_filters(
-					$this->getUniqueName('manual_check_link'),
-					__('Check for updates', 'plugin-update-checker')
-				);
-				if ( !empty($linkText) ) {
-					/** @noinspection HtmlUnknownTarget */
-					$pluginMeta[] = sprintf('<a href="%s">%s</a>', esc_attr($linkUrl), $linkText);
-				}
-			}
-			return $pluginMeta;
-		}
-
-		/**
-		 * Add a "View Details" link to the plugin row in the "Plugins" page. By default,
-		 * the new link will appear before the "Visit plugin site" link (if present).
-		 *
-		 * You can change the link text by using the "puc_view_details_link-$slug" filter.
-		 * Returning an empty string from the filter will disable the link.
-		 *
-		 * You can change the position of the link using the
-		 * "puc_view_details_link_position-$slug" filter.
-		 * Returning 'before' or 'after' will place the link immediately before/after the
-		 * "Visit plugin site" link
-		 * Returning 'append' places the link after any existing links at the time of the hook.
-		 * Returning 'replace' replaces the "Visit plugin site" link
-		 * Returning anything else disables the link when there is a "Visit plugin site" link.
-		 *
-		 * If there is no "Visit plugin site" link 'append' is always used!
-		 *
-		 * @param array $pluginMeta Array of meta links.
-		 * @param string $pluginFile
-		 * @param array $pluginData Array of plugin header data.
-		 * @return array
-		 */
-		public function addViewDetailsLink($pluginMeta, $pluginFile, $pluginData = array()) {
-			$isRelevant = ($pluginFile == $this->pluginFile)
-				|| (!empty($this->muPluginFile) && $pluginFile == $this->muPluginFile);
-
-			if ( $isRelevant && $this->userCanInstallUpdates() && !isset($pluginData['slug']) ) {
-				$linkText = apply_filters($this->getUniqueName('view_details_link'), __('View details'));
-				if ( !empty($linkText) ) {
-					$viewDetailsLinkPosition = 'append';
-
-					//Find the "Visit plugin site" link (if present).
-					$visitPluginSiteLinkIndex = count($pluginMeta) - 1;
-					if ( $pluginData['PluginURI'] ) {
-						$escapedPluginUri = esc_url($pluginData['PluginURI']);
-						foreach ($pluginMeta as $linkIndex => $existingLink) {
-							if ( strpos($existingLink, $escapedPluginUri) !== false ) {
-								$visitPluginSiteLinkIndex = $linkIndex;
-								$viewDetailsLinkPosition = apply_filters(
-									$this->getUniqueName('view_details_link_position'),
-									'before'
-								);
-								break;
-							}
-						}
-					}
-
-					$viewDetailsLink = sprintf('<a href="%s" class="thickbox open-plugin-details-modal" aria-label="%s" data-title="%s">%s</a>',
-						esc_url(network_admin_url('plugin-install.php?tab=plugin-information&plugin=' . urlencode($this->slug) .
-							'&TB_iframe=true&width=600&height=550')),
-						esc_attr(sprintf(__('More information about %s'), $pluginData['Name'])),
-						esc_attr($pluginData['Name']),
-						$linkText
-					);
-					switch ($viewDetailsLinkPosition) {
-						case 'before':
-							array_splice($pluginMeta, $visitPluginSiteLinkIndex, 0, $viewDetailsLink);
-							break;
-						case 'after':
-							array_splice($pluginMeta, $visitPluginSiteLinkIndex + 1, 0, $viewDetailsLink);
-							break;
-						case 'replace':
-							$pluginMeta[$visitPluginSiteLinkIndex] = $viewDetailsLink;
-							break;
-						case 'append':
-						default:
-							$pluginMeta[] = $viewDetailsLink;
-							break;
-					}
-				}
-			}
-			return $pluginMeta;
-		}
-
-
-		/**
-		 * Check for updates when the user clicks the "Check for updates" link.
-		 * @see self::addCheckForUpdatesLink()
-		 *
-		 * @return void
-		 */
-		public function handleManualCheck() {
-			$shouldCheck =
-				isset($_GET['puc_check_for_updates'], $_GET['puc_slug'])
-				&& $_GET['puc_slug'] == $this->slug
-				&& $this->userCanInstallUpdates()
-				&& check_admin_referer('puc_check_for_updates');
-
-			if ( $shouldCheck ) {
-				$update = $this->checkForUpdates();
-				$status = ($update === null) ? 'no_update' : 'update_available';
-
-				if ( ($update === null) && !empty($this->lastRequestApiErrors) ) {
-					//Some errors are not critical. For example, if PUC tries to retrieve the readme.txt
-					//file from GitHub and gets a 404, that's an API error, but it doesn't prevent updates
-					//from working. Maybe the plugin simply doesn't have a readme.
-					//Let's only show important errors.
-					$foundCriticalErrors = false;
-					$questionableErrorCodes = array(
-						'puc-github-http-error',
-						'puc-gitlab-http-error',
-						'puc-bitbucket-http-error',
-					);
-
-					foreach ($this->lastRequestApiErrors as $item) {
-						$wpError = $item['error'];
-						/** @var WP_Error $wpError */
-						if ( !in_array($wpError->get_error_code(), $questionableErrorCodes) ) {
-							$foundCriticalErrors = true;
-							break;
-						}
-					}
-
-					if ( $foundCriticalErrors ) {
-						$status = 'error';
-						set_site_transient($this->manualCheckErrorTransient, $this->lastRequestApiErrors, 60);
-					}
-				}
-
-				wp_redirect(add_query_arg(
-					array(
-						'puc_update_check_result' => $status,
-						'puc_slug' => $this->slug,
-					),
-					self_admin_url('plugins.php')
-				));
-			}
-		}
-
-		/**
-		 * Display the results of a manual update check.
-		 * @see self::handleManualCheck()
-		 *
-		 * You can change the result message by using the "puc_manual_check_message-$slug" filter.
-		 */
-		public function displayManualCheckResult() {
-			if ( isset($_GET['puc_update_check_result'], $_GET['puc_slug']) && ($_GET['puc_slug'] == $this->slug) ) {
-				$status      = strval($_GET['puc_update_check_result']);
-				$title       = $this->getPluginTitle();
-				$noticeClass = 'updated notice-success';
-				$details     = '';
-
-				if ( $status == 'no_update' ) {
-					$message = sprintf(_x('The %s plugin is up to date.', 'the plugin title', 'plugin-update-checker'), $title);
-				} else if ( $status == 'update_available' ) {
-					$message = sprintf(_x('A new version of the %s plugin is available.', 'the plugin title', 'plugin-update-checker'), $title);
-				} else if ( $status === 'error' ) {
-					$message = sprintf(_x('Could not determine if updates are available for %s.', 'the plugin title', 'plugin-update-checker'), $title);
-					$noticeClass = 'error notice-error';
-
-					$details = $this->formatManualCheckErrors(get_site_transient($this->manualCheckErrorTransient));
-					delete_site_transient($this->manualCheckErrorTransient);
-				} else {
-					$message = sprintf(__('Unknown update checker status "%s"', 'plugin-update-checker'), htmlentities($status));
-					$noticeClass = 'error notice-error';
-				}
-				printf(
-					'<div class="notice %s is-dismissible"><p>%s</p>%s</div>',
-					$noticeClass,
-					apply_filters($this->getUniqueName('manual_check_message'), $message, $status),
-					$details
-				);
-			}
-		}
-
-		/**
-		 * Format the list of errors that were thrown during an update check.
-		 *
-		 * @param array $errors
-		 * @return string
-		 */
-		protected function formatManualCheckErrors($errors) {
-			if ( empty($errors) ) {
-				return '';
-			}
-			$output = '';
-
-			$showAsList = count($errors) > 1;
-			if ( $showAsList ) {
-				$output .= '<ol>';
-				$formatString = '<li>%1$s <code>%2$s</code></li>';
-			} else {
-				$formatString = '<p>%1$s <code>%2$s</code></p>';
-			}
-			foreach ($errors as $item) {
-				$wpError = $item['error'];
-				/** @var WP_Error $wpError */
-				$output .= sprintf(
-					$formatString,
-					$wpError->get_error_message(),
-					$wpError->get_error_code()
-				);
-			}
-			if ( $showAsList ) {
-				$output .= '</ol>';
-			}
-
-			return $output;
-		}
-
-		/**
-		 * Get the translated plugin title.
-		 *
-		 * @return string
-		 */
-		protected function getPluginTitle() {
-			$title  = '';
-			$header = $this->getPluginHeader();
-			if ( $header && !empty($header['Name']) && isset($header['TextDomain']) ) {
-				$title = translate($header['Name'], $header['TextDomain']);
-			}
-			return $title;
-		}
-
-		/**
-		 * Check if the current user has the required permissions to install updates.
-		 *
-		 * @return bool
-		 */
-		public function userCanInstallUpdates() {
-			return current_user_can('update_plugins');
-		}
-
-		/**
-		 * Check if the plugin file is inside the mu-plugins directory.
-		 *
-		 * @return bool
-		 */
-		protected function isMuPlugin() {
-			static $cachedResult = null;
-
-			if ( $cachedResult === null ) {
-				//Convert both paths to the canonical form before comparison.
-				$muPluginDir = realpath(WPMU_PLUGIN_DIR);
-				$pluginPath  = realpath($this->pluginAbsolutePath);
-
-				$cachedResult = (strpos($pluginPath, $muPluginDir) === 0);
-			}
-
-			return $cachedResult;
-		}
-
-		/**
-		 * MU plugins are partially supported, but only when we know which file in mu-plugins
-		 * corresponds to this plugin.
-		 *
-		 * @return bool
-		 */
-		protected function isUnknownMuPlugin() {
-			return empty($this->muPluginFile) && $this->isMuPlugin();
-		}
-
-		/**
-		 * Clear the cached plugin version. This method can be set up as a filter (hook) and will
-		 * return the filter argument unmodified.
-		 *
-		 * @param mixed $filterArgument
-		 * @return mixed
-		 */
-		public function clearCachedVersion($filterArgument = null) {
-			$this->cachedInstalledVersion = null;
-			return $filterArgument;
-		}
-
-		/**
-		 * Get absolute path to the main plugin file.
-		 *
-		 * @return string
-		 */
-		public function getAbsolutePath() {
-			return $this->pluginAbsolutePath;
-		}
-
-		/**
-		 * @return string
-		 */
-		public function getAbsoluteDirectoryPath() {
-			return dirname($this->pluginAbsolutePath);
-		}
-
-		/**
-		 * Register a callback for filtering query arguments.
-		 *
-		 * The callback function should take one argument - an associative array of query arguments.
-		 * It should return a modified array of query arguments.
-		 *
-		 * @uses add_filter() This method is a convenience wrapper for add_filter().
-		 *
-		 * @param callable $callback
-		 * @return void
-		 */
-		public function addQueryArgFilter($callback){
-			$this->addFilter('request_info_query_args', $callback);
-		}
-
-		/**
-		 * Register a callback for filtering arguments passed to wp_remote_get().
-		 *
-		 * The callback function should take one argument - an associative array of arguments -
-		 * and return a modified array or arguments. See the WP documentation on wp_remote_get()
-		 * for details on what arguments are available and how they work.
-		 *
-		 * @uses add_filter() This method is a convenience wrapper for add_filter().
-		 *
-		 * @param callable $callback
-		 * @return void
-		 */
-		public function addHttpRequestArgFilter($callback) {
-			$this->addFilter('request_info_options', $callback);
-		}
-
-		/**
-		 * Register a callback for filtering the plugin info retrieved from the external API.
-		 *
-		 * The callback function should take two arguments. If the plugin info was retrieved
-		 * successfully, the first argument passed will be an instance of  PluginInfo. Otherwise,
-		 * it will be NULL. The second argument will be the corresponding return value of
-		 * wp_remote_get (see WP docs for details).
-		 *
-		 * The callback function should return a new or modified instance of PluginInfo or NULL.
-		 *
-		 * @uses add_filter() This method is a convenience wrapper for add_filter().
-		 *
-		 * @param callable $callback
-		 * @return void
-		 */
-		public function addResultFilter($callback) {
-			$this->addFilter('request_info_result', $callback, 10, 2);
-		}
-
-		protected function createDebugBarExtension() {
-			return new Puc_v4p4_DebugBar_PluginExtension($this);
-		}
-	}
+    /**
+     * A custom plugin update checker.
+     *
+     * @author Janis Elsts
+     * @copyright 2016
+     * @access public
+     */
+    class Puc_v4p4_Plugin_UpdateChecker extends Puc_v4p4_UpdateChecker {
+        protected $updateTransient = 'update_plugins';
+        protected $translationType = 'plugin';
+
+        public $pluginAbsolutePath = ''; //Full path of the main plugin file.
+        public $pluginFile = '';  //Plugin filename relative to the plugins directory. Many WP APIs use this to identify plugins.
+        public $muPluginFile = ''; //For MU plugins, the plugin filename relative to the mu-plugins directory.
+
+        private $cachedInstalledVersion = null;
+        private $manualCheckErrorTransient = '';
+
+        /**
+         * Class constructor.
+         *
+         * @param string $metadataUrl The URL of the plugin's metadata file.
+         * @param string $pluginFile Fully qualified path to the main plugin file.
+         * @param string $slug The plugin's 'slug'. If not specified, the filename part of $pluginFile sans '.php' will be used as the slug.
+         * @param integer $checkPeriod How often to check for updates (in hours). Defaults to checking every 12 hours. Set to 0 to disable automatic update checks.
+         * @param string $optionName Where to store book-keeping info about update checks. Defaults to 'external_updates-$slug'.
+         * @param string $muPluginFile Optional. The plugin filename relative to the mu-plugins directory.
+         */
+        public function __construct($metadataUrl, $pluginFile, $slug = '', $checkPeriod = 12, $optionName = '', $muPluginFile = ''){
+            $this->pluginAbsolutePath = $pluginFile;
+            $this->pluginFile = plugin_basename($this->pluginAbsolutePath);
+            $this->muPluginFile = $muPluginFile;
+
+            //If no slug is specified, use the name of the main plugin file as the slug.
+            //For example, 'my-cool-plugin/cool-plugin.php' becomes 'cool-plugin'.
+            if ( empty($slug) ){
+                $slug = basename($this->pluginFile, '.php');
+            }
+
+            //Plugin slugs must be unique.
+            $slugCheckFilter = 'puc_is_slug_in_use-' . $this->slug;
+            $slugUsedBy = apply_filters($slugCheckFilter, false);
+            if ( $slugUsedBy ) {
+                $this->triggerError(sprintf(
+                    'Plugin slug "%s" is already in use by %s. Slugs must be unique.',
+                    htmlentities($this->slug),
+                    htmlentities($slugUsedBy)
+                ), E_USER_ERROR);
+            }
+            add_filter($slugCheckFilter, array($this, 'getAbsolutePath'));
+
+            //Backwards compatibility: If the plugin is a mu-plugin but no $muPluginFile is specified, assume
+            //it's the same as $pluginFile given that it's not in a subdirectory (WP only looks in the base dir).
+            if ( (strpbrk($this->pluginFile, '/\\') === false) && $this->isUnknownMuPlugin() ) {
+                $this->muPluginFile = $this->pluginFile;
+            }
+
+            //To prevent a crash during plugin uninstallation, remove updater hooks when the user removes the plugin.
+            //Details: https://github.com/YahnisElsts/plugin-update-checker/issues/138#issuecomment-335590964
+            add_action('uninstall_' . $this->pluginFile, array($this, 'removeHooks'));
+
+            $this->manualCheckErrorTransient = $this->getUniqueName('manual_check_errors');
+
+            parent::__construct($metadataUrl, dirname($this->pluginFile), $slug, $checkPeriod, $optionName);
+        }
+
+        /**
+         * Create an instance of the scheduler.
+         *
+         * @param int $checkPeriod
+         * @return Puc_v4p4_Scheduler
+         */
+        protected function createScheduler($checkPeriod) {
+            $scheduler = new Puc_v4p4_Scheduler($this, $checkPeriod, array('load-plugins.php'));
+            register_deactivation_hook($this->pluginFile, array($scheduler, 'removeUpdaterCron'));
+            return $scheduler;
+        }
+
+        /**
+         * Install the hooks required to run periodic update checks and inject update info
+         * into WP data structures.
+         *
+         * @return void
+         */
+        protected function installHooks(){
+            //Override requests for plugin information
+            add_filter('plugins_api', array($this, 'injectInfo'), 20, 3);
+
+            add_filter('plugin_row_meta', array($this, 'addViewDetailsLink'), 10, 3);
+            add_filter('plugin_row_meta', array($this, 'addCheckForUpdatesLink'), 10, 2);
+            add_action('admin_init', array($this, 'handleManualCheck'));
+            add_action('all_admin_notices', array($this, 'displayManualCheckResult'));
+
+            //Clear the version number cache when something - anything - is upgraded or WP clears the update cache.
+            add_filter('upgrader_post_install', array($this, 'clearCachedVersion'));
+            add_action('delete_site_transient_update_plugins', array($this, 'clearCachedVersion'));
+
+            parent::installHooks();
+        }
+
+        /**
+         * Remove update checker hooks.
+         *
+         * The intent is to prevent a fatal error that can happen if the plugin has an uninstall
+         * hook. During uninstallation, WP includes the main plugin file (which creates a PUC instance),
+         * the uninstall hook runs, WP deletes the plugin files and then updates some transients.
+         * If PUC hooks are still around at this time, they could throw an error while trying to
+         * autoload classes from files that no longer exist.
+         *
+         * The "site_transient_{$transient}" filter is the main problem here, but let's also remove
+         * most other PUC hooks to be safe.
+         *
+         * @internal
+         */
+        public function removeHooks() {
+            parent::removeHooks();
+
+            remove_filter('plugins_api', array($this, 'injectInfo'), 20);
+
+            remove_filter('plugin_row_meta', array($this, 'addViewDetailsLink'), 10);
+            remove_filter('plugin_row_meta', array($this, 'addCheckForUpdatesLink'), 10);
+            remove_action('admin_init', array($this, 'handleManualCheck'));
+            remove_action('all_admin_notices', array($this, 'displayManualCheckResult'));
+
+            remove_filter('upgrader_post_install', array($this, 'clearCachedVersion'));
+            remove_action('delete_site_transient_update_plugins', array($this, 'clearCachedVersion'));
+        }
+
+        /**
+         * Retrieve plugin info from the configured API endpoint.
+         *
+         * @uses wp_remote_get()
+         *
+         * @param array $queryArgs Additional query arguments to append to the request. Optional.
+         * @return Puc_v4p4_Plugin_Info
+         */
+        public function requestInfo($queryArgs = array()) {
+            list($pluginInfo, $result) = $this->requestMetadata('Puc_v4p4_Plugin_Info', 'request_info', $queryArgs);
+
+            if ( $pluginInfo !== null ) {
+                /** @var Puc_v4p4_Plugin_Info $pluginInfo */
+                $pluginInfo->filename = $this->pluginFile;
+                $pluginInfo->slug = $this->slug;
+            }
+
+            $pluginInfo = apply_filters($this->getUniqueName('request_info_result'), $pluginInfo, $result);
+            return $pluginInfo;
+        }
+
+        /**
+         * Retrieve the latest update (if any) from the configured API endpoint.
+         *
+         * @uses PluginUpdateChecker::requestInfo()
+         *
+         * @return Puc_v4p4_Update|null An instance of Plugin_Update, or NULL when no updates are available.
+         */
+        public function requestUpdate() {
+            //For the sake of simplicity, this function just calls requestInfo()
+            //and transforms the result accordingly.
+            $pluginInfo = $this->requestInfo(array('checking_for_updates' => '1'));
+            if ( $pluginInfo === null ){
+                return null;
+            }
+            $update = Puc_v4p4_Plugin_Update::fromPluginInfo($pluginInfo);
+
+            $update = $this->filterUpdateResult($update);
+
+            return $update;
+        }
+
+        /**
+         * Get the currently installed version of the plugin.
+         *
+         * @return string Version number.
+         */
+        public function getInstalledVersion(){
+            if ( isset($this->cachedInstalledVersion) ) {
+                return $this->cachedInstalledVersion;
+            }
+
+            $pluginHeader = $this->getPluginHeader();
+            if ( isset($pluginHeader['Version']) ) {
+                $this->cachedInstalledVersion = $pluginHeader['Version'];
+                return $pluginHeader['Version'];
+            } else {
+                //This can happen if the filename points to something that is not a plugin.
+                $this->triggerError(
+                    sprintf(
+                        "Can't to read the Version header for '%s'. The filename is incorrect or is not a plugin.",
+                        $this->pluginFile
+                    ),
+                    E_USER_WARNING
+                );
+                return null;
+            }
+        }
+
+        /**
+         * Get plugin's metadata from its file header.
+         *
+         * @return array
+         */
+        protected function getPluginHeader() {
+            if ( !is_file($this->pluginAbsolutePath) ) {
+                //This can happen if the plugin filename is wrong.
+                $this->triggerError(
+                    sprintf(
+                        "Can't to read the plugin header for '%s'. The file does not exist.",
+                        $this->pluginFile
+                    ),
+                    E_USER_WARNING
+                );
+                return array();
+            }
+
+            if ( !function_exists('get_plugin_data') ){
+                /** @noinspection PhpIncludeInspection */
+                require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
+            }
+            return get_plugin_data($this->pluginAbsolutePath, false, false);
+        }
+
+        /**
+         * @return array
+         */
+        protected function getHeaderNames() {
+            return array(
+                'Name' => 'Plugin Name',
+                'PluginURI' => 'Plugin URI',
+                'Version' => 'Version',
+                'Description' => 'Description',
+                'Author' => 'Author',
+                'AuthorURI' => 'Author URI',
+                'TextDomain' => 'Text Domain',
+                'DomainPath' => 'Domain Path',
+                'Network' => 'Network',
+
+                //The newest WordPress version that this plugin requires or has been tested with.
+                //We support several different formats for compatibility with other libraries.
+                'Tested WP' => 'Tested WP',
+                'Requires WP' => 'Requires WP',
+                'Tested up to' => 'Tested up to',
+                'Requires at least' => 'Requires at least',
+            );
+        }
+
+
+        /**
+         * Intercept plugins_api() calls that request information about our plugin and
+         * use the configured API endpoint to satisfy them.
+         *
+         * @see plugins_api()
+         *
+         * @param mixed $result
+         * @param string $action
+         * @param array|object $args
+         * @return mixed
+         */
+        public function injectInfo($result, $action = null, $args = null){
+            $relevant = ($action == 'plugin_information') && isset($args->slug) && (
+                    ($args->slug == $this->slug) || ($args->slug == dirname($this->pluginFile))
+                );
+            if ( !$relevant ) {
+                return $result;
+            }
+
+            $pluginInfo = $this->requestInfo();
+            $pluginInfo = apply_filters($this->getUniqueName('pre_inject_info'), $pluginInfo);
+            if ( $pluginInfo ) {
+                return $pluginInfo->toWpFormat();
+            }
+
+            return $result;
+        }
+
+        protected function shouldShowUpdates() {
+            //No update notifications for mu-plugins unless explicitly enabled. The MU plugin file
+            //is usually different from the main plugin file so the update wouldn't show up properly anyway.
+            return !$this->isUnknownMuPlugin();
+        }
+
+        /**
+         * @param stdClass|null $updates
+         * @param stdClass $updateToAdd
+         * @return stdClass
+         */
+        protected function addUpdateToList($updates, $updateToAdd) {
+            if ( $this->isMuPlugin() ) {
+                //WP does not support automatic update installation for mu-plugins, but we can
+                //still display a notice.
+                $updateToAdd->package = null;
+            }
+            return parent::addUpdateToList($updates, $updateToAdd);
+        }
+
+        /**
+         * @param stdClass|null $updates
+         * @return stdClass|null
+         */
+        protected function removeUpdateFromList($updates) {
+            $updates = parent::removeUpdateFromList($updates);
+            if ( !empty($this->muPluginFile) && isset($updates, $updates->response) ) {
+                unset($updates->response[$this->muPluginFile]);
+            }
+            return $updates;
+        }
+
+        /**
+         * For plugins, the update array is indexed by the plugin filename relative to the "plugins"
+         * directory. Example: "plugin-name/plugin.php".
+         *
+         * @return string
+         */
+        protected function getUpdateListKey() {
+            if ( $this->isMuPlugin() ) {
+                return $this->muPluginFile;
+            }
+            return $this->pluginFile;
+        }
+
+        /**
+         * Alias for isBeingUpgraded().
+         *
+         * @deprecated
+         * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
+         * @return bool
+         */
+        public function isPluginBeingUpgraded($upgrader = null) {
+            return $this->isBeingUpgraded($upgrader);
+        }
+
+        /**
+         * Is there an update being installed for this plugin, right now?
+         *
+         * @param WP_Upgrader|null $upgrader
+         * @return bool
+         */
+        public function isBeingUpgraded($upgrader = null) {
+            return $this->upgraderStatus->isPluginBeingUpgraded($this->pluginFile, $upgrader);
+        }
+
+        /**
+         * Get the details of the currently available update, if any.
+         *
+         * If no updates are available, or if the last known update version is below or equal
+         * to the currently installed version, this method will return NULL.
+         *
+         * Uses cached update data. To retrieve update information straight from
+         * the metadata URL, call requestUpdate() instead.
+         *
+         * @return Puc_v4p4_Plugin_Update|null
+         */
+        public function getUpdate() {
+            $update = parent::getUpdate();
+            if ( isset($update) ) {
+                /** @var Puc_v4p4_Plugin_Update $update */
+                $update->filename = $this->pluginFile;
+            }
+            return $update;
+        }
+
+        /**
+         * Add a "Check for updates" link to the plugin row in the "Plugins" page. By default,
+         * the new link will appear after the "Visit plugin site" link if present, otherwise
+         * after the "View plugin details" link.
+         *
+         * You can change the link text by using the "puc_manual_check_link-$slug" filter.
+         * Returning an empty string from the filter will disable the link.
+         *
+         * @param array $pluginMeta Array of meta links.
+         * @param string $pluginFile
+         * @return array
+         */
+        public function addCheckForUpdatesLink($pluginMeta, $pluginFile) {
+            $isRelevant = ($pluginFile == $this->pluginFile)
+                || (!empty($this->muPluginFile) && $pluginFile == $this->muPluginFile);
+
+            if ( $isRelevant && $this->userCanInstallUpdates() ) {
+                $linkUrl = wp_nonce_url(
+                    add_query_arg(
+                        array(
+                            'puc_check_for_updates' => 1,
+                            'puc_slug' => $this->slug,
+                        ),
+                        self_admin_url('plugins.php')
+                    ),
+                    'puc_check_for_updates'
+                );
+
+                $linkText = apply_filters(
+                    $this->getUniqueName('manual_check_link'),
+                    __('Check for updates', 'plugin-update-checker')
+                );
+                if ( !empty($linkText) ) {
+                    /** @noinspection HtmlUnknownTarget */
+                    $pluginMeta[] = sprintf('<a href="%s">%s</a>', esc_attr($linkUrl), $linkText);
+                }
+            }
+            return $pluginMeta;
+        }
+
+        /**
+         * Add a "View Details" link to the plugin row in the "Plugins" page. By default,
+         * the new link will appear before the "Visit plugin site" link (if present).
+         *
+         * You can change the link text by using the "puc_view_details_link-$slug" filter.
+         * Returning an empty string from the filter will disable the link.
+         *
+         * You can change the position of the link using the
+         * "puc_view_details_link_position-$slug" filter.
+         * Returning 'before' or 'after' will place the link immediately before/after the
+         * "Visit plugin site" link
+         * Returning 'append' places the link after any existing links at the time of the hook.
+         * Returning 'replace' replaces the "Visit plugin site" link
+         * Returning anything else disables the link when there is a "Visit plugin site" link.
+         *
+         * If there is no "Visit plugin site" link 'append' is always used!
+         *
+         * @param array $pluginMeta Array of meta links.
+         * @param string $pluginFile
+         * @param array $pluginData Array of plugin header data.
+         * @return array
+         */
+        public function addViewDetailsLink($pluginMeta, $pluginFile, $pluginData = array()) {
+            $isRelevant = ($pluginFile == $this->pluginFile)
+                || (!empty($this->muPluginFile) && $pluginFile == $this->muPluginFile);
+
+            if ( $isRelevant && $this->userCanInstallUpdates() && !isset($pluginData['slug']) ) {
+                $linkText = apply_filters($this->getUniqueName('view_details_link'), __('View details'));
+                if ( !empty($linkText) ) {
+                    $viewDetailsLinkPosition = 'append';
+
+                    //Find the "Visit plugin site" link (if present).
+                    $visitPluginSiteLinkIndex = count($pluginMeta) - 1;
+                    if ( $pluginData['PluginURI'] ) {
+                        $escapedPluginUri = esc_url($pluginData['PluginURI']);
+                        foreach ($pluginMeta as $linkIndex => $existingLink) {
+                            if ( strpos($existingLink, $escapedPluginUri) !== false ) {
+                                $visitPluginSiteLinkIndex = $linkIndex;
+                                $viewDetailsLinkPosition = apply_filters(
+                                    $this->getUniqueName('view_details_link_position'),
+                                    'before'
+                                );
+                                break;
+                            }
+                        }
+                    }
+
+                    $viewDetailsLink = sprintf('<a href="%s" class="thickbox open-plugin-details-modal" aria-label="%s" data-title="%s">%s</a>',
+                        esc_url(network_admin_url('plugin-install.php?tab=plugin-information&plugin=' . urlencode($this->slug) .
+                            '&TB_iframe=true&width=600&height=550')),
+                        esc_attr(sprintf(__('More information about %s'), $pluginData['Name'])),
+                        esc_attr($pluginData['Name']),
+                        $linkText
+                    );
+                    switch ($viewDetailsLinkPosition) {
+                        case 'before':
+                            array_splice($pluginMeta, $visitPluginSiteLinkIndex, 0, $viewDetailsLink);
+                            break;
+                        case 'after':
+                            array_splice($pluginMeta, $visitPluginSiteLinkIndex + 1, 0, $viewDetailsLink);
+                            break;
+                        case 'replace':
+                            $pluginMeta[$visitPluginSiteLinkIndex] = $viewDetailsLink;
+                            break;
+                        case 'append':
+                        default:
+                            $pluginMeta[] = $viewDetailsLink;
+                            break;
+                    }
+                }
+            }
+            return $pluginMeta;
+        }
+
+
+        /**
+         * Check for updates when the user clicks the "Check for updates" link.
+         * @see self::addCheckForUpdatesLink()
+         *
+         * @return void
+         */
+        public function handleManualCheck() {
+            $shouldCheck =
+                isset($_GET['puc_check_for_updates'], $_GET['puc_slug'])
+                && $_GET['puc_slug'] == $this->slug
+                && $this->userCanInstallUpdates()
+                && check_admin_referer('puc_check_for_updates');
+
+            if ( $shouldCheck ) {
+                $update = $this->checkForUpdates();
+                $status = ($update === null) ? 'no_update' : 'update_available';
+
+                if ( ($update === null) && !empty($this->lastRequestApiErrors) ) {
+                    //Some errors are not critical. For example, if PUC tries to retrieve the readme.txt
+                    //file from GitHub and gets a 404, that's an API error, but it doesn't prevent updates
+                    //from working. Maybe the plugin simply doesn't have a readme.
+                    //Let's only show important errors.
+                    $foundCriticalErrors = false;
+                    $questionableErrorCodes = array(
+                        'puc-github-http-error',
+                        'puc-gitlab-http-error',
+                        'puc-bitbucket-http-error',
+                    );
+
+                    foreach ($this->lastRequestApiErrors as $item) {
+                        $wpError = $item['error'];
+                        /** @var WP_Error $wpError */
+                        if ( !in_array($wpError->get_error_code(), $questionableErrorCodes) ) {
+                            $foundCriticalErrors = true;
+                            break;
+                        }
+                    }
+
+                    if ( $foundCriticalErrors ) {
+                        $status = 'error';
+                        set_site_transient($this->manualCheckErrorTransient, $this->lastRequestApiErrors, 60);
+                    }
+                }
+
+                wp_redirect(add_query_arg(
+                    array(
+                        'puc_update_check_result' => $status,
+                        'puc_slug' => $this->slug,
+                    ),
+                    self_admin_url('plugins.php')
+                ));
+            }
+        }
+
+        /**
+         * Display the results of a manual update check.
+         * @see self::handleManualCheck()
+         *
+         * You can change the result message by using the "puc_manual_check_message-$slug" filter.
+         */
+        public function displayManualCheckResult() {
+            if ( isset($_GET['puc_update_check_result'], $_GET['puc_slug']) && ($_GET['puc_slug'] == $this->slug) ) {
+                $status      = strval($_GET['puc_update_check_result']);
+                $title       = $this->getPluginTitle();
+                $noticeClass = 'updated notice-success';
+                $details     = '';
+
+                if ( $status == 'no_update' ) {
+                    $message = sprintf(_x('The %s plugin is up to date.', 'the plugin title', 'plugin-update-checker'), $title);
+                } else if ( $status == 'update_available' ) {
+                    $message = sprintf(_x('A new version of the %s plugin is available.', 'the plugin title', 'plugin-update-checker'), $title);
+                } else if ( $status === 'error' ) {
+                    $message = sprintf(_x('Could not determine if updates are available for %s.', 'the plugin title', 'plugin-update-checker'), $title);
+                    $noticeClass = 'error notice-error';
+
+                    $details = $this->formatManualCheckErrors(get_site_transient($this->manualCheckErrorTransient));
+                    delete_site_transient($this->manualCheckErrorTransient);
+                } else {
+                    $message = sprintf(__('Unknown update checker status "%s"', 'plugin-update-checker'), htmlentities($status));
+                    $noticeClass = 'error notice-error';
+                }
+                printf(
+                    '<div class="notice %s is-dismissible"><p>%s</p>%s</div>',
+                    $noticeClass,
+                    apply_filters($this->getUniqueName('manual_check_message'), $message, $status),
+                    $details
+                );
+            }
+        }
+
+        /**
+         * Format the list of errors that were thrown during an update check.
+         *
+         * @param array $errors
+         * @return string
+         */
+        protected function formatManualCheckErrors($errors) {
+            if ( empty($errors) ) {
+                return '';
+            }
+            $output = '';
+
+            $showAsList = count($errors) > 1;
+            if ( $showAsList ) {
+                $output .= '<ol>';
+                $formatString = '<li>%1$s <code>%2$s</code></li>';
+            } else {
+                $formatString = '<p>%1$s <code>%2$s</code></p>';
+            }
+            foreach ($errors as $item) {
+                $wpError = $item['error'];
+                /** @var WP_Error $wpError */
+                $output .= sprintf(
+                    $formatString,
+                    $wpError->get_error_message(),
+                    $wpError->get_error_code()
+                );
+            }
+            if ( $showAsList ) {
+                $output .= '</ol>';
+            }
+
+            return $output;
+        }
+
+        /**
+         * Get the translated plugin title.
+         *
+         * @return string
+         */
+        protected function getPluginTitle() {
+            $title  = '';
+            $header = $this->getPluginHeader();
+            if ( $header && !empty($header['Name']) && isset($header['TextDomain']) ) {
+                $title = translate($header['Name'], $header['TextDomain']);
+            }
+            return $title;
+        }
+
+        /**
+         * Check if the current user has the required permissions to install updates.
+         *
+         * @return bool
+         */
+        public function userCanInstallUpdates() {
+            return current_user_can('update_plugins');
+        }
+
+        /**
+         * Check if the plugin file is inside the mu-plugins directory.
+         *
+         * @return bool
+         */
+        protected function isMuPlugin() {
+            static $cachedResult = null;
+
+            if ( $cachedResult === null ) {
+                //Convert both paths to the canonical form before comparison.
+                $muPluginDir = realpath(WPMU_PLUGIN_DIR);
+                $pluginPath  = realpath($this->pluginAbsolutePath);
+
+                $cachedResult = (strpos($pluginPath, $muPluginDir) === 0);
+            }
+
+            return $cachedResult;
+        }
+
+        /**
+         * MU plugins are partially supported, but only when we know which file in mu-plugins
+         * corresponds to this plugin.
+         *
+         * @return bool
+         */
+        protected function isUnknownMuPlugin() {
+            return empty($this->muPluginFile) && $this->isMuPlugin();
+        }
+
+        /**
+         * Clear the cached plugin version. This method can be set up as a filter (hook) and will
+         * return the filter argument unmodified.
+         *
+         * @param mixed $filterArgument
+         * @return mixed
+         */
+        public function clearCachedVersion($filterArgument = null) {
+            $this->cachedInstalledVersion = null;
+            return $filterArgument;
+        }
+
+        /**
+         * Get absolute path to the main plugin file.
+         *
+         * @return string
+         */
+        public function getAbsolutePath() {
+            return $this->pluginAbsolutePath;
+        }
+
+        /**
+         * @return string
+         */
+        public function getAbsoluteDirectoryPath() {
+            return dirname($this->pluginAbsolutePath);
+        }
+
+        /**
+         * Register a callback for filtering query arguments.
+         *
+         * The callback function should take one argument - an associative array of query arguments.
+         * It should return a modified array of query arguments.
+         *
+         * @uses add_filter() This method is a convenience wrapper for add_filter().
+         *
+         * @param callable $callback
+         * @return void
+         */
+        public function addQueryArgFilter($callback){
+            $this->addFilter('request_info_query_args', $callback);
+        }
+
+        /**
+         * Register a callback for filtering arguments passed to wp_remote_get().
+         *
+         * The callback function should take one argument - an associative array of arguments -
+         * and return a modified array or arguments. See the WP documentation on wp_remote_get()
+         * for details on what arguments are available and how they work.
+         *
+         * @uses add_filter() This method is a convenience wrapper for add_filter().
+         *
+         * @param callable $callback
+         * @return void
+         */
+        public function addHttpRequestArgFilter($callback) {
+            $this->addFilter('request_info_options', $callback);
+        }
+
+        /**
+         * Register a callback for filtering the plugin info retrieved from the external API.
+         *
+         * The callback function should take two arguments. If the plugin info was retrieved
+         * successfully, the first argument passed will be an instance of  PluginInfo. Otherwise,
+         * it will be NULL. The second argument will be the corresponding return value of
+         * wp_remote_get (see WP docs for details).
+         *
+         * The callback function should return a new or modified instance of PluginInfo or NULL.
+         *
+         * @uses add_filter() This method is a convenience wrapper for add_filter().
+         *
+         * @param callable $callback
+         * @return void
+         */
+        public function addResultFilter($callback) {
+            $this->addFilter('request_info_result', $callback, 10, 2);
+        }
+
+        protected function createDebugBarExtension() {
+            return new Puc_v4p4_DebugBar_PluginExtension($this);
+        }
+    }
 
 endif;

classes/external/php/plugin-update-checker/Puc/v4p4/UpgraderStatus.php

Indentation +194 added lines, -194 removed lines

@@ -1,199 +1,199 @@
 <?php
 if ( !class_exists('Puc_v4p4_UpgraderStatus', false) ):
 
-	/**
-	 * A utility class that helps figure out which plugin or theme WordPress is upgrading.
-	 *
-	 * It may seem strange to have a separate class just for that, but the task is surprisingly complicated.
-	 * Core classes like Plugin_Upgrader don't expose the plugin file name during an in-progress update (AFAICT).
-	 * This class uses a few workarounds and heuristics to get the file name.
-	 */
-	class Puc_v4p4_UpgraderStatus {
-		private $currentType = null; //"plugin" or "theme".
-		private $currentId = null;   //Plugin basename or theme directory name.
-
-		public function __construct() {
-			//Keep track of which plugin/theme WordPress is currently upgrading.
-			add_filter('upgrader_pre_install', array($this, 'setUpgradedThing'), 10, 2);
-			add_filter('upgrader_package_options', array($this, 'setUpgradedPluginFromOptions'), 10, 1);
-			add_filter('upgrader_post_install', array($this, 'clearUpgradedThing'), 10, 1);
-			add_action('upgrader_process_complete', array($this, 'clearUpgradedThing'), 10, 1);
-		}
-
-		/**
-		 * Is there and update being installed RIGHT NOW, for a specific plugin?
-		 *
-		 * Caution: This method is unreliable. WordPress doesn't make it easy to figure out what it is upgrading,
-		 * and upgrader implementations are liable to change without notice.
-		 *
-		 * @param string $pluginFile The plugin to check.
-		 * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
-		 * @return bool True if the plugin identified by $pluginFile is being upgraded.
-		 */
-		public function isPluginBeingUpgraded($pluginFile, $upgrader = null) {
-			return $this->isBeingUpgraded('plugin', $pluginFile, $upgrader);
-		}
-
-		/**
-		 * Is there an update being installed for a specific theme?
-		 *
-		 * @param string $stylesheet Theme directory name.
-		 * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
-		 * @return bool
-		 */
-		public function isThemeBeingUpgraded($stylesheet, $upgrader = null) {
-			return $this->isBeingUpgraded('theme', $stylesheet, $upgrader);
-		}
-
-		/**
-		 * Check if a specific theme or plugin is being upgraded.
-		 *
-		 * @param string $type
-		 * @param string $id
-		 * @param Plugin_Upgrader|WP_Upgrader|null $upgrader
-		 * @return bool
-		 */
-		protected function isBeingUpgraded($type, $id, $upgrader = null) {
-			if ( isset($upgrader) ) {
-				list($currentType, $currentId) = $this->getThingBeingUpgradedBy($upgrader);
-				if ( $currentType !== null ) {
-					$this->currentType = $currentType;
-					$this->currentId = $currentId;
-				}
-			}
-			return ($this->currentType === $type) && ($this->currentId === $id);
-		}
-
-		/**
-		 * Figure out which theme or plugin is being upgraded by a WP_Upgrader instance.
-		 *
-		 * Returns an array with two items. The first item is the type of the thing that's being
-		 * upgraded: "plugin" or "theme". The second item is either the plugin basename or
-		 * the theme directory name. If we can't determine what the upgrader is doing, both items
-		 * will be NULL.
-		 *
-		 * Examples:
-		 *      ['plugin', 'plugin-dir-name/plugin.php']
-		 *      ['theme', 'theme-dir-name']
-		 *
-		 * @param Plugin_Upgrader|WP_Upgrader $upgrader
-		 * @return array
-		 */
-		private function getThingBeingUpgradedBy($upgrader) {
-			if ( !isset($upgrader, $upgrader->skin) ) {
-				return array(null, null);
-			}
-
-			//Figure out which plugin or theme is being upgraded.
-			$pluginFile = null;
-			$themeDirectoryName = null;
-
-			$skin = $upgrader->skin;
-			if ( isset($skin->theme_info) && ($skin->theme_info instanceof WP_Theme) ) {
-				$themeDirectoryName = $skin->theme_info->get_stylesheet();
-			} elseif ( $skin instanceof Plugin_Upgrader_Skin ) {
-				if ( isset($skin->plugin) && is_string($skin->plugin) && ($skin->plugin !== '') ) {
-					$pluginFile = $skin->plugin;
-				}
-			} elseif ( $skin instanceof Theme_Upgrader_Skin ) {
-				if ( isset($skin->theme) && is_string($skin->theme) && ($skin->theme !== '') ) {
-					$themeDirectoryName = $skin->theme;
-				}
-			} elseif ( isset($skin->plugin_info) && is_array($skin->plugin_info) ) {
-				//This case is tricky because Bulk_Plugin_Upgrader_Skin (etc) doesn't actually store the plugin
-				//filename anywhere. Instead, it has the plugin headers in $plugin_info. So the best we can
-				//do is compare those headers to the headers of installed plugins.
-				$pluginFile = $this->identifyPluginByHeaders($skin->plugin_info);
-			}
-
-			if ( $pluginFile !== null ) {
-				return array('plugin', $pluginFile);
-			} elseif ( $themeDirectoryName !== null ) {
-				return array('theme', $themeDirectoryName);
-			}
-			return array(null, null);
-		}
-
-		/**
-		 * Identify an installed plugin based on its headers.
-		 *
-		 * @param array $searchHeaders The plugin file header to look for.
-		 * @return string|null Plugin basename ("foo/bar.php"), or NULL if we can't identify the plugin.
-		 */
-		private function identifyPluginByHeaders($searchHeaders) {
-			if ( !function_exists('get_plugins') ){
-				/** @noinspection PhpIncludeInspection */
-				require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
-			}
-
-			$installedPlugins = get_plugins();
-			$matches = array();
-			foreach($installedPlugins as $pluginBasename => $headers) {
-				$diff1 = array_diff_assoc($headers, $searchHeaders);
-				$diff2 = array_diff_assoc($searchHeaders, $headers);
-				if ( empty($diff1) && empty($diff2) ) {
-					$matches[] = $pluginBasename;
-				}
-			}
-
-			//It's possible (though very unlikely) that there could be two plugins with identical
-			//headers. In that case, we can't unambiguously identify the plugin that's being upgraded.
-			if ( count($matches) !== 1 ) {
-				return null;
-			}
-
-			return reset($matches);
-		}
-
-		/**
-		 * @access private
-		 *
-		 * @param mixed $input
-		 * @param array $hookExtra
-		 * @return mixed Returns $input unaltered.
-		 */
-		public function setUpgradedThing($input, $hookExtra) {
-			if ( !empty($hookExtra['plugin']) && is_string($hookExtra['plugin']) ) {
-				$this->currentId = $hookExtra['plugin'];
-				$this->currentType = 'plugin';
-			} elseif ( !empty($hookExtra['theme']) && is_string($hookExtra['theme']) ) {
-				$this->currentId = $hookExtra['theme'];
-				$this->currentType = 'theme';
-			} else {
-				$this->currentType = null;
-				$this->currentId = null;
-			}
-			return $input;
-		}
-
-		/**
-		 * @access private
-		 *
-		 * @param array $options
-		 * @return array
-		 */
-		public function setUpgradedPluginFromOptions($options) {
-			if ( isset($options['hook_extra']['plugin']) && is_string($options['hook_extra']['plugin']) ) {
-				$this->currentType = 'plugin';
-				$this->currentId = $options['hook_extra']['plugin'];
-			} else {
-				$this->currentType = null;
-				$this->currentId = null;
-			}
-			return $options;
-		}
-
-		/**
-		 * @access private
-		 *
-		 * @param mixed $input
-		 * @return mixed Returns $input unaltered.
-		 */
-		public function clearUpgradedThing($input = null) {
-			$this->currentId = null;
-			$this->currentType = null;
-			return $input;
-		}
-	}
+    /**
+     * A utility class that helps figure out which plugin or theme WordPress is upgrading.
+     *
+     * It may seem strange to have a separate class just for that, but the task is surprisingly complicated.
+     * Core classes like Plugin_Upgrader don't expose the plugin file name during an in-progress update (AFAICT).
+     * This class uses a few workarounds and heuristics to get the file name.
+     */
+    class Puc_v4p4_UpgraderStatus {
+        private $currentType = null; //"plugin" or "theme".
+        private $currentId = null;   //Plugin basename or theme directory name.
+
+        public function __construct() {
+            //Keep track of which plugin/theme WordPress is currently upgrading.
+            add_filter('upgrader_pre_install', array($this, 'setUpgradedThing'), 10, 2);
+            add_filter('upgrader_package_options', array($this, 'setUpgradedPluginFromOptions'), 10, 1);
+            add_filter('upgrader_post_install', array($this, 'clearUpgradedThing'), 10, 1);
+            add_action('upgrader_process_complete', array($this, 'clearUpgradedThing'), 10, 1);
+        }
+
+        /**
+         * Is there and update being installed RIGHT NOW, for a specific plugin?
+         *
+         * Caution: This method is unreliable. WordPress doesn't make it easy to figure out what it is upgrading,
+         * and upgrader implementations are liable to change without notice.
+         *
+         * @param string $pluginFile The plugin to check.
+         * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
+         * @return bool True if the plugin identified by $pluginFile is being upgraded.
+         */
+        public function isPluginBeingUpgraded($pluginFile, $upgrader = null) {
+            return $this->isBeingUpgraded('plugin', $pluginFile, $upgrader);
+        }
+
+        /**
+         * Is there an update being installed for a specific theme?
+         *
+         * @param string $stylesheet Theme directory name.
+         * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
+         * @return bool
+         */
+        public function isThemeBeingUpgraded($stylesheet, $upgrader = null) {
+            return $this->isBeingUpgraded('theme', $stylesheet, $upgrader);
+        }
+
+        /**
+         * Check if a specific theme or plugin is being upgraded.
+         *
+         * @param string $type
+         * @param string $id
+         * @param Plugin_Upgrader|WP_Upgrader|null $upgrader
+         * @return bool
+         */
+        protected function isBeingUpgraded($type, $id, $upgrader = null) {
+            if ( isset($upgrader) ) {
+                list($currentType, $currentId) = $this->getThingBeingUpgradedBy($upgrader);
+                if ( $currentType !== null ) {
+                    $this->currentType = $currentType;
+                    $this->currentId = $currentId;
+                }
+            }
+            return ($this->currentType === $type) && ($this->currentId === $id);
+        }
+
+        /**
+         * Figure out which theme or plugin is being upgraded by a WP_Upgrader instance.
+         *
+         * Returns an array with two items. The first item is the type of the thing that's being
+         * upgraded: "plugin" or "theme". The second item is either the plugin basename or
+         * the theme directory name. If we can't determine what the upgrader is doing, both items
+         * will be NULL.
+         *
+         * Examples:
+         *      ['plugin', 'plugin-dir-name/plugin.php']
+         *      ['theme', 'theme-dir-name']
+         *
+         * @param Plugin_Upgrader|WP_Upgrader $upgrader
+         * @return array
+         */
+        private function getThingBeingUpgradedBy($upgrader) {
+            if ( !isset($upgrader, $upgrader->skin) ) {
+                return array(null, null);
+            }
+
+            //Figure out which plugin or theme is being upgraded.
+            $pluginFile = null;
+            $themeDirectoryName = null;
+
+            $skin = $upgrader->skin;
+            if ( isset($skin->theme_info) && ($skin->theme_info instanceof WP_Theme) ) {
+                $themeDirectoryName = $skin->theme_info->get_stylesheet();
+            } elseif ( $skin instanceof Plugin_Upgrader_Skin ) {
+                if ( isset($skin->plugin) && is_string($skin->plugin) && ($skin->plugin !== '') ) {
+                    $pluginFile = $skin->plugin;
+                }
+            } elseif ( $skin instanceof Theme_Upgrader_Skin ) {
+                if ( isset($skin->theme) && is_string($skin->theme) && ($skin->theme !== '') ) {
+                    $themeDirectoryName = $skin->theme;
+                }
+            } elseif ( isset($skin->plugin_info) && is_array($skin->plugin_info) ) {
+                //This case is tricky because Bulk_Plugin_Upgrader_Skin (etc) doesn't actually store the plugin
+                //filename anywhere. Instead, it has the plugin headers in $plugin_info. So the best we can
+                //do is compare those headers to the headers of installed plugins.
+                $pluginFile = $this->identifyPluginByHeaders($skin->plugin_info);
+            }
+
+            if ( $pluginFile !== null ) {
+                return array('plugin', $pluginFile);
+            } elseif ( $themeDirectoryName !== null ) {
+                return array('theme', $themeDirectoryName);
+            }
+            return array(null, null);
+        }
+
+        /**
+         * Identify an installed plugin based on its headers.
+         *
+         * @param array $searchHeaders The plugin file header to look for.
+         * @return string|null Plugin basename ("foo/bar.php"), or NULL if we can't identify the plugin.
+         */
+        private function identifyPluginByHeaders($searchHeaders) {
+            if ( !function_exists('get_plugins') ){
+                /** @noinspection PhpIncludeInspection */
+                require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
+            }
+
+            $installedPlugins = get_plugins();
+            $matches = array();
+            foreach($installedPlugins as $pluginBasename => $headers) {
+                $diff1 = array_diff_assoc($headers, $searchHeaders);
+                $diff2 = array_diff_assoc($searchHeaders, $headers);
+                if ( empty($diff1) && empty($diff2) ) {
+                    $matches[] = $pluginBasename;
+                }
+            }
+
+            //It's possible (though very unlikely) that there could be two plugins with identical
+            //headers. In that case, we can't unambiguously identify the plugin that's being upgraded.
+            if ( count($matches) !== 1 ) {
+                return null;
+            }
+
+            return reset($matches);
+        }
+
+        /**
+         * @access private
+         *
+         * @param mixed $input
+         * @param array $hookExtra
+         * @return mixed Returns $input unaltered.
+         */
+        public function setUpgradedThing($input, $hookExtra) {
+            if ( !empty($hookExtra['plugin']) && is_string($hookExtra['plugin']) ) {
+                $this->currentId = $hookExtra['plugin'];
+                $this->currentType = 'plugin';
+            } elseif ( !empty($hookExtra['theme']) && is_string($hookExtra['theme']) ) {
+                $this->currentId = $hookExtra['theme'];
+                $this->currentType = 'theme';
+            } else {
+                $this->currentType = null;
+                $this->currentId = null;
+            }
+            return $input;
+        }
+
+        /**
+         * @access private
+         *
+         * @param array $options
+         * @return array
+         */
+        public function setUpgradedPluginFromOptions($options) {
+            if ( isset($options['hook_extra']['plugin']) && is_string($options['hook_extra']['plugin']) ) {
+                $this->currentType = 'plugin';
+                $this->currentId = $options['hook_extra']['plugin'];
+            } else {
+                $this->currentType = null;
+                $this->currentId = null;
+            }
+            return $options;
+        }
+
+        /**
+         * @access private
+         *
+         * @param mixed $input
+         * @return mixed Returns $input unaltered.
+         */
+        public function clearUpgradedThing($input = null) {
+            $this->currentId = null;
+            $this->currentType = null;
+            return $input;
+        }
+    }
 
 endif;
\ No newline at end of file

classes/external/php/plugin-update-checker/Puc/v4p4/UpdateChecker.php

Indentation +861 added lines, -861 removed lines

@@ -2,895 +2,895 @@
 
 if ( !class_exists('Puc_v4p4_UpdateChecker', false) ):
 
-	abstract class Puc_v4p4_UpdateChecker {
-		protected $filterSuffix = '';
-		protected $updateTransient = '';
-		protected $translationType = ''; //"plugin" or "theme".
-
-		/**
-		 * Set to TRUE to enable error reporting. Errors are raised using trigger_error()
-		 * and should be logged to the standard PHP error log.
-		 * @var bool
-		 */
-		public $debugMode = false;
-
-		/**
-		 * @var string Where to store the update info.
-		 */
-		public $optionName = '';
-
-		/**
-		 * @var string The URL of the metadata file.
-		 */
-		public $metadataUrl = '';
-
-		/**
-		 * @var string Plugin or theme directory name.
-		 */
-		public $directoryName = '';
-
-		/**
-		 * @var string The slug that will be used in update checker hooks and remote API requests.
-		 * Usually matches the directory name unless the plugin/theme directory has been renamed.
-		 */
-		public $slug = '';
-
-		/**
-		 * @var Puc_v4p4_Scheduler
-		 */
-		public $scheduler;
-
-		/**
-		 * @var Puc_v4p4_UpgraderStatus
-		 */
-		protected $upgraderStatus;
-
-		/**
-		 * @var Puc_v4p4_StateStore
-		 */
-		protected $updateState;
-
-		/**
-		 * @var array List of API errors triggered during the last checkForUpdates() call.
-		 */
-		protected $lastRequestApiErrors = array();
-
-		public function __construct($metadataUrl, $directoryName, $slug = null, $checkPeriod = 12, $optionName = '') {
-			$this->debugMode = (bool)(constant('WP_DEBUG'));
-			$this->metadataUrl = $metadataUrl;
-			$this->directoryName = $directoryName;
-			$this->slug = !empty($slug) ? $slug : $this->directoryName;
-
-			$this->optionName = $optionName;
-			if ( empty($this->optionName) ) {
-				//BC: Initially the library only supported plugin updates and didn't use type prefixes
-				//in the option name. Lets use the same prefix-less name when possible.
-				if ( $this->filterSuffix === '' ) {
-					$this->optionName = 'external_updates-' . $this->slug;
-				} else {
-					$this->optionName = $this->getUniqueName('external_updates');
-				}
-			}
-
-			$this->scheduler = $this->createScheduler($checkPeriod);
-			$this->upgraderStatus = new Puc_v4p4_UpgraderStatus();
-			$this->updateState = new Puc_v4p4_StateStore($this->optionName);
-
-			if ( did_action('init') ) {
-				$this->loadTextDomain();
-			} else {
-				add_action('init', array($this, 'loadTextDomain'));
-			}
-
-			$this->installHooks();
-		}
-
-		/**
-		 * @internal
-		 */
-		public function loadTextDomain() {
-			//We're not using load_plugin_textdomain() or its siblings because figuring out where
-			//the library is located (plugin, mu-plugin, theme, custom wp-content paths) is messy.
-			$domain = 'plugin-update-checker';
-			$locale = apply_filters(
-				'plugin_locale',
-				(is_admin() && function_exists('get_user_locale')) ? get_user_locale() : get_locale(),
-				$domain
-			);
-
-			$moFile = $domain . '-' . $locale . '.mo';
-			$path = realpath(dirname(__FILE__) . '/../../languages');
-
-			if ($path && file_exists($path)) {
-				load_textdomain($domain, $path . '/' . $moFile);
-			}
-		}
-
-		protected function installHooks() {
-			//Insert our update info into the update array maintained by WP.
-			add_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
-
-			//Insert translation updates into the update list.
-			add_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
-
-			//Clear translation updates when WP clears the update cache.
-			//This needs to be done directly because the library doesn't actually remove obsolete plugin updates,
-			//it just hides them (see getUpdate()). We can't do that with translations - too much disk I/O.
-			add_action(
-				'delete_site_transient_' . $this->updateTransient,
-				array($this, 'clearCachedTranslationUpdates')
-			);
-
-			//Rename the update directory to be the same as the existing directory.
-			if ( $this->directoryName !== '.' ) {
-				add_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10, 3);
-			}
-
-			//Allow HTTP requests to the metadata URL even if it's on a local host.
-			add_filter('http_request_host_is_external', array($this, 'allowMetadataHost'), 10, 2);
-
-			//DebugBar integration.
-			if ( did_action('plugins_loaded') ) {
-				$this->maybeInitDebugBar();
-			} else {
-				add_action('plugins_loaded', array($this, 'maybeInitDebugBar'));
-			}
-		}
-
-		/**
-		 * Remove hooks that were added by this update checker instance.
-		 */
-		protected function removeHooks() {
-			remove_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
-			remove_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
-			remove_action(
-				'delete_site_transient_' . $this->updateTransient,
-				array($this, 'clearCachedTranslationUpdates')
-			);
-
-			remove_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10);
-			remove_filter('http_request_host_is_external', array($this, 'allowMetadataHost'), 10);
-			remove_action('plugins_loaded', array($this, 'maybeInitDebugBar'));
-
-			remove_action('init', array($this, 'loadTextDomain'));
-		}
-
-		/**
-		 * Check if the current user has the required permissions to install updates.
-		 *
-		 * @return bool
-		 */
-		abstract public function userCanInstallUpdates();
-
-		/**
-		 * Explicitly allow HTTP requests to the metadata URL.
-		 *
-		 * WordPress has a security feature where the HTTP API will reject all requests that are sent to
-		 * another site hosted on the same server as the current site (IP match), a local host, or a local
-		 * IP, unless the host exactly matches the current site.
-		 *
-		 * This feature is opt-in (at least in WP 4.4). Apparently some people enable it.
-		 *
-		 * That can be a problem when you're developing your plugin and you decide to host the update information
-		 * on the same server as your test site. Update requests will mysteriously fail.
-		 *
-		 * We fix that by adding an exception for the metadata host.
-		 *
-		 * @param bool $allow
-		 * @param string $host
-		 * @return bool
-		 */
-		public function allowMetadataHost($allow, $host) {
-			static $metadataHost = 0; //Using 0 instead of NULL because parse_url can return NULL.
-			if ( $metadataHost === 0 ) {
-				$metadataHost = @parse_url($this->metadataUrl, PHP_URL_HOST);
-			}
-
-			if ( is_string($metadataHost) && (strtolower($host) === strtolower($metadataHost)) ) {
-				return true;
-			}
-			return $allow;
-		}
-
-		/**
-		 * Create an instance of the scheduler.
-		 *
-		 * This is implemented as a method to make it possible for plugins to subclass the update checker
-		 * and substitute their own scheduler.
-		 *
-		 * @param int $checkPeriod
-		 * @return Puc_v4p4_Scheduler
-		 */
-		abstract protected function createScheduler($checkPeriod);
-
-		/**
-		 * Check for updates. The results are stored in the DB option specified in $optionName.
-		 *
-		 * @return Puc_v4p4_Update|null
-		 */
-		public function checkForUpdates() {
-			$installedVersion = $this->getInstalledVersion();
-			//Fail silently if we can't find the plugin/theme or read its header.
-			if ( $installedVersion === null ) {
-				$this->triggerError(
-					sprintf('Skipping update check for %s - installed version unknown.', $this->slug),
-					E_USER_WARNING
-				);
-				return null;
-			}
-
-			//Start collecting API errors.
-			$this->lastRequestApiErrors = array();
-			add_action('puc_api_error', array($this, 'collectApiErrors'), 10, 4);
-
-			$state = $this->updateState;
-			$state->setLastCheckToNow()
-				->setCheckedVersion($installedVersion)
-				->save(); //Save before checking in case something goes wrong
-
-			$state->setUpdate($this->requestUpdate());
-			$state->save();
-
-			//Stop collecting API errors.
-			remove_action('puc_api_error', array($this, 'collectApiErrors'), 10);
-
-			return $this->getUpdate();
-		}
-
-		/**
-		 * Load the update checker state from the DB.
-		 *
-		 * @return Puc_v4p4_StateStore
-		 */
-		public function getUpdateState() {
-			return $this->updateState->lazyLoad();
-		}
-
-		/**
-		 * Reset update checker state - i.e. last check time, cached update data and so on.
-		 *
-		 * Call this when your plugin is being uninstalled, or if you want to
-		 * clear the update cache.
-		 */
-		public function resetUpdateState() {
-			$this->updateState->delete();
-		}
-
-		/**
-		 * Get the details of the currently available update, if any.
-		 *
-		 * If no updates are available, or if the last known update version is below or equal
-		 * to the currently installed version, this method will return NULL.
-		 *
-		 * Uses cached update data. To retrieve update information straight from
-		 * the metadata URL, call requestUpdate() instead.
-		 *
-		 * @return Puc_v4p4_Update|null
-		 */
-		public function getUpdate() {
-			$update = $this->updateState->getUpdate();
-
-			//Is there an update available?
-			if ( isset($update) ) {
-				//Check if the update is actually newer than the currently installed version.
-				$installedVersion = $this->getInstalledVersion();
-				if ( ($installedVersion !== null) && version_compare($update->version, $installedVersion, '>') ){
-					return $update;
-				}
-			}
-			return null;
-		}
-
-		/**
-		 * Retrieve the latest update (if any) from the configured API endpoint.
-		 *
-		 * Subclasses should run the update through filterUpdateResult before returning it.
-		 *
-		 * @return Puc_v4p4_Update An instance of Update, or NULL when no updates are available.
-		 */
-		abstract public function requestUpdate();
-
-		/**
-		 * Filter the result of a requestUpdate() call.
-		 *
-		 * @param Puc_v4p4_Update|null $update
-		 * @param array|WP_Error|null $httpResult The value returned by wp_remote_get(), if any.
-		 * @return Puc_v4p4_Update
-		 */
-		protected function filterUpdateResult($update, $httpResult = null) {
-			//Let plugins/themes modify the update.
-			$update = apply_filters($this->getUniqueName('request_update_result'), $update, $httpResult);
-
-			if ( isset($update, $update->translations) ) {
-				//Keep only those translation updates that apply to this site.
-				$update->translations = $this->filterApplicableTranslations($update->translations);
-			}
-
-			return $update;
-		}
-
-		/**
-		 * Get the currently installed version of the plugin or theme.
-		 *
-		 * @return string|null Version number.
-		 */
-		abstract public function getInstalledVersion();
-
-		/**
-		 * Get the full path of the plugin or theme directory.
-		 *
-		 * @return string
-		 */
-		abstract public function getAbsoluteDirectoryPath();
-
-		/**
-		 * Trigger a PHP error, but only when $debugMode is enabled.
-		 *
-		 * @param string $message
-		 * @param int $errorType
-		 */
-		protected function triggerError($message, $errorType) {
-			if ($this->debugMode) {
-				trigger_error($message, $errorType);
-			}
-		}
-
-		/**
-		 * Get the full name of an update checker filter, action or DB entry.
-		 *
-		 * This method adds the "puc_" prefix and the "-$slug" suffix to the filter name.
-		 * For example, "pre_inject_update" becomes "puc_pre_inject_update-plugin-slug".
-		 *
-		 * @param string $baseTag
-		 * @return string
-		 */
-		public function getUniqueName($baseTag) {
-			$name = 'puc_' . $baseTag;
-			if ($this->filterSuffix !== '') {
-				$name .= '_' . $this->filterSuffix;
-			}
-			return $name . '-' . $this->slug;
-		}
-
-		/**
-		 * Store API errors that are generated when checking for updates.
-		 *
-		 * @internal
-		 * @param WP_Error $error
-		 * @param array|null $httpResponse
-		 * @param string|null $url
-		 * @param string|null $slug
-		 */
-		public function collectApiErrors($error, $httpResponse = null, $url = null, $slug = null) {
-			if ( isset($slug) && ($slug !== $this->slug) ) {
-				return;
-			}
-
-			$this->lastRequestApiErrors[] = array(
-				'error'        => $error,
-				'httpResponse' => $httpResponse,
-				'url'          => $url,
-			);
-		}
-
-		/**
-		 * @return array
-		 */
-		public function getLastRequestApiErrors() {
-			return $this->lastRequestApiErrors;
-		}
-
-		/* -------------------------------------------------------------------
+    abstract class Puc_v4p4_UpdateChecker {
+        protected $filterSuffix = '';
+        protected $updateTransient = '';
+        protected $translationType = ''; //"plugin" or "theme".
+
+        /**
+         * Set to TRUE to enable error reporting. Errors are raised using trigger_error()
+         * and should be logged to the standard PHP error log.
+         * @var bool
+         */
+        public $debugMode = false;
+
+        /**
+         * @var string Where to store the update info.
+         */
+        public $optionName = '';
+
+        /**
+         * @var string The URL of the metadata file.
+         */
+        public $metadataUrl = '';
+
+        /**
+         * @var string Plugin or theme directory name.
+         */
+        public $directoryName = '';
+
+        /**
+         * @var string The slug that will be used in update checker hooks and remote API requests.
+         * Usually matches the directory name unless the plugin/theme directory has been renamed.
+         */
+        public $slug = '';
+
+        /**
+         * @var Puc_v4p4_Scheduler
+         */
+        public $scheduler;
+
+        /**
+         * @var Puc_v4p4_UpgraderStatus
+         */
+        protected $upgraderStatus;
+
+        /**
+         * @var Puc_v4p4_StateStore
+         */
+        protected $updateState;
+
+        /**
+         * @var array List of API errors triggered during the last checkForUpdates() call.
+         */
+        protected $lastRequestApiErrors = array();
+
+        public function __construct($metadataUrl, $directoryName, $slug = null, $checkPeriod = 12, $optionName = '') {
+            $this->debugMode = (bool)(constant('WP_DEBUG'));
+            $this->metadataUrl = $metadataUrl;
+            $this->directoryName = $directoryName;
+            $this->slug = !empty($slug) ? $slug : $this->directoryName;
+
+            $this->optionName = $optionName;
+            if ( empty($this->optionName) ) {
+                //BC: Initially the library only supported plugin updates and didn't use type prefixes
+                //in the option name. Lets use the same prefix-less name when possible.
+                if ( $this->filterSuffix === '' ) {
+                    $this->optionName = 'external_updates-' . $this->slug;
+                } else {
+                    $this->optionName = $this->getUniqueName('external_updates');
+                }
+            }
+
+            $this->scheduler = $this->createScheduler($checkPeriod);
+            $this->upgraderStatus = new Puc_v4p4_UpgraderStatus();
+            $this->updateState = new Puc_v4p4_StateStore($this->optionName);
+
+            if ( did_action('init') ) {
+                $this->loadTextDomain();
+            } else {
+                add_action('init', array($this, 'loadTextDomain'));
+            }
+
+            $this->installHooks();
+        }
+
+        /**
+         * @internal
+         */
+        public function loadTextDomain() {
+            //We're not using load_plugin_textdomain() or its siblings because figuring out where
+            //the library is located (plugin, mu-plugin, theme, custom wp-content paths) is messy.
+            $domain = 'plugin-update-checker';
+            $locale = apply_filters(
+                'plugin_locale',
+                (is_admin() && function_exists('get_user_locale')) ? get_user_locale() : get_locale(),
+                $domain
+            );
+
+            $moFile = $domain . '-' . $locale . '.mo';
+            $path = realpath(dirname(__FILE__) . '/../../languages');
+
+            if ($path && file_exists($path)) {
+                load_textdomain($domain, $path . '/' . $moFile);
+            }
+        }
+
+        protected function installHooks() {
+            //Insert our update info into the update array maintained by WP.
+            add_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
+
+            //Insert translation updates into the update list.
+            add_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
+
+            //Clear translation updates when WP clears the update cache.
+            //This needs to be done directly because the library doesn't actually remove obsolete plugin updates,
+            //it just hides them (see getUpdate()). We can't do that with translations - too much disk I/O.
+            add_action(
+                'delete_site_transient_' . $this->updateTransient,
+                array($this, 'clearCachedTranslationUpdates')
+            );
+
+            //Rename the update directory to be the same as the existing directory.
+            if ( $this->directoryName !== '.' ) {
+                add_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10, 3);
+            }
+
+            //Allow HTTP requests to the metadata URL even if it's on a local host.
+            add_filter('http_request_host_is_external', array($this, 'allowMetadataHost'), 10, 2);
+
+            //DebugBar integration.
+            if ( did_action('plugins_loaded') ) {
+                $this->maybeInitDebugBar();
+            } else {
+                add_action('plugins_loaded', array($this, 'maybeInitDebugBar'));
+            }
+        }
+
+        /**
+         * Remove hooks that were added by this update checker instance.
+         */
+        protected function removeHooks() {
+            remove_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
+            remove_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
+            remove_action(
+                'delete_site_transient_' . $this->updateTransient,
+                array($this, 'clearCachedTranslationUpdates')
+            );
+
+            remove_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10);
+            remove_filter('http_request_host_is_external', array($this, 'allowMetadataHost'), 10);
+            remove_action('plugins_loaded', array($this, 'maybeInitDebugBar'));
+
+            remove_action('init', array($this, 'loadTextDomain'));
+        }
+
+        /**
+         * Check if the current user has the required permissions to install updates.
+         *
+         * @return bool
+         */
+        abstract public function userCanInstallUpdates();
+
+        /**
+         * Explicitly allow HTTP requests to the metadata URL.
+         *
+         * WordPress has a security feature where the HTTP API will reject all requests that are sent to
+         * another site hosted on the same server as the current site (IP match), a local host, or a local
+         * IP, unless the host exactly matches the current site.
+         *
+         * This feature is opt-in (at least in WP 4.4). Apparently some people enable it.
+         *
+         * That can be a problem when you're developing your plugin and you decide to host the update information
+         * on the same server as your test site. Update requests will mysteriously fail.
+         *
+         * We fix that by adding an exception for the metadata host.
+         *
+         * @param bool $allow
+         * @param string $host
+         * @return bool
+         */
+        public function allowMetadataHost($allow, $host) {
+            static $metadataHost = 0; //Using 0 instead of NULL because parse_url can return NULL.
+            if ( $metadataHost === 0 ) {
+                $metadataHost = @parse_url($this->metadataUrl, PHP_URL_HOST);
+            }
+
+            if ( is_string($metadataHost) && (strtolower($host) === strtolower($metadataHost)) ) {
+                return true;
+            }
+            return $allow;
+        }
+
+        /**
+         * Create an instance of the scheduler.
+         *
+         * This is implemented as a method to make it possible for plugins to subclass the update checker
+         * and substitute their own scheduler.
+         *
+         * @param int $checkPeriod
+         * @return Puc_v4p4_Scheduler
+         */
+        abstract protected function createScheduler($checkPeriod);
+
+        /**
+         * Check for updates. The results are stored in the DB option specified in $optionName.
+         *
+         * @return Puc_v4p4_Update|null
+         */
+        public function checkForUpdates() {
+            $installedVersion = $this->getInstalledVersion();
+            //Fail silently if we can't find the plugin/theme or read its header.
+            if ( $installedVersion === null ) {
+                $this->triggerError(
+                    sprintf('Skipping update check for %s - installed version unknown.', $this->slug),
+                    E_USER_WARNING
+                );
+                return null;
+            }
+
+            //Start collecting API errors.
+            $this->lastRequestApiErrors = array();
+            add_action('puc_api_error', array($this, 'collectApiErrors'), 10, 4);
+
+            $state = $this->updateState;
+            $state->setLastCheckToNow()
+                ->setCheckedVersion($installedVersion)
+                ->save(); //Save before checking in case something goes wrong
+
+            $state->setUpdate($this->requestUpdate());
+            $state->save();
+
+            //Stop collecting API errors.
+            remove_action('puc_api_error', array($this, 'collectApiErrors'), 10);
+
+            return $this->getUpdate();
+        }
+
+        /**
+         * Load the update checker state from the DB.
+         *
+         * @return Puc_v4p4_StateStore
+         */
+        public function getUpdateState() {
+            return $this->updateState->lazyLoad();
+        }
+
+        /**
+         * Reset update checker state - i.e. last check time, cached update data and so on.
+         *
+         * Call this when your plugin is being uninstalled, or if you want to
+         * clear the update cache.
+         */
+        public function resetUpdateState() {
+            $this->updateState->delete();
+        }
+
+        /**
+         * Get the details of the currently available update, if any.
+         *
+         * If no updates are available, or if the last known update version is below or equal
+         * to the currently installed version, this method will return NULL.
+         *
+         * Uses cached update data. To retrieve update information straight from
+         * the metadata URL, call requestUpdate() instead.
+         *
+         * @return Puc_v4p4_Update|null
+         */
+        public function getUpdate() {
+            $update = $this->updateState->getUpdate();
+
+            //Is there an update available?
+            if ( isset($update) ) {
+                //Check if the update is actually newer than the currently installed version.
+                $installedVersion = $this->getInstalledVersion();
+                if ( ($installedVersion !== null) && version_compare($update->version, $installedVersion, '>') ){
+                    return $update;
+                }
+            }
+            return null;
+        }
+
+        /**
+         * Retrieve the latest update (if any) from the configured API endpoint.
+         *
+         * Subclasses should run the update through filterUpdateResult before returning it.
+         *
+         * @return Puc_v4p4_Update An instance of Update, or NULL when no updates are available.
+         */
+        abstract public function requestUpdate();
+
+        /**
+         * Filter the result of a requestUpdate() call.
+         *
+         * @param Puc_v4p4_Update|null $update
+         * @param array|WP_Error|null $httpResult The value returned by wp_remote_get(), if any.
+         * @return Puc_v4p4_Update
+         */
+        protected function filterUpdateResult($update, $httpResult = null) {
+            //Let plugins/themes modify the update.
+            $update = apply_filters($this->getUniqueName('request_update_result'), $update, $httpResult);
+
+            if ( isset($update, $update->translations) ) {
+                //Keep only those translation updates that apply to this site.
+                $update->translations = $this->filterApplicableTranslations($update->translations);
+            }
+
+            return $update;
+        }
+
+        /**
+         * Get the currently installed version of the plugin or theme.
+         *
+         * @return string|null Version number.
+         */
+        abstract public function getInstalledVersion();
+
+        /**
+         * Get the full path of the plugin or theme directory.
+         *
+         * @return string
+         */
+        abstract public function getAbsoluteDirectoryPath();
+
+        /**
+         * Trigger a PHP error, but only when $debugMode is enabled.
+         *
+         * @param string $message
+         * @param int $errorType
+         */
+        protected function triggerError($message, $errorType) {
+            if ($this->debugMode) {
+                trigger_error($message, $errorType);
+            }
+        }
+
+        /**
+         * Get the full name of an update checker filter, action or DB entry.
+         *
+         * This method adds the "puc_" prefix and the "-$slug" suffix to the filter name.
+         * For example, "pre_inject_update" becomes "puc_pre_inject_update-plugin-slug".
+         *
+         * @param string $baseTag
+         * @return string
+         */
+        public function getUniqueName($baseTag) {
+            $name = 'puc_' . $baseTag;
+            if ($this->filterSuffix !== '') {
+                $name .= '_' . $this->filterSuffix;
+            }
+            return $name . '-' . $this->slug;
+        }
+
+        /**
+         * Store API errors that are generated when checking for updates.
+         *
+         * @internal
+         * @param WP_Error $error
+         * @param array|null $httpResponse
+         * @param string|null $url
+         * @param string|null $slug
+         */
+        public function collectApiErrors($error, $httpResponse = null, $url = null, $slug = null) {
+            if ( isset($slug) && ($slug !== $this->slug) ) {
+                return;
+            }
+
+            $this->lastRequestApiErrors[] = array(
+                'error'        => $error,
+                'httpResponse' => $httpResponse,
+                'url'          => $url,
+            );
+        }
+
+        /**
+         * @return array
+         */
+        public function getLastRequestApiErrors() {
+            return $this->lastRequestApiErrors;
+        }
+
+        /* -------------------------------------------------------------------
 		 * PUC filters and filter utilities
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Register a callback for one of the update checker filters.
-		 *
-		 * Identical to add_filter(), except it automatically adds the "puc_" prefix
-		 * and the "-$slug" suffix to the filter name. For example, "request_info_result"
-		 * becomes "puc_request_info_result-your_plugin_slug".
-		 *
-		 * @param string $tag
-		 * @param callable $callback
-		 * @param int $priority
-		 * @param int $acceptedArgs
-		 */
-		public function addFilter($tag, $callback, $priority = 10, $acceptedArgs = 1) {
-			add_filter($this->getUniqueName($tag), $callback, $priority, $acceptedArgs);
-		}
-
-		/* -------------------------------------------------------------------
+        /**
+         * Register a callback for one of the update checker filters.
+         *
+         * Identical to add_filter(), except it automatically adds the "puc_" prefix
+         * and the "-$slug" suffix to the filter name. For example, "request_info_result"
+         * becomes "puc_request_info_result-your_plugin_slug".
+         *
+         * @param string $tag
+         * @param callable $callback
+         * @param int $priority
+         * @param int $acceptedArgs
+         */
+        public function addFilter($tag, $callback, $priority = 10, $acceptedArgs = 1) {
+            add_filter($this->getUniqueName($tag), $callback, $priority, $acceptedArgs);
+        }
+
+        /* -------------------------------------------------------------------
 		 * Inject updates
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Insert the latest update (if any) into the update list maintained by WP.
-		 *
-		 * @param stdClass $updates Update list.
-		 * @return stdClass Modified update list.
-		 */
-		public function injectUpdate($updates) {
-			//Is there an update to insert?
-			$update = $this->getUpdate();
-
-			if ( !$this->shouldShowUpdates() ) {
-				$update = null;
-			}
-
-			if ( !empty($update) ) {
-				//Let plugins filter the update info before it's passed on to WordPress.
-				$update = apply_filters($this->getUniqueName('pre_inject_update'), $update);
-				$updates = $this->addUpdateToList($updates, $update->toWpFormat());
-			} else {
-				//Clean up any stale update info.
-				$updates = $this->removeUpdateFromList($updates);
-			}
-
-			return $updates;
-		}
-
-		/**
-		 * @param stdClass|null $updates
-		 * @param stdClass|array $updateToAdd
-		 * @return stdClass
-		 */
-		protected function addUpdateToList($updates, $updateToAdd) {
-			if ( !is_object($updates) ) {
-				$updates = new stdClass();
-				$updates->response = array();
-			}
-
-			$updates->response[$this->getUpdateListKey()] = $updateToAdd;
-			return $updates;
-		}
-
-		/**
-		 * @param stdClass|null $updates
-		 * @return stdClass|null
-		 */
-		protected function removeUpdateFromList($updates) {
-			if ( isset($updates, $updates->response) ) {
-				unset($updates->response[$this->getUpdateListKey()]);
-			}
-			return $updates;
-		}
-
-		/**
-		 * Get the key that will be used when adding updates to the update list that's maintained
-		 * by the WordPress core. The list is always an associative array, but the key is different
-		 * for plugins and themes.
-		 *
-		 * @return string
-		 */
-		abstract protected function getUpdateListKey();
-
-		/**
-		 * Should we show available updates?
-		 *
-		 * Usually the answer is "yes", but there are exceptions. For example, WordPress doesn't
-		 * support automatic updates installation for mu-plugins, so PUC usually won't show update
-		 * notifications in that case. See the plugin-specific subclass for details.
-		 *
-		 * Note: This method only applies to updates that are displayed (or not) in the WordPress
-		 * admin. It doesn't affect APIs like requestUpdate and getUpdate.
-		 *
-		 * @return bool
-		 */
-		protected function shouldShowUpdates() {
-			return true;
-		}
-
-		/* -------------------------------------------------------------------
+        /**
+         * Insert the latest update (if any) into the update list maintained by WP.
+         *
+         * @param stdClass $updates Update list.
+         * @return stdClass Modified update list.
+         */
+        public function injectUpdate($updates) {
+            //Is there an update to insert?
+            $update = $this->getUpdate();
+
+            if ( !$this->shouldShowUpdates() ) {
+                $update = null;
+            }
+
+            if ( !empty($update) ) {
+                //Let plugins filter the update info before it's passed on to WordPress.
+                $update = apply_filters($this->getUniqueName('pre_inject_update'), $update);
+                $updates = $this->addUpdateToList($updates, $update->toWpFormat());
+            } else {
+                //Clean up any stale update info.
+                $updates = $this->removeUpdateFromList($updates);
+            }
+
+            return $updates;
+        }
+
+        /**
+         * @param stdClass|null $updates
+         * @param stdClass|array $updateToAdd
+         * @return stdClass
+         */
+        protected function addUpdateToList($updates, $updateToAdd) {
+            if ( !is_object($updates) ) {
+                $updates = new stdClass();
+                $updates->response = array();
+            }
+
+            $updates->response[$this->getUpdateListKey()] = $updateToAdd;
+            return $updates;
+        }
+
+        /**
+         * @param stdClass|null $updates
+         * @return stdClass|null
+         */
+        protected function removeUpdateFromList($updates) {
+            if ( isset($updates, $updates->response) ) {
+                unset($updates->response[$this->getUpdateListKey()]);
+            }
+            return $updates;
+        }
+
+        /**
+         * Get the key that will be used when adding updates to the update list that's maintained
+         * by the WordPress core. The list is always an associative array, but the key is different
+         * for plugins and themes.
+         *
+         * @return string
+         */
+        abstract protected function getUpdateListKey();
+
+        /**
+         * Should we show available updates?
+         *
+         * Usually the answer is "yes", but there are exceptions. For example, WordPress doesn't
+         * support automatic updates installation for mu-plugins, so PUC usually won't show update
+         * notifications in that case. See the plugin-specific subclass for details.
+         *
+         * Note: This method only applies to updates that are displayed (or not) in the WordPress
+         * admin. It doesn't affect APIs like requestUpdate and getUpdate.
+         *
+         * @return bool
+         */
+        protected function shouldShowUpdates() {
+            return true;
+        }
+
+        /* -------------------------------------------------------------------
 		 * JSON-based update API
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Retrieve plugin or theme metadata from the JSON document at $this->metadataUrl.
-		 *
-		 * @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_v4p4_Metadata|null, array|WP_Error] A metadata instance and the value returned by wp_remote_get().
-		 */
-		protected function requestMetadata($metaClass, $filterRoot, $queryArgs = array()) {
-			//Query args to append to the URL. Plugins can add their own by using a filter callback (see addQueryArgFilter()).
-			$queryArgs = array_merge(
-				array(
-					'installed_version' => strval($this->getInstalledVersion()),
-					'php' => phpversion(),
-					'locale' => get_locale(),
-				),
-				$queryArgs
-			);
-			$queryArgs = apply_filters($this->getUniqueName($filterRoot . '_query_args'), $queryArgs);
-
-			//Various options for the wp_remote_get() call. Plugins can filter these, too.
-			$options = array(
-				'timeout' => 10, //seconds
-				'headers' => array(
-					'Accept' => 'application/json',
-				),
-			);
-			$options = apply_filters($this->getUniqueName($filterRoot . '_options'), $options);
-
-			//The metadata file should be at 'http://your-api.com/url/here/$slug/info.json'
-			$url = $this->metadataUrl;
-			if ( !empty($queryArgs) ){
-				$url = add_query_arg($queryArgs, $url);
-			}
-
-			$result = wp_remote_get($url, $options);
-
-			$result = apply_filters($this->getUniqueName('request_metadata_http_result'), $result, $url, $options);
+        /**
+         * Retrieve plugin or theme metadata from the JSON document at $this->metadataUrl.
+         *
+         * @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_v4p4_Metadata|null, array|WP_Error] A metadata instance and the value returned by wp_remote_get().
+         */
+        protected function requestMetadata($metaClass, $filterRoot, $queryArgs = array()) {
+            //Query args to append to the URL. Plugins can add their own by using a filter callback (see addQueryArgFilter()).
+            $queryArgs = array_merge(
+                array(
+                    'installed_version' => strval($this->getInstalledVersion()),
+                    'php' => phpversion(),
+                    'locale' => get_locale(),
+                ),
+                $queryArgs
+            );
+            $queryArgs = apply_filters($this->getUniqueName($filterRoot . '_query_args'), $queryArgs);
+
+            //Various options for the wp_remote_get() call. Plugins can filter these, too.
+            $options = array(
+                'timeout' => 10, //seconds
+                'headers' => array(
+                    'Accept' => 'application/json',
+                ),
+            );
+            $options = apply_filters($this->getUniqueName($filterRoot . '_options'), $options);
+
+            //The metadata file should be at 'http://your-api.com/url/here/$slug/info.json'
+            $url = $this->metadataUrl;
+            if ( !empty($queryArgs) ){
+                $url = add_query_arg($queryArgs, $url);
+            }
+
+            $result = wp_remote_get($url, $options);
+
+            $result = apply_filters($this->getUniqueName('request_metadata_http_result'), $result, $url, $options);
 			
-			//Try to parse the response
-			$status = $this->validateApiResponse($result);
-			$metadata = null;
-			if ( !is_wp_error($status) ){
-				$metadata = call_user_func(array($metaClass, 'fromJson'), $result['body']);
-			} else {
-				do_action('puc_api_error', $status, $result, $url, $this->slug);
-				$this->triggerError(
-					sprintf('The URL %s does not point to a valid metadata file. ', $url)
-					. $status->get_error_message(),
-					E_USER_WARNING
-				);
-			}
-
-			return array($metadata, $result);
-		}
-
-		/**
-		 * Check if $result is a successful update API response.
-		 *
-		 * @param array|WP_Error $result
-		 * @return true|WP_Error
-		 */
-		protected function validateApiResponse($result) {
-			if ( is_wp_error($result) ) { /** @var WP_Error $result */
-				return new WP_Error($result->get_error_code(), 'WP HTTP Error: ' . $result->get_error_message());
-			}
-
-			if ( !isset($result['response']['code']) ) {
-				return new WP_Error(
-					'puc_no_response_code',
-					'wp_remote_get() returned an unexpected result.'
-				);
-			}
-
-			if ( $result['response']['code'] !== 200 ) {
-				return new WP_Error(
-					'puc_unexpected_response_code',
-					'HTTP response code is ' . $result['response']['code'] . ' (expected: 200)'
-				);
-			}
-
-			if ( empty($result['body']) ) {
-				return new WP_Error('puc_empty_response', 'The metadata file appears to be empty.');
-			}
-
-			return true;
-		}
-
-		/* -------------------------------------------------------------------
+            //Try to parse the response
+            $status = $this->validateApiResponse($result);
+            $metadata = null;
+            if ( !is_wp_error($status) ){
+                $metadata = call_user_func(array($metaClass, 'fromJson'), $result['body']);
+            } else {
+                do_action('puc_api_error', $status, $result, $url, $this->slug);
+                $this->triggerError(
+                    sprintf('The URL %s does not point to a valid metadata file. ', $url)
+                    . $status->get_error_message(),
+                    E_USER_WARNING
+                );
+            }
+
+            return array($metadata, $result);
+        }
+
+        /**
+         * Check if $result is a successful update API response.
+         *
+         * @param array|WP_Error $result
+         * @return true|WP_Error
+         */
+        protected function validateApiResponse($result) {
+            if ( is_wp_error($result) ) { /** @var WP_Error $result */
+                return new WP_Error($result->get_error_code(), 'WP HTTP Error: ' . $result->get_error_message());
+            }
+
+            if ( !isset($result['response']['code']) ) {
+                return new WP_Error(
+                    'puc_no_response_code',
+                    'wp_remote_get() returned an unexpected result.'
+                );
+            }
+
+            if ( $result['response']['code'] !== 200 ) {
+                return new WP_Error(
+                    'puc_unexpected_response_code',
+                    'HTTP response code is ' . $result['response']['code'] . ' (expected: 200)'
+                );
+            }
+
+            if ( empty($result['body']) ) {
+                return new WP_Error('puc_empty_response', 'The metadata file appears to be empty.');
+            }
+
+            return true;
+        }
+
+        /* -------------------------------------------------------------------
 		 * Language packs / Translation updates
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Filter a list of translation updates and return a new list that contains only updates
-		 * that apply to the current site.
-		 *
-		 * @param array $translations
-		 * @return array
-		 */
-		protected function filterApplicableTranslations($translations) {
-			$languages = array_flip(array_values(get_available_languages()));
-			$installedTranslations = $this->getInstalledTranslations();
-
-			$applicableTranslations = array();
-			foreach($translations as $translation) {
-				//Does it match one of the available core languages?
-				$isApplicable = array_key_exists($translation->language, $languages);
-				//Is it more recent than an already-installed translation?
-				if ( isset($installedTranslations[$translation->language]) ) {
-					$updateTimestamp = strtotime($translation->updated);
-					$installedTimestamp = strtotime($installedTranslations[$translation->language]['PO-Revision-Date']);
-					$isApplicable = $updateTimestamp > $installedTimestamp;
-				}
-
-				if ( $isApplicable ) {
-					$applicableTranslations[] = $translation;
-				}
-			}
-
-			return $applicableTranslations;
-		}
-
-		/**
-		 * Get a list of installed translations for this plugin or theme.
-		 *
-		 * @return array
-		 */
-		protected function getInstalledTranslations() {
-			if ( !function_exists('wp_get_installed_translations') ) {
-				return array();
-			}
-			$installedTranslations = wp_get_installed_translations($this->translationType . 's');
-			if ( isset($installedTranslations[$this->directoryName]) ) {
-				$installedTranslations = $installedTranslations[$this->directoryName];
-			} else {
-				$installedTranslations = array();
-			}
-			return $installedTranslations;
-		}
-
-		/**
-		 * Insert translation updates into the list maintained by WordPress.
-		 *
-		 * @param stdClass $updates
-		 * @return stdClass
-		 */
-		public function injectTranslationUpdates($updates) {
-			$translationUpdates = $this->getTranslationUpdates();
-			if ( empty($translationUpdates) ) {
-				return $updates;
-			}
-
-			//Being defensive.
-			if ( !is_object($updates) ) {
-				$updates = new stdClass();
-			}
-			if ( !isset($updates->translations) ) {
-				$updates->translations = array();
-			}
-
-			//In case there's a name collision with a plugin or theme hosted on wordpress.org,
-			//remove any preexisting updates that match our thing.
-			$updates->translations = array_values(array_filter(
-				$updates->translations,
-				array($this, 'isNotMyTranslation')
-			));
-
-			//Add our updates to the list.
-			foreach($translationUpdates as $update) {
-				$convertedUpdate = array_merge(
-					array(
-						'type' => $this->translationType,
-						'slug' => $this->directoryName,
-						'autoupdate' => 0,
-						//AFAICT, WordPress doesn't actually use the "version" field for anything.
-						//But lets make sure it's there, just in case.
-						'version' => isset($update->version) ? $update->version : ('1.' . strtotime($update->updated)),
-					),
-					(array)$update
-				);
-
-				$updates->translations[] = $convertedUpdate;
-			}
-
-			return $updates;
-		}
-
-		/**
-		 * Get a list of available translation updates.
-		 *
-		 * This method will return an empty array if there are no updates.
-		 * Uses cached update data.
-		 *
-		 * @return array
-		 */
-		public function getTranslationUpdates() {
-			return $this->updateState->getTranslations();
-		}
-
-		/**
-		 * Remove all cached translation updates.
-		 *
-		 * @see wp_clean_update_cache
-		 */
-		public function clearCachedTranslationUpdates() {
-			$this->updateState->setTranslations(array());
-		}
-
-		/**
-		 * Filter callback. Keeps only translations that *don't* match this plugin or theme.
-		 *
-		 * @param array $translation
-		 * @return bool
-		 */
-		protected function isNotMyTranslation($translation) {
-			$isMatch = isset($translation['type'], $translation['slug'])
-				&& ($translation['type'] === $this->translationType)
-				&& ($translation['slug'] === $this->directoryName);
-
-			return !$isMatch;
-		}
-
-		/* -------------------------------------------------------------------
+        /**
+         * Filter a list of translation updates and return a new list that contains only updates
+         * that apply to the current site.
+         *
+         * @param array $translations
+         * @return array
+         */
+        protected function filterApplicableTranslations($translations) {
+            $languages = array_flip(array_values(get_available_languages()));
+            $installedTranslations = $this->getInstalledTranslations();
+
+            $applicableTranslations = array();
+            foreach($translations as $translation) {
+                //Does it match one of the available core languages?
+                $isApplicable = array_key_exists($translation->language, $languages);
+                //Is it more recent than an already-installed translation?
+                if ( isset($installedTranslations[$translation->language]) ) {
+                    $updateTimestamp = strtotime($translation->updated);
+                    $installedTimestamp = strtotime($installedTranslations[$translation->language]['PO-Revision-Date']);
+                    $isApplicable = $updateTimestamp > $installedTimestamp;
+                }
+
+                if ( $isApplicable ) {
+                    $applicableTranslations[] = $translation;
+                }
+            }
+
+            return $applicableTranslations;
+        }
+
+        /**
+         * Get a list of installed translations for this plugin or theme.
+         *
+         * @return array
+         */
+        protected function getInstalledTranslations() {
+            if ( !function_exists('wp_get_installed_translations') ) {
+                return array();
+            }
+            $installedTranslations = wp_get_installed_translations($this->translationType . 's');
+            if ( isset($installedTranslations[$this->directoryName]) ) {
+                $installedTranslations = $installedTranslations[$this->directoryName];
+            } else {
+                $installedTranslations = array();
+            }
+            return $installedTranslations;
+        }
+
+        /**
+         * Insert translation updates into the list maintained by WordPress.
+         *
+         * @param stdClass $updates
+         * @return stdClass
+         */
+        public function injectTranslationUpdates($updates) {
+            $translationUpdates = $this->getTranslationUpdates();
+            if ( empty($translationUpdates) ) {
+                return $updates;
+            }
+
+            //Being defensive.
+            if ( !is_object($updates) ) {
+                $updates = new stdClass();
+            }
+            if ( !isset($updates->translations) ) {
+                $updates->translations = array();
+            }
+
+            //In case there's a name collision with a plugin or theme hosted on wordpress.org,
+            //remove any preexisting updates that match our thing.
+            $updates->translations = array_values(array_filter(
+                $updates->translations,
+                array($this, 'isNotMyTranslation')
+            ));
+
+            //Add our updates to the list.
+            foreach($translationUpdates as $update) {
+                $convertedUpdate = array_merge(
+                    array(
+                        'type' => $this->translationType,
+                        'slug' => $this->directoryName,
+                        'autoupdate' => 0,
+                        //AFAICT, WordPress doesn't actually use the "version" field for anything.
+                        //But lets make sure it's there, just in case.
+                        'version' => isset($update->version) ? $update->version : ('1.' . strtotime($update->updated)),
+                    ),
+                    (array)$update
+                );
+
+                $updates->translations[] = $convertedUpdate;
+            }
+
+            return $updates;
+        }
+
+        /**
+         * Get a list of available translation updates.
+         *
+         * This method will return an empty array if there are no updates.
+         * Uses cached update data.
+         *
+         * @return array
+         */
+        public function getTranslationUpdates() {
+            return $this->updateState->getTranslations();
+        }
+
+        /**
+         * Remove all cached translation updates.
+         *
+         * @see wp_clean_update_cache
+         */
+        public function clearCachedTranslationUpdates() {
+            $this->updateState->setTranslations(array());
+        }
+
+        /**
+         * Filter callback. Keeps only translations that *don't* match this plugin or theme.
+         *
+         * @param array $translation
+         * @return bool
+         */
+        protected function isNotMyTranslation($translation) {
+            $isMatch = isset($translation['type'], $translation['slug'])
+                && ($translation['type'] === $this->translationType)
+                && ($translation['slug'] === $this->directoryName);
+
+            return !$isMatch;
+        }
+
+        /* -------------------------------------------------------------------
 		 * Fix directory name when installing updates
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Rename the update directory to match the existing plugin/theme directory.
-		 *
-		 * When WordPress installs a plugin or theme update, it assumes that the ZIP file will contain
-		 * exactly one directory, and that the directory name will be the same as the directory where
-		 * the plugin or theme is currently installed.
-		 *
-		 * GitHub and other repositories provide ZIP downloads, but they often use directory names like
-		 * "project-branch" or "project-tag-hash". We need to change the name to the actual plugin folder.
-		 *
-		 * This is a hook callback. Don't call it from a plugin.
-		 *
-		 * @access protected
-		 *
-		 * @param string $source The directory to copy to /wp-content/plugins or /wp-content/themes. Usually a subdirectory of $remoteSource.
-		 * @param string $remoteSource WordPress has extracted the update to this directory.
-		 * @param WP_Upgrader $upgrader
-		 * @return string|WP_Error
-		 */
-		public function fixDirectoryName($source, $remoteSource, $upgrader) {
-			global $wp_filesystem;
-			/** @var WP_Filesystem_Base $wp_filesystem */
-
-			//Basic sanity checks.
-			if ( !isset($source, $remoteSource, $upgrader, $upgrader->skin, $wp_filesystem) ) {
-				return $source;
-			}
-
-			//If WordPress is upgrading anything other than our plugin/theme, leave the directory name unchanged.
-			if ( !$this->isBeingUpgraded($upgrader) ) {
-				return $source;
-			}
-
-			//Rename the source to match the existing directory.
-			$correctedSource = trailingslashit($remoteSource) . $this->directoryName . '/';
-			if ( $source !== $correctedSource ) {
-				//The update archive should contain a single directory that contains the rest of plugin/theme files.
-				//Otherwise, WordPress will try to copy the entire working directory ($source == $remoteSource).
-				//We can't rename $remoteSource because that would break WordPress code that cleans up temporary files
-				//after update.
-				if ( $this->isBadDirectoryStructure($remoteSource) ) {
-					return new WP_Error(
-						'puc-incorrect-directory-structure',
-						sprintf(
-							'The directory structure of the update is incorrect. All files should be inside ' .
-							'a directory named <span class="code">%s</span>, not at the root of the ZIP archive.',
-							htmlentities($this->slug)
-						)
-					);
-				}
-
-				/** @var WP_Upgrader_Skin $upgrader ->skin */
-				$upgrader->skin->feedback(sprintf(
-					'Renaming %s to %s&#8230;',
-					'<span class="code">' . basename($source) . '</span>',
-					'<span class="code">' . $this->directoryName . '</span>'
-				));
-
-				if ( $wp_filesystem->move($source, $correctedSource, true) ) {
-					$upgrader->skin->feedback('Directory successfully renamed.');
-					return $correctedSource;
-				} else {
-					return new WP_Error(
-						'puc-rename-failed',
-						'Unable to rename the update to match the existing directory.'
-					);
-				}
-			}
-
-			return $source;
-		}
-
-		/**
-		 * Is there an update being installed right now, for this plugin or theme?
-		 *
-		 * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
-		 * @return bool
-		 */
-		abstract public function isBeingUpgraded($upgrader = null);
-
-		/**
-		 * Check for incorrect update directory structure. An update must contain a single directory,
-		 * all other files should be inside that directory.
-		 *
-		 * @param string $remoteSource Directory path.
-		 * @return bool
-		 */
-		protected function isBadDirectoryStructure($remoteSource) {
-			global $wp_filesystem;
-			/** @var WP_Filesystem_Base $wp_filesystem */
-
-			$sourceFiles = $wp_filesystem->dirlist($remoteSource);
-			if ( is_array($sourceFiles) ) {
-				$sourceFiles = array_keys($sourceFiles);
-				$firstFilePath = trailingslashit($remoteSource) . $sourceFiles[0];
-				return (count($sourceFiles) > 1) || (!$wp_filesystem->is_dir($firstFilePath));
-			}
-
-			//Assume it's fine.
-			return false;
-		}
-
-		/* -------------------------------------------------------------------
+        /**
+         * Rename the update directory to match the existing plugin/theme directory.
+         *
+         * When WordPress installs a plugin or theme update, it assumes that the ZIP file will contain
+         * exactly one directory, and that the directory name will be the same as the directory where
+         * the plugin or theme is currently installed.
+         *
+         * GitHub and other repositories provide ZIP downloads, but they often use directory names like
+         * "project-branch" or "project-tag-hash". We need to change the name to the actual plugin folder.
+         *
+         * This is a hook callback. Don't call it from a plugin.
+         *
+         * @access protected
+         *
+         * @param string $source The directory to copy to /wp-content/plugins or /wp-content/themes. Usually a subdirectory of $remoteSource.
+         * @param string $remoteSource WordPress has extracted the update to this directory.
+         * @param WP_Upgrader $upgrader
+         * @return string|WP_Error
+         */
+        public function fixDirectoryName($source, $remoteSource, $upgrader) {
+            global $wp_filesystem;
+            /** @var WP_Filesystem_Base $wp_filesystem */
+
+            //Basic sanity checks.
+            if ( !isset($source, $remoteSource, $upgrader, $upgrader->skin, $wp_filesystem) ) {
+                return $source;
+            }
+
+            //If WordPress is upgrading anything other than our plugin/theme, leave the directory name unchanged.
+            if ( !$this->isBeingUpgraded($upgrader) ) {
+                return $source;
+            }
+
+            //Rename the source to match the existing directory.
+            $correctedSource = trailingslashit($remoteSource) . $this->directoryName . '/';
+            if ( $source !== $correctedSource ) {
+                //The update archive should contain a single directory that contains the rest of plugin/theme files.
+                //Otherwise, WordPress will try to copy the entire working directory ($source == $remoteSource).
+                //We can't rename $remoteSource because that would break WordPress code that cleans up temporary files
+                //after update.
+                if ( $this->isBadDirectoryStructure($remoteSource) ) {
+                    return new WP_Error(
+                        'puc-incorrect-directory-structure',
+                        sprintf(
+                            'The directory structure of the update is incorrect. All files should be inside ' .
+                            'a directory named <span class="code">%s</span>, not at the root of the ZIP archive.',
+                            htmlentities($this->slug)
+                        )
+                    );
+                }
+
+                /** @var WP_Upgrader_Skin $upgrader ->skin */
+                $upgrader->skin->feedback(sprintf(
+                    'Renaming %s to %s&#8230;',
+                    '<span class="code">' . basename($source) . '</span>',
+                    '<span class="code">' . $this->directoryName . '</span>'
+                ));
+
+                if ( $wp_filesystem->move($source, $correctedSource, true) ) {
+                    $upgrader->skin->feedback('Directory successfully renamed.');
+                    return $correctedSource;
+                } else {
+                    return new WP_Error(
+                        'puc-rename-failed',
+                        'Unable to rename the update to match the existing directory.'
+                    );
+                }
+            }
+
+            return $source;
+        }
+
+        /**
+         * Is there an update being installed right now, for this plugin or theme?
+         *
+         * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
+         * @return bool
+         */
+        abstract public function isBeingUpgraded($upgrader = null);
+
+        /**
+         * Check for incorrect update directory structure. An update must contain a single directory,
+         * all other files should be inside that directory.
+         *
+         * @param string $remoteSource Directory path.
+         * @return bool
+         */
+        protected function isBadDirectoryStructure($remoteSource) {
+            global $wp_filesystem;
+            /** @var WP_Filesystem_Base $wp_filesystem */
+
+            $sourceFiles = $wp_filesystem->dirlist($remoteSource);
+            if ( is_array($sourceFiles) ) {
+                $sourceFiles = array_keys($sourceFiles);
+                $firstFilePath = trailingslashit($remoteSource) . $sourceFiles[0];
+                return (count($sourceFiles) > 1) || (!$wp_filesystem->is_dir($firstFilePath));
+            }
+
+            //Assume it's fine.
+            return false;
+        }
+
+        /* -------------------------------------------------------------------
 		 * File header parsing
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Parse plugin or theme metadata from the header comment.
-		 *
-		 * This is basically a simplified version of the get_file_data() function from /wp-includes/functions.php.
-		 * It's intended as a utility for subclasses that detect updates by parsing files in a VCS.
-		 *
-		 * @param string|null $content File contents.
-		 * @return string[]
-		 */
-		public function getFileHeader($content) {
-			$content = (string) $content;
-
-			//WordPress only looks at the first 8 KiB of the file, so we do the same.
-			$content = substr($content, 0, 8192);
-			//Normalize line endings.
-			$content = str_replace("\r", "\n", $content);
-
-			$headers = $this->getHeaderNames();
-			$results = array();
-			foreach ($headers as $field => $name) {
-				$success = preg_match('/^[ \t\/*#@]*' . preg_quote($name, '/') . ':(.*)$/mi', $content, $matches);
-
-				if ( ($success === 1) && $matches[1] ) {
-					$value = $matches[1];
-					if ( function_exists('_cleanup_header_comment') ) {
-						$value = _cleanup_header_comment($value);
-					}
-					$results[$field] = $value;
-				} else {
-					$results[$field] = '';
-				}
-			}
-
-			return $results;
-		}
-
-		/**
-		 * @return array Format: ['HeaderKey' => 'Header Name']
-		 */
-		abstract protected function getHeaderNames();
-
-		/* -------------------------------------------------------------------
+        /**
+         * Parse plugin or theme metadata from the header comment.
+         *
+         * This is basically a simplified version of the get_file_data() function from /wp-includes/functions.php.
+         * It's intended as a utility for subclasses that detect updates by parsing files in a VCS.
+         *
+         * @param string|null $content File contents.
+         * @return string[]
+         */
+        public function getFileHeader($content) {
+            $content = (string) $content;
+
+            //WordPress only looks at the first 8 KiB of the file, so we do the same.
+            $content = substr($content, 0, 8192);
+            //Normalize line endings.
+            $content = str_replace("\r", "\n", $content);
+
+            $headers = $this->getHeaderNames();
+            $results = array();
+            foreach ($headers as $field => $name) {
+                $success = preg_match('/^[ \t\/*#@]*' . preg_quote($name, '/') . ':(.*)$/mi', $content, $matches);
+
+                if ( ($success === 1) && $matches[1] ) {
+                    $value = $matches[1];
+                    if ( function_exists('_cleanup_header_comment') ) {
+                        $value = _cleanup_header_comment($value);
+                    }
+                    $results[$field] = $value;
+                } else {
+                    $results[$field] = '';
+                }
+            }
+
+            return $results;
+        }
+
+        /**
+         * @return array Format: ['HeaderKey' => 'Header Name']
+         */
+        abstract protected function getHeaderNames();
+
+        /* -------------------------------------------------------------------
 		 * DebugBar integration
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Initialize the update checker Debug Bar plugin/add-on thingy.
-		 */
-		public function maybeInitDebugBar() {
-			if ( class_exists('Debug_Bar', false) && file_exists(dirname(__FILE__ . '/DebugBar')) ) {
-				$this->createDebugBarExtension();
-			}
-		}
-
-		protected function createDebugBarExtension() {
-			return new Puc_v4p4_DebugBar_Extension($this);
-		}
-
-		/**
-		 * Display additional configuration details in the Debug Bar panel.
-		 *
-		 * @param Puc_v4p4_DebugBar_Panel $panel
-		 */
-		public function onDisplayConfiguration($panel) {
-			//Do nothing. Subclasses can use this to add additional info to the panel.
-		}
-
-	}
+        /**
+         * Initialize the update checker Debug Bar plugin/add-on thingy.
+         */
+        public function maybeInitDebugBar() {
+            if ( class_exists('Debug_Bar', false) && file_exists(dirname(__FILE__ . '/DebugBar')) ) {
+                $this->createDebugBarExtension();
+            }
+        }
+
+        protected function createDebugBarExtension() {
+            return new Puc_v4p4_DebugBar_Extension($this);
+        }
+
+        /**
+         * Display additional configuration details in the Debug Bar panel.
+         *
+         * @param Puc_v4p4_DebugBar_Panel $panel
+         */
+        public function onDisplayConfiguration($panel) {
+            //Do nothing. Subclasses can use this to add additional info to the panel.
+        }
+
+    }
 
 endif;

classes/external/php/plugin-update-checker/Puc/v4/Factory.php

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 if ( !class_exists('Puc_v4_Factory', false) ):
 
-	class Puc_v4_Factory extends Puc_v4p4_Factory { }
+    class Puc_v4_Factory extends Puc_v4p4_Factory { }
 
 endif;
\ No newline at end of file