Merge branch 'release/1.5.2'

maithemewp · Jun 28, 2023 · f95be39 · f95be39
2 parents f7c341d + 23831f8
commit f95be39
Show file tree

Hide file tree

Showing 55 changed files with 660 additions and 360 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.5.2 (6/28/23)
+* Changed: Update the updater.
+* Fixed: TOC block and shortcode not respecting the minimum headings count.
+
 ## 1.5.1 (5/5/23)
 * Fixed: Missing content on some post types when a TOC is not present.
 

diff --git a/classes/class-table-of-contents.php b/classes/class-table-of-contents.php
@@ -149,7 +149,7 @@ function get_toc() {
 		}
 
 		// Bail if not enough h2s.
-		if ( count( $this->data['matches'] ) < absint( $this->args['headings'] ) ) {
+		if ( count( $this->data['matches'] ) < $this->args['headings'] ) {
 			return $cache[ $this->post_id ];
 		}
 
@@ -323,8 +323,8 @@ function get_data() {
 			}
 		}
 
-		// If we have at least 3 h2 headings.
-		if ( count( $data['matches'] ) > 2 ) {
+		// If we have the minimum h2 headings.
+		if ( count( $data['matches'] ) >= $this->args['headings'] ) {
 			// Store TOC in new content.
 			$data['content'] = $dom->saveHTML();
 		}

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.1
+ * Version:         1.5.2
  *
  * 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.1' );
+			define( 'MAI_TABLE_OF_CONTENTS_VERSION', '1.5.2' );
 		}
 
 		// 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(
-    '5ff2501974ebd86c0be698ddfca6451e' => $vendorDir . '/yahnis-elsts/plugin-update-checker/load-v5p0.php',
+    '9b77ddcfb14408a32f5aaf74e0a11694' => $vendorDir . '/yahnis-elsts/plugin-update-checker/load-v5p1.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 (
-        '5ff2501974ebd86c0be698ddfca6451e' => __DIR__ . '/..' . '/yahnis-elsts/plugin-update-checker/load-v5p0.php',
+        '9b77ddcfb14408a32f5aaf74e0a11694' => __DIR__ . '/..' . '/yahnis-elsts/plugin-update-checker/load-v5p1.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.0",
-            "version_normalized": "5.0.0.0",
+            "version": "v5.1",
+            "version_normalized": "5.1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/YahnisElsts/plugin-update-checker.git",
-                "reference": "81be284da76f12c8751b477b2a0fa44364d26f84"
+                "reference": "48b03e93c9c2587f9276dce00ce2b6d94c1190d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/YahnisElsts/plugin-update-checker/zipball/81be284da76f12c8751b477b2a0fa44364d26f84",
-                "reference": "81be284da76f12c8751b477b2a0fa44364d26f84",
+                "url": "https://api.github.com/repos/YahnisElsts/plugin-update-checker/zipball/48b03e93c9c2587f9276dce00ce2b6d94c1190d2",
+                "reference": "48b03e93c9c2587f9276dce00ce2b6d94c1190d2",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "php": ">=5.6.20"
             },
-            "time": "2022-10-28T17:46:32+00:00",
+            "time": "2023-05-20T11:55:43+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
                 "files": [
-                    "load-v5p0.php"
+                    "load-v5p1.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.0"
+                "source": "https://github.com/YahnisElsts/plugin-update-checker/tree/v5.1"
             },
             "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' => 'f4e7890d7d94bd0593a31b7604d7dc8e38b8a3e6',
+        'reference' => 'd85d6f58ef5e011135e6e304f79b2527c17c2935',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,16 +13,16 @@
         '__root__' => array(
             'pretty_version' => 'dev-develop',
             'version' => 'dev-develop',
-            'reference' => 'f4e7890d7d94bd0593a31b7604d7dc8e38b8a3e6',
+            'reference' => 'd85d6f58ef5e011135e6e304f79b2527c17c2935',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'yahnis-elsts/plugin-update-checker' => array(
-            'pretty_version' => 'v5.0',
-            'version' => '5.0.0.0',
-            'reference' => '81be284da76f12c8751b477b2a0fa44364d26f84',
+            'pretty_version' => 'v5.1',
+            'version' => '5.1.0.0',
+            'reference' => '48b03e93c9c2587f9276dce00ce2b6d94c1190d2',
             'type' => 'library',
             'install_path' => __DIR__ . '/../yahnis-elsts/plugin-update-checker',
             'aliases' => array(),

diff --git a/vendor/yahnis-elsts/plugin-update-checker/.gitattributes b/vendor/yahnis-elsts/plugin-update-checker/.gitattributes
@@ -0,0 +1 @@
+/build export-ignore
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\v5p0\PucFactory {
+	class PucFactory extends \YahnisElsts\PluginUpdateChecker\v5p1\PucFactory {
 	}
 
 endif;
diff --git a/...in-update-checker/Puc/v5p0/Autoloader.php → ...in-update-checker/Puc/v5p1/Autoloader.php b/...in-update-checker/Puc/v5p0/Autoloader.php → ...in-update-checker/Puc/v5p1/Autoloader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p0;
+namespace YahnisElsts\PluginUpdateChecker\v5p1;
 
 if ( !class_exists(Autoloader::class, false) ):
 

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

diff --git a/...pdate-checker/Puc/v5p0/DebugBar/Panel.php → ...pdate-checker/Puc/v5p1/DebugBar/Panel.php b/...pdate-checker/Puc/v5p0/DebugBar/Panel.php → ...pdate-checker/Puc/v5p1/DebugBar/Panel.php
@@ -1,7 +1,7 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p0\DebugBar;
+namespace YahnisElsts\PluginUpdateChecker\v5p1\DebugBar;
 
-use YahnisElsts\PluginUpdateChecker\v5p0\UpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p1\UpdateChecker;
 
 if ( !class_exists(Panel::class, false) && class_exists('Debug_Bar_Panel', false) ):
 
@@ -160,11 +160,18 @@ private function formatTimestamp($unixTime) {
 
 		public function row($name, $value) {
 			if ( is_object($value) || is_array($value) ) {
+				//This is specifically for debugging, so print_r() is fine.
+				//phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r
 				$value = '<pre>' . htmlentities(print_r($value, true)) . '</pre>';
 			} else if ($value === null) {
 				$value = '<code>null</code>';
 			}
-			printf('<tr><th scope="row">%1$s</th> <td>%2$s</td></tr>', $name, $value);
+			printf(
+				'<tr><th scope="row">%1$s</th> <td>%2$s</td></tr>',
+				esc_html($name),
+				//phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Escaped above.
+				$value
+			);
 		}
 	}
 

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

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

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

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

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

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

diff --git a/...pdate-checker/Puc/v5p0/Plugin/Package.php → ...pdate-checker/Puc/v5p1/Plugin/Package.php b/...pdate-checker/Puc/v5p0/Plugin/Package.php → ...pdate-checker/Puc/v5p1/Plugin/Package.php
@@ -1,8 +1,8 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p0\Plugin;
+namespace YahnisElsts\PluginUpdateChecker\v5p1\Plugin;
 
-use YahnisElsts\PluginUpdateChecker\v5p0\InstalledPackage;
-use YahnisElsts\PluginUpdateChecker\v5p0\PucFactory;
+use YahnisElsts\PluginUpdateChecker\v5p1\InstalledPackage;
+use YahnisElsts\PluginUpdateChecker\v5p1\PucFactory;
 
 if ( !class_exists(Package::class, false) ):
 
@@ -51,7 +51,7 @@ public function getInstalledVersion() {
 				//This can happen if the filename points to something that is not a plugin.
 				$this->updateChecker->triggerError(
 					sprintf(
-						"Can't to read the Version header for '%s'. The filename is incorrect or is not a plugin.",
+						"Cannot read the Version header for '%s'. The filename is incorrect or is not a plugin.",
 						$this->updateChecker->pluginFile
 					),
 					E_USER_WARNING

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

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

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

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

diff --git a/...in-update-checker/Puc/v5p0/PucFactory.php → ...in-update-checker/Puc/v5p1/PucFactory.php b/...in-update-checker/Puc/v5p0/PucFactory.php → ...in-update-checker/Puc/v5p1/PucFactory.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p0;
+namespace YahnisElsts\PluginUpdateChecker\v5p1;
 
-use YahnisElsts\PluginUpdateChecker\v5p0\Plugin;
-use YahnisElsts\PluginUpdateChecker\v5p0\Theme;
-use YahnisElsts\PluginUpdateChecker\v5p0\Vcs;
+use YahnisElsts\PluginUpdateChecker\v5p1\Plugin;
+use YahnisElsts\PluginUpdateChecker\v5p1\Theme;
+use YahnisElsts\PluginUpdateChecker\v5p1\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.0)
+		 * This version adapted from WP 4.8.2 (unchanged since 4.5.1)
 		 *
 		 * @param string $path Path to normalize.
 		 * @return string Normalized path.