Merge branch 'release/1.5.5'

maithemewp · Nov 27, 2023 · 13d09c4 · 13d09c4
2 parents 93cb558 + 0330c1a
commit 13d09c4
Show file tree

Hide file tree

Showing 49 changed files with 144 additions and 120 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.5.5 (11/27/23)
+* Changed: Updated the updater.
+* Changed: Updated character encoding function for PHP 8.2 compatibility.
+
 ## 1.5.4 (10/18/23)
 * Fixed: Styles missing in the editor when using TOC block.
 

diff --git a/classes/class-table-of-contents.php b/classes/class-table-of-contents.php
@@ -270,8 +270,9 @@ function get_data() {
 		// Modify state.
 		$libxml_previous_state = libxml_use_internal_errors( true );
 
-		// Encode.
-		$html = mb_convert_encoding( $this->content, 'HTML-ENTITIES', 'UTF-8' );
+		// Encode. Can't use `mb_convert_encoding()` because it's deprecated in PHP 8.2.
+		// @link https://stackoverflow.com/questions/8218230/php-domdocument-loadhtml-not-encoding-utf-8-correctly
+		$html = mb_encode_numericentity( $this->content, [0x80, 0x10FFFF, 0, ~0], 'UTF-8' );
 
 		// Load the content in the document HTML.
 		$dom->loadHTML( "<div>$html</div>" );

diff --git a/composer.lock b/composer.lock
diff --git a/mai-table-of-contents.php b/mai-table-of-contents.php
@@ -4,7 +4,7 @@
  * Plugin Name:     Mai Table of Contents
  * Plugin URI:      https://bizbudding.com/mai-design-pack/
  * Description:     Automatically create a table of contents from headings in your posts.
- * Version:         1.5.4
+ * Version:         1.5.5
  *
  * Author:          BizBudding
  * Author URI:      https://bizbudding.com
@@ -92,7 +92,7 @@ public function __wakeup() {
 	private function setup_constants() {
 		// Plugin version.
 		if ( ! defined( 'MAI_TABLE_OF_CONTENTS_VERSION' ) ) {
-			define( 'MAI_TABLE_OF_CONTENTS_VERSION', '1.5.4' );
+			define( 'MAI_TABLE_OF_CONTENTS_VERSION', '1.5.5' );
 		}
 
 		// Plugin Folder Path.

diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
@@ -6,5 +6,5 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    'efd9d646f43178e7ba3f07758c02ce1d' => $vendorDir . '/yahnis-elsts/plugin-update-checker/load-v5p2.php',
+    '45a16669595eb3c0a9e2994e57fc3188' => $vendorDir . '/yahnis-elsts/plugin-update-checker/load-v5p3.php',
 );
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -7,7 +7,7 @@
 class ComposerStaticInit1782162e12bcf11213202aa27e2616cd
 {
     public static $files = array (
-        'efd9d646f43178e7ba3f07758c02ce1d' => __DIR__ . '/..' . '/yahnis-elsts/plugin-update-checker/load-v5p2.php',
+        '45a16669595eb3c0a9e2994e57fc3188' => __DIR__ . '/..' . '/yahnis-elsts/plugin-update-checker/load-v5p3.php',
     );
 
     public static $classMap = array (

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -2,29 +2,29 @@
     "packages": [
         {
             "name": "yahnis-elsts/plugin-update-checker",
-            "version": "v5.2",
-            "version_normalized": "5.2.0.0",
+            "version": "v5.3",
+            "version_normalized": "5.3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/YahnisElsts/plugin-update-checker.git",
-                "reference": "5a270988c5f76bfdfbbb42cccc7c9627f7dd64d0"
+                "reference": "0b6bd7cd3286688ab680201aa6a7d8572c51ae1f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/YahnisElsts/plugin-update-checker/zipball/5a270988c5f76bfdfbbb42cccc7c9627f7dd64d0",
-                "reference": "5a270988c5f76bfdfbbb42cccc7c9627f7dd64d0",
+                "url": "https://api.github.com/repos/YahnisElsts/plugin-update-checker/zipball/0b6bd7cd3286688ab680201aa6a7d8572c51ae1f",
+                "reference": "0b6bd7cd3286688ab680201aa6a7d8572c51ae1f",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "php": ">=5.6.20"
             },
-            "time": "2023-08-17T12:44:32+00:00",
+            "time": "2023-11-09T08:34:00+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
                 "files": [
-                    "load-v5p2.php"
+                    "load-v5p3.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -49,7 +49,7 @@
             ],
             "support": {
                 "issues": "https://github.com/YahnisElsts/plugin-update-checker/issues",
-                "source": "https://github.com/YahnisElsts/plugin-update-checker/tree/v5.2"
+                "source": "https://github.com/YahnisElsts/plugin-update-checker/tree/v5.3"
             },
             "install-path": "../yahnis-elsts/plugin-update-checker"
         }

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-develop',
         'version' => 'dev-develop',
-        'reference' => '8630a81cb04dd13343bc8135de13c434933a6006',
+        'reference' => '31929455f5b1939fa21e10e8080407e4546472b5',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,16 +13,16 @@
         '__root__' => array(
             'pretty_version' => 'dev-develop',
             'version' => 'dev-develop',
-            'reference' => '8630a81cb04dd13343bc8135de13c434933a6006',
+            'reference' => '31929455f5b1939fa21e10e8080407e4546472b5',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'yahnis-elsts/plugin-update-checker' => array(
-            'pretty_version' => 'v5.2',
-            'version' => '5.2.0.0',
-            'reference' => '5a270988c5f76bfdfbbb42cccc7c9627f7dd64d0',
+            'pretty_version' => 'v5.3',
+            'version' => '5.3.0.0',
+            'reference' => '0b6bd7cd3286688ab680201aa6a7d8572c51ae1f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../yahnis-elsts/plugin-update-checker',
             'aliases' => array(),

diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v5/PucFactory.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5/PucFactory.php
@@ -4,7 +4,7 @@
 
 if ( !class_exists(PucFactory::class, false) ):
 
-	class PucFactory extends \YahnisElsts\PluginUpdateChecker\v5p2\PucFactory {
+	class PucFactory extends \YahnisElsts\PluginUpdateChecker\v5p3\PucFactory {
 	}
 
 endif;
diff --git a/...in-update-checker/Puc/v5p2/Autoloader.php → ...in-update-checker/Puc/v5p3/Autoloader.php b/...in-update-checker/Puc/v5p2/Autoloader.php → ...in-update-checker/Puc/v5p3/Autoloader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p2;
+namespace YahnisElsts\PluginUpdateChecker\v5p3;
 
 if ( !class_exists(Autoloader::class, false) ):
 

diff --git a/...e-checker/Puc/v5p2/DebugBar/Extension.php → ...e-checker/Puc/v5p3/DebugBar/Extension.php b/...e-checker/Puc/v5p2/DebugBar/Extension.php → ...e-checker/Puc/v5p3/DebugBar/Extension.php
@@ -1,8 +1,8 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p2\DebugBar;
+namespace YahnisElsts\PluginUpdateChecker\v5p3\DebugBar;
 
-use YahnisElsts\PluginUpdateChecker\v5p2\PucFactory;
-use YahnisElsts\PluginUpdateChecker\v5p2\UpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p3\PucFactory;
+use YahnisElsts\PluginUpdateChecker\v5p3\UpdateChecker;
 
 if ( !class_exists(Extension::class, false) ):
 

diff --git a/...pdate-checker/Puc/v5p2/DebugBar/Panel.php → ...pdate-checker/Puc/v5p3/DebugBar/Panel.php b/...pdate-checker/Puc/v5p2/DebugBar/Panel.php → ...pdate-checker/Puc/v5p3/DebugBar/Panel.php
@@ -1,7 +1,7 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p2\DebugBar;
+namespace YahnisElsts\PluginUpdateChecker\v5p3\DebugBar;
 
-use YahnisElsts\PluginUpdateChecker\v5p2\UpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p3\UpdateChecker;
 
 if ( !class_exists(Panel::class, false) && class_exists('Debug_Bar_Panel', false) ):
 

diff --git a/...ker/Puc/v5p2/DebugBar/PluginExtension.php → ...ker/Puc/v5p3/DebugBar/PluginExtension.php b/...ker/Puc/v5p2/DebugBar/PluginExtension.php → ...ker/Puc/v5p3/DebugBar/PluginExtension.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p2\DebugBar;
+namespace YahnisElsts\PluginUpdateChecker\v5p3\DebugBar;
 
-use YahnisElsts\PluginUpdateChecker\v5p2\Plugin\UpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p3\Plugin\UpdateChecker;
 
 if ( !class_exists(PluginExtension::class, false) ):
 

diff --git a/...checker/Puc/v5p2/DebugBar/PluginPanel.php → ...checker/Puc/v5p3/DebugBar/PluginPanel.php b/...checker/Puc/v5p2/DebugBar/PluginPanel.php → ...checker/Puc/v5p3/DebugBar/PluginPanel.php
@@ -1,7 +1,7 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p2\DebugBar;
+namespace YahnisElsts\PluginUpdateChecker\v5p3\DebugBar;
 
-use YahnisElsts\PluginUpdateChecker\v5p2\Plugin\UpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p3\Plugin\UpdateChecker;
 
 if ( !class_exists(PluginPanel::class, false) ):
 

diff --git a/...-checker/Puc/v5p2/DebugBar/ThemePanel.php → ...-checker/Puc/v5p3/DebugBar/ThemePanel.php b/...-checker/Puc/v5p2/DebugBar/ThemePanel.php → ...-checker/Puc/v5p3/DebugBar/ThemePanel.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p2\DebugBar;
+namespace YahnisElsts\PluginUpdateChecker\v5p3\DebugBar;
 
-use YahnisElsts\PluginUpdateChecker\v5p2\Theme\UpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p3\Theme\UpdateChecker;
 
 if ( !class_exists(ThemePanel::class, false) ):
 

diff --git a/...ate-checker/Puc/v5p2/InstalledPackage.php → ...ate-checker/Puc/v5p3/InstalledPackage.php b/...ate-checker/Puc/v5p2/InstalledPackage.php → ...ate-checker/Puc/v5p3/InstalledPackage.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p2;
+namespace YahnisElsts\PluginUpdateChecker\v5p3;
 
 if ( !class_exists(InstalledPackage::class, false) ):
 

diff --git a/...ugin-update-checker/Puc/v5p2/Metadata.php → ...ugin-update-checker/Puc/v5p3/Metadata.php b/...ugin-update-checker/Puc/v5p2/Metadata.php → ...ugin-update-checker/Puc/v5p3/Metadata.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p2;
+namespace YahnisElsts\PluginUpdateChecker\v5p3;
 
 use LogicException;
 use stdClass;

diff --git a/...pdate-checker/Puc/v5p2/OAuthSignature.php → ...pdate-checker/Puc/v5p3/OAuthSignature.php b/...pdate-checker/Puc/v5p2/OAuthSignature.php → ...pdate-checker/Puc/v5p3/OAuthSignature.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p2;
+namespace YahnisElsts\PluginUpdateChecker\v5p3;
 
 if ( !class_exists(OAuthSignature::class, false) ):
 

diff --git a/...pdate-checker/Puc/v5p2/Plugin/Package.php → ...pdate-checker/Puc/v5p3/Plugin/Package.php b/...pdate-checker/Puc/v5p2/Plugin/Package.php → ...pdate-checker/Puc/v5p3/Plugin/Package.php
@@ -1,8 +1,8 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p2\Plugin;
+namespace YahnisElsts\PluginUpdateChecker\v5p3\Plugin;
 
-use YahnisElsts\PluginUpdateChecker\v5p2\InstalledPackage;
-use YahnisElsts\PluginUpdateChecker\v5p2\PucFactory;
+use YahnisElsts\PluginUpdateChecker\v5p3\InstalledPackage;
+use YahnisElsts\PluginUpdateChecker\v5p3\PucFactory;
 
 if ( !class_exists(Package::class, false) ):
 

diff --git a/...te-checker/Puc/v5p2/Plugin/PluginInfo.php → ...te-checker/Puc/v5p3/Plugin/PluginInfo.php b/...te-checker/Puc/v5p2/Plugin/PluginInfo.php → ...te-checker/Puc/v5p3/Plugin/PluginInfo.php
@@ -1,7 +1,7 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p2\Plugin;
+namespace YahnisElsts\PluginUpdateChecker\v5p3\Plugin;
 
-use YahnisElsts\PluginUpdateChecker\v5p2\Metadata;
+use YahnisElsts\PluginUpdateChecker\v5p3\Metadata;
 
 if ( !class_exists(PluginInfo::class, false) ):
 

diff --git a/...gin-update-checker/Puc/v5p2/Plugin/Ui.php → ...gin-update-checker/Puc/v5p3/Plugin/Ui.php b/...gin-update-checker/Puc/v5p2/Plugin/Ui.php → ...gin-update-checker/Puc/v5p3/Plugin/Ui.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p2\Plugin;
+namespace YahnisElsts\PluginUpdateChecker\v5p3\Plugin;
 
 if ( !class_exists('Ui', false) ):
 	/**

diff --git a/...update-checker/Puc/v5p2/Plugin/Update.php → ...update-checker/Puc/v5p3/Plugin/Update.php b/...update-checker/Puc/v5p2/Plugin/Update.php → ...update-checker/Puc/v5p3/Plugin/Update.php
@@ -1,7 +1,7 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p2\Plugin;
+namespace YahnisElsts\PluginUpdateChecker\v5p3\Plugin;
 
-use YahnisElsts\PluginUpdateChecker\v5p2\Update as BaseUpdate;
+use YahnisElsts\PluginUpdateChecker\v5p3\Update as BaseUpdate;
 
 if ( !class_exists(Update::class, false) ):
 

diff --git a/...checker/Puc/v5p2/Plugin/UpdateChecker.php → ...checker/Puc/v5p3/Plugin/UpdateChecker.php b/...checker/Puc/v5p2/Plugin/UpdateChecker.php → ...checker/Puc/v5p3/Plugin/UpdateChecker.php
@@ -1,10 +1,10 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p2\Plugin;
+namespace YahnisElsts\PluginUpdateChecker\v5p3\Plugin;
 
-use YahnisElsts\PluginUpdateChecker\v5p2\InstalledPackage;
-use YahnisElsts\PluginUpdateChecker\v5p2\UpdateChecker as BaseUpdateChecker;
-use YahnisElsts\PluginUpdateChecker\v5p2\Scheduler;
-use YahnisElsts\PluginUpdateChecker\v5p2\DebugBar;
+use YahnisElsts\PluginUpdateChecker\v5p3\InstalledPackage;
+use YahnisElsts\PluginUpdateChecker\v5p3\UpdateChecker as BaseUpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p3\Scheduler;
+use YahnisElsts\PluginUpdateChecker\v5p3\DebugBar;
 
 if ( !class_exists(UpdateChecker::class, false) ):
 

diff --git a/...in-update-checker/Puc/v5p2/PucFactory.php → ...in-update-checker/Puc/v5p3/PucFactory.php b/...in-update-checker/Puc/v5p2/PucFactory.php → ...in-update-checker/Puc/v5p3/PucFactory.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p2;
+namespace YahnisElsts\PluginUpdateChecker\v5p3;
 
-use YahnisElsts\PluginUpdateChecker\v5p2\Plugin;
-use YahnisElsts\PluginUpdateChecker\v5p2\Theme;
-use YahnisElsts\PluginUpdateChecker\v5p2\Vcs;
+use YahnisElsts\PluginUpdateChecker\v5p3\Plugin;
+use YahnisElsts\PluginUpdateChecker\v5p3\Theme;
+use YahnisElsts\PluginUpdateChecker\v5p3\Vcs;
 
 if ( !class_exists(PucFactory::class, false) ):
 
@@ -147,7 +147,7 @@ public static function buildUpdateChecker($metadataUrl, $fullPath, $slug = '', $
 		 *
 		 * Normalize a filesystem path. Introduced in WP 3.9.
 		 * Copying here allows use of the class on earlier versions.
-		 * This version adapted from WP 4.8.2 (unchanged since 4.5.2)
+		 * This version adapted from WP 4.8.2 (unchanged since 4.5.3)
 		 *
 		 * @param string $path Path to normalize.
 		 * @return string Normalized path.

diff --git a/...gin-update-checker/Puc/v5p2/Scheduler.php → ...gin-update-checker/Puc/v5p3/Scheduler.php b/...gin-update-checker/Puc/v5p2/Scheduler.php → ...gin-update-checker/Puc/v5p3/Scheduler.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p2;
+namespace YahnisElsts\PluginUpdateChecker\v5p3;
 
 if ( !class_exists(Scheduler::class, false) ):
 
@@ -210,7 +210,7 @@ protected function getEffectiveCheckPeriod() {
 				//Check less frequently if it's already known that an update is available.
 				$period = $this->throttledCheckPeriod * 3600;
 			} else if ( defined('DOING_CRON') && constant('DOING_CRON') ) {
-				//WordPress cron schedules are not exact, so lets do an update check even
+				//WordPress cron schedules are not exact, so let's do an update check even
 				//if slightly less than $checkPeriod hours have elapsed since the last check.
 				$cronFuzziness = 20 * 60;
 				$period = $this->checkPeriod * 3600 - $cronFuzziness;

diff --git a/...in-update-checker/Puc/v5p2/StateStore.php → ...in-update-checker/Puc/v5p3/StateStore.php b/...in-update-checker/Puc/v5p2/StateStore.php → ...in-update-checker/Puc/v5p3/StateStore.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p2;
+namespace YahnisElsts\PluginUpdateChecker\v5p3;
 
 if ( !class_exists(StateStore::class, false) ):
 

diff --git a/...update-checker/Puc/v5p2/Theme/Package.php → ...update-checker/Puc/v5p3/Theme/Package.php b/...update-checker/Puc/v5p2/Theme/Package.php → ...update-checker/Puc/v5p3/Theme/Package.php
@@ -1,7 +1,7 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p2\Theme;
+namespace YahnisElsts\PluginUpdateChecker\v5p3\Theme;
 
-use YahnisElsts\PluginUpdateChecker\v5p2\InstalledPackage;
+use YahnisElsts\PluginUpdateChecker\v5p3\InstalledPackage;
 
 if ( !class_exists(Package::class, false) ):
 

diff --git a/...-update-checker/Puc/v5p2/Theme/Update.php → ...-update-checker/Puc/v5p3/Theme/Update.php b/...-update-checker/Puc/v5p2/Theme/Update.php → ...-update-checker/Puc/v5p3/Theme/Update.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p2\Theme;
+namespace YahnisElsts\PluginUpdateChecker\v5p3\Theme;
 
-use YahnisElsts\PluginUpdateChecker\v5p2\Update as BaseUpdate;
+use YahnisElsts\PluginUpdateChecker\v5p3\Update as BaseUpdate;
 
 if ( !class_exists(Update::class, false) ):