Merge pull request #13 from bootscore/Update-plugin-checker-5.2

Update plugin checker 5.2

update/.gitattributes

@@ -0,0 +1 @@
+/build export-ignore

update/.gitignore

@@ -0,0 +1,40 @@
+# Created by .ignore support plugin (hsz.mobi)
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# The entire IDEA/PhpStorm directory
+.idea/
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser

update/Puc/v5/PucFactory.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace YahnisElsts\PluginUpdateChecker\v5;
+
+if ( !class_exists(PucFactory::class, false) ):
+
+	class PucFactory extends \YahnisElsts\PluginUpdateChecker\v5p2\PucFactory {
+	}
+
+endif;

update/Puc/v5p2/Autoloader.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace YahnisElsts\PluginUpdateChecker\v5p2;
+
+if ( !class_exists(Autoloader::class, false) ):
+
+	class Autoloader {
+		const DEFAULT_NS_PREFIX = 'YahnisElsts\\PluginUpdateChecker\\';
+
+		private $prefix;
+		private $rootDir;
+		private $libraryDir;
+
+		private $staticMap;
+
+		public function __construct() {
+			$this->rootDir = dirname(__FILE__) . '/';
+
+			$namespaceWithSlash = __NAMESPACE__ . '\\';
+			$this->prefix = $namespaceWithSlash;
+
+			$this->libraryDir = $this->rootDir . '../..';
+			if ( !self::isPhar() ) {
+				$this->libraryDir = realpath($this->libraryDir);
+			}
+			$this->libraryDir = $this->libraryDir . '/';
+
+			//Usually, dependencies like Parsedown are in the global namespace,
+			//but if someone adds a custom namespace to the entire library, they
+			//will be in the same namespace as this class.
+			$isCustomNamespace = (
+				substr($namespaceWithSlash, 0, strlen(self::DEFAULT_NS_PREFIX)) !== self::DEFAULT_NS_PREFIX
+			);
+			$libraryPrefix = $isCustomNamespace ? $namespaceWithSlash : '';
+
+			$this->staticMap = array(
+				$libraryPrefix . 'PucReadmeParser' => 'vendor/PucReadmeParser.php',
+				$libraryPrefix . 'Parsedown'       => 'vendor/Parsedown.php',
+			);
+
+			//Add the generic, major-version-only factory class to the static map.
+			$versionSeparatorPos = strrpos(__NAMESPACE__, '\\v');
+			if ( $versionSeparatorPos !== false ) {
+				$versionSegment = substr(__NAMESPACE__, $versionSeparatorPos + 1);
+				$pointPos = strpos($versionSegment, 'p');
+				if ( ($pointPos !== false) && ($pointPos > 1) ) {
+					$majorVersionSegment = substr($versionSegment, 0, $pointPos);
+					$majorVersionNs = __NAMESPACE__ . '\\' . $majorVersionSegment;
+					$this->staticMap[$majorVersionNs . '\\PucFactory'] =
+						'Puc/' . $majorVersionSegment . '/Factory.php';
+				}
+			}
+
+			spl_autoload_register(array($this, 'autoload'));
+		}
+
+		/**
+		 * Determine if this file is running as part of a Phar archive.
+		 *
+		 * @return bool
+		 */
+		private static function isPhar() {
+			//Check if the current file path starts with "phar://".
+			static $pharProtocol = 'phar://';
+			return (substr(__FILE__, 0, strlen($pharProtocol)) === $pharProtocol);
+		}
+
+		public function autoload($className) {
+			if ( isset($this->staticMap[$className]) && file_exists($this->libraryDir . $this->staticMap[$className]) ) {
+				include($this->libraryDir . $this->staticMap[$className]);
+				return;
+			}
+
+			if ( strpos($className, $this->prefix) === 0 ) {
+				$path = substr($className, strlen($this->prefix));
+				$path = str_replace(array('_', '\\'), '/', $path);
+				$path = $this->rootDir . $path . '.php';
+
+				if ( file_exists($path) ) {
+					include $path;
+				}
+			}
+		}
+	}
+
+endif;

update/Puc/v4p11/DebugBar/Extension.php → update/Puc/v5p2/DebugBar/Extension.php

@@ -1,27 +1,32 @@
 <?php
-if ( !class_exists('Puc_v4p11_DebugBar_Extension', false) ):
+namespace YahnisElsts\PluginUpdateChecker\v5p2\DebugBar;
 
-	class Puc_v4p11_DebugBar_Extension {
+use YahnisElsts\PluginUpdateChecker\v5p2\PucFactory;
+use YahnisElsts\PluginUpdateChecker\v5p2\UpdateChecker;
+
+if ( !class_exists(Extension::class, false) ):
+
+	class Extension {
 		const RESPONSE_BODY_LENGTH_LIMIT = 4000;
 
-		/** @var Puc_v4p11_UpdateChecker */
+		/** @var UpdateChecker */
 		protected $updateChecker;
-		protected $panelClass = 'Puc_v4p11_DebugBar_Panel';
+		protected $panelClass = Panel::class;
 
 		public function __construct($updateChecker, $panelClass = null) {
 			$this->updateChecker = $updateChecker;
 			if ( isset($panelClass) ) {
 				$this->panelClass = $panelClass;
 			}
 
-			if ( version_compare(PHP_VERSION, '5.3', '>=') && (strpos($this->panelClass, '\\') === false) ) {
+			if ( (strpos($this->panelClass, '\\') === false) ) {
 				$this->panelClass = __NAMESPACE__ . '\\' . $this->panelClass;
 			}
 
 			add_filter('debug_bar_panels', array($this, 'addDebugBarPanel'));
 			add_action('debug_bar_enqueue_scripts', array($this, 'enqueuePanelDependencies'));
 
-			add_action('wp_ajax_puc_v4_debug_check_now', array($this, 'ajaxCheckNow'));
+			add_action('wp_ajax_puc_v5_debug_check_now', array($this, 'ajaxCheckNow'));
 		}
 
 		/**
@@ -42,17 +47,17 @@ public function addDebugBarPanel($panels) {
 		 */
 		public function enqueuePanelDependencies() {
 			wp_enqueue_style(
-				'puc-debug-bar-style-v4',
+				'puc-debug-bar-style-v5',
 				$this->getLibraryUrl("/css/puc-debug-bar.css"),
 				array('debug-bar'),
-				'20171124'
+				'20221008'
 			);
 
 			wp_enqueue_script(
-				'puc-debug-bar-js-v4',
+				'puc-debug-bar-js-v5',
 				$this->getLibraryUrl("/js/debug-bar.js"),
 				array('jquery'),
-				'20201209'
+				'20221008'
 			);
 		}
 
@@ -61,14 +66,16 @@ public function enqueuePanelDependencies() {
 		 * the update checking process works as expected.
 		 */
 		public function ajaxCheckNow() {
-			if ( $_POST['uid'] !== $this->updateChecker->getUniqueName('uid') ) {
+			//phpcs:ignore WordPress.Security.NonceVerification.Missing -- Nonce is checked in preAjaxRequest().
+			if ( !isset($_POST['uid']) || ($_POST['uid'] !== $this->updateChecker->getUniqueName('uid')) ) {
 				return;
 			}
 			$this->preAjaxRequest();
 			$update = $this->updateChecker->checkForUpdates();
 			if ( $update !== null ) {
 				echo "An update is available:";
-				echo '<pre>', htmlentities(print_r($update, true)), '</pre>';
+				//phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r -- For debugging output.
+				echo '<pre>', esc_html(print_r($update, true)), '</pre>';
 			} else {
 				echo 'No updates found.';
 			}
@@ -79,8 +86,8 @@ public function ajaxCheckNow() {
 
 				foreach (array_values($errors) as $num => $item) {
 					$wpError = $item['error'];
-					/** @var WP_Error $wpError */
-					printf('<h4>%d) %s</h4>', $num + 1, esc_html($wpError->get_error_message()));
+					/** @var \WP_Error $wpError */
+					printf('<h4>%d) %s</h4>', intval($num + 1), esc_html($wpError->get_error_message()));
 
 					echo '<dl>';
 					printf('<dt>Error code:</dt><dd><code>%s</code></dd>', esc_html($wpError->get_error_code()));
@@ -92,7 +99,7 @@ public function ajaxCheckNow() {
 					if ( isset($item['httpResponse']) ) {
 						if ( is_wp_error($item['httpResponse']) ) {
 							$httpError = $item['httpResponse'];
-							/** @var WP_Error $httpError */
+							/** @var \WP_Error $httpError */
 							printf(
 								'<dt>WordPress HTTP API error:</dt><dd>%s (<code>%s</code>)</dd>',
 								esc_html($httpError->get_error_message()),
@@ -102,8 +109,8 @@ public function ajaxCheckNow() {
 							//Status code.
 							printf(
 								'<dt>HTTP status:</dt><dd><code>%d %s</code></dd>',
-								wp_remote_retrieve_response_code($item['httpResponse']),
-								wp_remote_retrieve_response_message($item['httpResponse'])
+								esc_html(wp_remote_retrieve_response_code($item['httpResponse'])),
+								esc_html(wp_remote_retrieve_response_message($item['httpResponse']))
 							);
 
 							//Headers.
@@ -142,7 +149,9 @@ protected function preAjaxRequest() {
 			}
 			check_ajax_referer('puc-ajax');
 
+			//phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.runtime_configuration_error_reporting -- Part of a debugging feature.
 			error_reporting(E_ALL);
+			//phpcs:ignore WordPress.PHP.IniSet.display_errors_Blacklisted
 			@ini_set('display_errors', 'On');
 		}
 
@@ -152,7 +161,7 @@ protected function preAjaxRequest() {
 		public function removeHooks() {
 			remove_filter('debug_bar_panels', array($this, 'addDebugBarPanel'));
 			remove_action('debug_bar_enqueue_scripts', array($this, 'enqueuePanelDependencies'));
-			remove_action('wp_ajax_puc_v4_debug_check_now', array($this, 'ajaxCheckNow'));
+			remove_action('wp_ajax_puc_v5_debug_check_now', array($this, 'ajaxCheckNow'));
 		}
 
 		/**
@@ -163,11 +172,11 @@ private function getLibraryUrl($filePath) {
 			$absolutePath = realpath(dirname(__FILE__) . '/../../../' . ltrim($filePath, '/'));
 
 			//Where is the library located inside the WordPress directory structure?
-			$absolutePath = Puc_v4p11_Factory::normalizePath($absolutePath);
+			$absolutePath = PucFactory::normalizePath($absolutePath);
 
-			$pluginDir = Puc_v4p11_Factory::normalizePath(WP_PLUGIN_DIR);
-			$muPluginDir = Puc_v4p11_Factory::normalizePath(WPMU_PLUGIN_DIR);
-			$themeDir = Puc_v4p11_Factory::normalizePath(get_theme_root());
+			$pluginDir = PucFactory::normalizePath(WP_PLUGIN_DIR);
+			$muPluginDir = PucFactory::normalizePath(WPMU_PLUGIN_DIR);
+			$themeDir = PucFactory::normalizePath(get_theme_root());
 
 			if ( (strpos($absolutePath, $pluginDir) === 0) || (strpos($absolutePath, $muPluginDir) === 0) ) {
 				//It's part of a plugin.