Merge pull request #1124 from 10up/feature/update-plugin-checker

Update `yahnis-elsts/plugin-update-checker` from 4.13 to 5.1

.editorconfig

@@ -10,3 +10,6 @@ indent_size = 4
 [*.{json,yml,md}]
 indent_style = space
 indent_size = 2
+
+[{*.txt,wp-config-sample.php}]
+end_of_line = crlf

.gitattributes

@@ -2,3 +2,11 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.wordpress-version-checker.json export-ignore
+
+# Text files should have LF line endings.
+* text eol=lf
+
+# Binary files should not be modified.
+*.mo binary
+*.png binary
+*.jpg binary

composer.json

@@ -12,7 +12,7 @@
   ],
   "require": {
     "php": ">=7.4",
-    "yahnis-elsts/plugin-update-checker": "4.13",
+    "yahnis-elsts/plugin-update-checker": "5.1",
     "ext-json": "*"
   },
   "autoload": {

includes/bootstrap.php

@@ -12,6 +12,8 @@
 
 namespace Distributor;
 
+use YahnisElsts\PluginUpdateChecker\v5\PucFactory;
+
 /**
  * PSR-4 autoloading
  */
@@ -130,7 +132,7 @@ function() {
 	}
 );
 
-if ( class_exists( '\\Puc_v4_Factory' ) ) {
+if ( class_exists( '\\YahnisElsts\PluginUpdateChecker\v5\PucFactory' ) ) {
 	/**
 	 * Enable updates if we have a valid license
 	 */
@@ -144,7 +146,7 @@ function() {
 
 	if ( $valid_license ) {
 		// @codingStandardsIgnoreStart
-		$updateChecker = \Puc_v4_Factory::buildUpdateChecker(
+		$updateChecker = PucFactory::buildUpdateChecker(
 			'https://github.com/10up/distributor/',
 			DT_PLUGIN_FULL_FILE,
 			'distributor'
@@ -174,7 +176,9 @@ function( $transient ) use ( $updateChecker ) {
 					$update = $updateChecker->getUpdateState()->getUpdate();
 					// Adding the plugin info to the `no_update` property is required
 					// for the enable/disable auto-updates links to correctly appear in UI.
-					$transient->no_update[ $update->filename ] = $update;
+					if ( $update ) {
+						$transient->no_update[ $update->filename ] = $update;
+					}
 				}
 
 				return $transient;

vendor/yahnis-elsts/plugin-update-checker/.gitattributes

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

vendor/yahnis-elsts/plugin-update-checker/Puc/v5/PucFactory.php

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

vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Autoloader.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace YahnisElsts\PluginUpdateChecker\v5p1;
+
+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;