From 6cf8489db8500861289dcbdf237d7f97d03afc97 Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Thu, 21 Jul 2022 00:05:40 +0200
Subject: [PATCH 01/22] Fix argument types and return type in doc block

---
 inc/block-editor.php | 2 +-
 inc/customizer.php   | 9 ++-------
 inc/pagination.php   | 2 +-
 inc/woocommerce.php  | 8 ++++----
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/inc/block-editor.php b/inc/block-editor.php
index 2dac4ac8..c9a211d7 100644
--- a/inc/block-editor.php
+++ b/inc/block-editor.php
@@ -32,7 +32,7 @@ if ( ! function_exists( 'understrap_generate_color_palette' ) ) {
 	/**
 	 * Checks for our JSON file of color values. If exists, creates a color palette array.
 	 *
-	 * @return array|bool
+	 * @return array
 	 */
 	function understrap_generate_color_palette() {
 		$color_palette = array();
diff --git a/inc/customizer.php b/inc/customizer.php
index 4a0ad549..39e4791d 100644
--- a/inc/customizer.php
+++ b/inc/customizer.php
@@ -8,16 +8,11 @@
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit;
 
-/**
- * Add postMessage support for site title and description for the Theme Customizer.
- *
- * @param WP_Customize_Manager $wp_customize Theme Customizer object.
- */
 if ( ! function_exists( 'understrap_customize_register' ) ) {
 	/**
-	 * Register basic customizer support.
+	 * Register basic support (site title, description, header text color) for the Theme Customizer.
 	 *
-	 * @param object $wp_customize Customizer reference.
+	 * @param WP_Customize_Manager $wp_customize Customizer reference.
 	 */
 	function understrap_customize_register( $wp_customize ) {
 		$wp_customize->get_setting( 'blogname' )->transport         = 'postMessage';
diff --git a/inc/pagination.php b/inc/pagination.php
index 18a0cb95..8b4d4731 100644
--- a/inc/pagination.php
+++ b/inc/pagination.php
@@ -12,7 +12,7 @@ if ( ! function_exists( 'understrap_pagination' ) ) {
 	/**
 	 * Displays the navigation to next/previous set of posts.
 	 *
-	 * @param string|array $args {
+	 * @param array $args {
 	 *     (Optional) Array of arguments for generating paginated links for archives.
 	 *
 	 *     @type string $base               Base of the paginated url. Default empty.
diff --git a/inc/woocommerce.php b/inc/woocommerce.php
index 50b2ba2f..ba5d95d1 100644
--- a/inc/woocommerce.php
+++ b/inc/woocommerce.php
@@ -67,11 +67,11 @@ if ( ! function_exists( 'understrap_wc_form_field_args' ) ) {
 	 * Filter hook function monkey patching form classes
 	 * Author: Adriano Monecchi http://stackoverflow.com/a/36724593/307826
 	 *
-	 * @param string $args Form attributes.
-	 * @param string $key Not in use.
-	 * @param null   $value Not in use.
+	 * @param array<string,mixed> $args  Form field arguments.
+	 * @param string              $key   Value of the fields name attribute.
+	 * @param string|null         $value Value of <select> option.
 	 *
-	 * @return mixed
+	 * @return array<string,mixed> Form field arguments.
 	 */
 	function understrap_wc_form_field_args( $args, $key, $value = null ) {
 		// Start field type switch case.

From d93d40eab3f9957554a916eeb4a6a3b0c035a26c Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Thu, 21 Jul 2022 02:12:29 +0200
Subject: [PATCH 02/22] add dynamic return type for get_theme_mod()

---
 composer.json                         |  4 +-
 phpstan.neon.dist                     |  1 +
 src/phpstan/GetThemeModReturnType.php | 74 +++++++++++++++++++++++++++
 src/phpstan/autoload.php              |  8 +++
 src/phpstan/extension.neon            |  5 ++
 5 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 src/phpstan/GetThemeModReturnType.php
 create mode 100644 src/phpstan/autoload.php
 create mode 100644 src/phpstan/extension.neon

diff --git a/composer.json b/composer.json
index fafbbd7a..169abd48 100644
--- a/composer.json
+++ b/composer.json
@@ -39,8 +39,8 @@
 		"phpmd": "@php ./vendor/phpmd/phpmd/src/bin/phpmd . ansi phpmd.xml --exclude vendor,src,node_modules,languages,js,fonts,css,.phpstan-cache,.github,.git,class-wp-bootstrap-navwalker.php,inc/deprecated.php",
 		"phpmd-baseline": "@phpmd -- --generate-baseline",
 		"phpmd-ga": "@php ./vendor/phpmd/phpmd/src/bin/phpmd . github phpmd.xml --exclude vendor,src,node_modules,languages,js,fonts,css,.github,.git,class-wp-bootstrap-navwalker.php,inc/deprecated.php",
-		"phpstan": "@php ./vendor/phpstan/phpstan/phpstan analyse",
-		"phpstan-baseline": "@php ./vendor/phpstan/phpstan/phpstan analyse --generate-baseline",
+		"phpstan": "@php ./vendor/phpstan/phpstan/phpstan analyse -a src/phpstan/autoload.php",
+		"phpstan-baseline": "@php ./vendor/phpstan/phpstan/phpstan analyse -a src/phpstan/autoload.php --generate-baseline",
 		"post-install-cmd": "@phpcs-config-set",
 		"post-update-cmd": "@phpcs-config-set"
 	},
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 5fe081c4..a8e8a279 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -3,6 +3,7 @@
 includes:
 	- vendor/phpstan/phpstan/conf/bleedingEdge.neon
 	- vendor/szepeviktor/phpstan-wordpress/extension.neon
+	- src/phpstan/extension.neon
 	- phpstan-baseline.neon
 parameters:
 	level: max
diff --git a/src/phpstan/GetThemeModReturnType.php b/src/phpstan/GetThemeModReturnType.php
new file mode 100644
index 00000000..1278d1aa
--- /dev/null
+++ b/src/phpstan/GetThemeModReturnType.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Dynamic return type for get_theme_mod()
+ *
+ * @package Understrap
+ */
+
+namespace Understrap\PHPStan;
+
+use PhpParser\Node\Expr\FuncCall;
+use PHPStan\Analyser\Scope;
+use PHPStan\Reflection\FunctionReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
+use PHPStan\Type\Constant\ConstantStringType;
+use PHPStan\Type\DynamicFunctionReturnTypeExtension;
+use PHPStan\Type\MixedType;
+use PHPStan\Type\StringType;
+use PHPStan\Type\Type;
+use PHPStan\Type\TypeCombinator;
+
+/**
+ * This class implements dynamic return types for Understrap specific theme mods.
+ */
+class GetThemeModReturnType implements DynamicFunctionReturnTypeExtension {
+
+	/**
+	 * Understrap specific theme modifications.
+	 *
+	 * @var array<int,string>
+	 */
+	private static $themeMods = [
+		'understrap_bootstrap_version',
+		'understrap_container_type',
+		'understrap_navbar_type',
+		'understrap_sidebar_position',
+		'understrap_site_info_override',
+	];
+
+	public function isFunctionSupported(FunctionReflection $functionReflection): bool
+	{
+		return $functionReflection->getName() === 'get_theme_mod';
+	}
+
+	public function getTypeFromFunctionCall(
+		FunctionReflection $functionReflection,
+		FuncCall $functionCall,
+		Scope $scope
+	): Type
+	{
+		$argType = $scope->getType($functionCall->getArgs()[0]->value);
+		$defaultType = ParametersAcceptorSelector::selectFromArgs(
+			$scope,
+			$functionCall->getArgs(),
+			$functionReflection->getVariants()
+		)->getReturnType();
+
+		if (!$argType instanceof ConstantStringType) {
+			return $defaultType;
+		}
+
+		// Return the default value if it is not an Understrap specific theme mod.
+		if (!in_array($argType->getValue(), self::$themeMods, true)) {
+			return $defaultType;
+		}
+
+		// Without second argument the default value is false, but can be filtered.
+		$defaultType = new MixedType();
+		if (count($functionCall->getArgs()) > 1) {
+			$defaultType = $scope->getType($functionCall->getArgs()[1]->value);
+		}
+
+		return TypeCombinator::union(new StringType(), $defaultType);
+	}
+}
diff --git a/src/phpstan/autoload.php b/src/phpstan/autoload.php
new file mode 100644
index 00000000..73d27437
--- /dev/null
+++ b/src/phpstan/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Load PHPStan extensions
+ *
+ * @package Understrap
+ */
+
+require_once __DIR__ . '/GetThemeModReturnType.php';
diff --git a/src/phpstan/extension.neon b/src/phpstan/extension.neon
new file mode 100644
index 00000000..daa74948
--- /dev/null
+++ b/src/phpstan/extension.neon
@@ -0,0 +1,5 @@
+services:
+  -
+    class: Understrap\PHPStan\GetThemeModReturnType
+    tags:
+      - phpstan.broker.dynamicFunctionReturnTypeExtension

From 20b05b36f8850831d433e2f4818fa7be79fb058f Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Thu, 21 Jul 2022 02:36:41 +0200
Subject: [PATCH 03/22] ensure variable is iterable

---
 inc/block-editor.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/inc/block-editor.php b/inc/block-editor.php
index c9a211d7..889b6f31 100644
--- a/inc/block-editor.php
+++ b/inc/block-editor.php
@@ -42,13 +42,15 @@ if ( ! function_exists( 'understrap_generate_color_palette' ) ) {
 
 		if ( $color_palette_json ) {
 			$color_palette_json = json_decode( $color_palette_json, true );
-			foreach ( $color_palette_json as $key => $value ) {
-				$key             = str_replace( array( '--bs-', '--' ), '', $key );
-				$color_palette[] = array(
-					'name'  => $key,
-					'slug'  => $key,
-					'color' => $value,
-				);
+			if ( is_array( $color_palette_json ) ) {
+				foreach ( $color_palette_json as $key => $value ) {
+					$key             = str_replace( array( '--bs-', '--' ), '', $key );
+					$color_palette[] = array(
+						'name'  => $key,
+						'slug'  => $key,
+						'color' => $value,
+					);
+				}
 			}
 		}
 

From 39d30e23461ebc331bf09edc8b5be67d9d15641e Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Thu, 21 Jul 2022 02:15:50 +0200
Subject: [PATCH 04/22] ensure variable is of type string

---
 inc/block-editor.php    |  3 +++
 inc/custom-comments.php |  6 +++++-
 inc/jetpack.php         | 12 ++++++++----
 inc/woocommerce.php     |  4 ++++
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/inc/block-editor.php b/inc/block-editor.php
index 889b6f31..a0c9ea38 100644
--- a/inc/block-editor.php
+++ b/inc/block-editor.php
@@ -44,6 +44,9 @@ if ( ! function_exists( 'understrap_generate_color_palette' ) ) {
 			$color_palette_json = json_decode( $color_palette_json, true );
 			if ( is_array( $color_palette_json ) ) {
 				foreach ( $color_palette_json as $key => $value ) {
+					if ( ! is_string( $key ) ) {
+						continue;
+					}
 					$key             = str_replace( array( '--bs-', '--' ), '', $key );
 					$color_palette[] = array(
 						'name'  => $key,
diff --git a/inc/custom-comments.php b/inc/custom-comments.php
index cfe1822a..4a520c50 100644
--- a/inc/custom-comments.php
+++ b/inc/custom-comments.php
@@ -97,7 +97,11 @@ if ( ! function_exists( 'understrap_comment_form_comments_closed' ) ) {
 	 * Displays a note that comments are closed if comments are closed and there are comments.
 	 */
 	function understrap_comment_form_comments_closed() {
-		if ( get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) {
+		$post_type = get_post_type();
+		if ( false === $post_type ) {
+			return;
+		}
+		if ( get_comments_number() && post_type_supports( $post_type, 'comments' ) ) {
 			?>
 			<p class="no-comments"><?php esc_html_e( 'Comments are closed.', 'understrap' ); ?></p>
 			<?php
diff --git a/inc/jetpack.php b/inc/jetpack.php
index 45ad9a5e..faed00dc 100644
--- a/inc/jetpack.php
+++ b/inc/jetpack.php
@@ -47,11 +47,15 @@ if ( ! function_exists( 'understrap_components_infinite_scroll_render' ) ) {
 	function understrap_components_infinite_scroll_render() {
 		while ( have_posts() ) {
 			the_post();
-			if ( is_search() ) :
+			if ( is_search() ) {
 				get_template_part( 'loop-templates/content', 'search' );
-			else :
-				get_template_part( 'loop-templates/content', get_post_format() );
-			endif;
+			} else {
+				$post_format = get_post_format();
+				if ( false === $post_format ) {
+					$post_format = '';
+				}
+				get_template_part( 'loop-templates/content', $post_format );
+			}
 		}
 	}
 }
diff --git a/inc/woocommerce.php b/inc/woocommerce.php
index ba5d95d1..0e59d53b 100644
--- a/inc/woocommerce.php
+++ b/inc/woocommerce.php
@@ -41,6 +41,10 @@ if ( ! function_exists( 'understrap_woocommerce_wrapper_start' ) ) {
 	 */
 	function understrap_woocommerce_wrapper_start() {
 		$container = get_theme_mod( 'understrap_container_type' );
+		if ( false === $container ) {
+			$container = '';
+		}
+
 		echo '<div class="wrapper" id="woocommerce-wrapper">';
 		echo '<div class="' . esc_attr( $container ) . '" id="content" tabindex="-1">';
 		echo '<div class="row">';

From b0783440d319bfe32d1d50a385dff282af7b9431 Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Thu, 21 Jul 2022 03:12:55 +0200
Subject: [PATCH 05/22] do not use inner functions

---
 inc/customizer.php | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/inc/customizer.php b/inc/customizer.php
index 39e4791d..b7741cc0 100644
--- a/inc/customizer.php
+++ b/inc/customizer.php
@@ -41,26 +41,6 @@ if ( ! function_exists( 'understrap_theme_customize_register' ) ) {
 			)
 		);
 
-		/**
-		 * Select sanitization function
-		 *
-		 * @param string               $input   Slug to sanitize.
-		 * @param WP_Customize_Setting $setting Setting instance.
-		 * @return string Sanitized slug if it is a valid choice; otherwise, the setting default.
-		 */
-		function understrap_theme_slug_sanitize_select( $input, $setting ) {
-
-			// Ensure input is a slug (lowercase alphanumeric characters, dashes and underscores are allowed only).
-			$input = sanitize_key( $input );
-
-			// Get the list of possible select options.
-			$choices = $setting->manager->get_control( $setting->id )->choices;
-
-			// If the input is a valid key, return it; otherwise, return the default.
-			return ( array_key_exists( $input, $choices ) ? $input : $setting->default );
-
-		}
-
 		$wp_customize->add_setting(
 			'understrap_bootstrap_version',
 			array(
@@ -216,6 +196,28 @@ if ( ! function_exists( 'understrap_theme_customize_register' ) ) {
 } // End of if function_exists( 'understrap_theme_customize_register' ).
 add_action( 'customize_register', 'understrap_theme_customize_register' );
 
+if ( ! function_exists( 'understrap_theme_slug_sanitize_select') ) {
+	/**
+	 * Sanitize select.
+	 *
+	 * @param string               $input   Slug to sanitize.
+	 * @param WP_Customize_Setting $setting Setting instance.
+	 * @return string Sanitized slug if it is a valid choice; otherwise, the setting default.
+	 */
+	function understrap_theme_slug_sanitize_select( $input, $setting ) {
+
+		// Ensure input is a slug (lowercase alphanumeric characters, dashes and underscores are allowed only).
+		$input = sanitize_key( $input );
+
+		// Get the list of possible select options.
+		$choices = $setting->manager->get_control( $setting->id )->choices;
+
+		// If the input is a valid key, return it; otherwise, return the default.
+		return ( array_key_exists( $input, $choices ) ? $input : $setting->default );
+
+	}
+}
+
 /**
  * Binds JS handlers to make Theme Customizer preview reload changes asynchronously.
  */

From c0cc2d307e8f451465e8d989e0106a652596a996 Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Thu, 21 Jul 2022 03:19:24 +0200
Subject: [PATCH 06/22] ensure variable is an instance of WP_Customize_Setting

---
 inc/customizer.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/inc/customizer.php b/inc/customizer.php
index b7741cc0..1d5377cb 100644
--- a/inc/customizer.php
+++ b/inc/customizer.php
@@ -15,9 +15,13 @@ if ( ! function_exists( 'understrap_customize_register' ) ) {
 	 * @param WP_Customize_Manager $wp_customize Customizer reference.
 	 */
 	function understrap_customize_register( $wp_customize ) {
-		$wp_customize->get_setting( 'blogname' )->transport         = 'postMessage';
-		$wp_customize->get_setting( 'blogdescription' )->transport  = 'postMessage';
-		$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
+		$settings = array( 'blogname', 'blogdescription', 'header_textcolor' );
+		foreach ( $settings as $setting ) {
+			$get_setting = $wp_customize->get_setting( $setting );
+			if ( $get_setting instanceof WP_Customize_Setting ) {
+				$get_setting->transport = 'postMessage';
+			}
+		}
 	}
 }
 add_action( 'customize_register', 'understrap_customize_register' );

From cdad409646683c54015e2973c9aea6c30d276cd1 Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Thu, 21 Jul 2022 03:28:08 +0200
Subject: [PATCH 07/22] ensure variable is of type array

---
 inc/editor.php     |  4 +++-
 inc/pagination.php | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/inc/editor.php b/inc/editor.php
index 8ecc72f0..56a92fe2 100644
--- a/inc/editor.php
+++ b/inc/editor.php
@@ -76,7 +76,9 @@ if ( ! function_exists( 'understrap_tiny_mce_before_init' ) ) {
 
 		if ( isset( $settings['style_formats'] ) ) {
 			$orig_style_formats = json_decode( $settings['style_formats'], true );
-			$style_formats      = array_merge( $orig_style_formats, $style_formats );
+			if ( is_array( $orig_style_formats ) ) {
+				$style_formats = array_merge( $orig_style_formats, $style_formats );
+			}
 		}
 
 		$settings['style_formats'] = wp_json_encode( $style_formats );
diff --git a/inc/pagination.php b/inc/pagination.php
index 8b4d4731..85a81a74 100644
--- a/inc/pagination.php
+++ b/inc/pagination.php
@@ -52,14 +52,20 @@ if ( ! function_exists( 'understrap_pagination' ) ) {
 				'prev_next'          => true,
 				'prev_text'          => __( '&laquo;', 'understrap' ),
 				'next_text'          => __( '&raquo;', 'understrap' ),
-				'type'               => 'array',
 				'current'            => max( 1, get_query_var( 'paged' ) ),
 				'screen_reader_text' => __( 'Posts navigation', 'understrap' ),
 			)
 		);
 
+		// Make sure we always get an array.
+		$args['type'] = 'array';
+
+		/**
+		 * Array of paginated links.
+		 * @var array<int,string>
+		 */
 		$links = paginate_links( $args );
-		if ( ! $links ) {
+		if ( empty( $links ) ) {
 			return;
 		}
 

From 38ada2f3c232375563f1c1ed7471b10281c3cdfc Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Thu, 21 Jul 2022 03:51:30 +0200
Subject: [PATCH 08/22] ensure variable is not if type WP_Error

---
 inc/template-tags.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/template-tags.php b/inc/template-tags.php
index dbef2794..355be24c 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -63,7 +63,7 @@ if ( ! function_exists( 'understrap_entry_footer' ) ) {
 			}
 			/* translators: used between list items, there is a space after the comma */
 			$tags_list = get_the_tag_list( '', esc_html__( ', ', 'understrap' ) );
-			if ( $tags_list ) {
+			if ( $tags_list && ! is_wp_error( $tags_list ) ) {
 				/* translators: %s: Tags of current post */
 				printf( '<span class="tags-links">' . esc_html__( 'Tagged %s', 'understrap' ) . '</span>', $tags_list ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 			}

From e5c7ebc7ef56ebe1bc5b08962c051204faaa4632 Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Fri, 22 Jul 2022 23:34:42 +0200
Subject: [PATCH 09/22] ensure variable is of type int

---
 inc/template-tags.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/template-tags.php b/inc/template-tags.php
index 355be24c..9bd4367e 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -40,7 +40,7 @@ if ( ! function_exists( 'understrap_posted_on' ) ) {
 			sprintf(
 				'<span class="byline"> %1$s<span class="author vcard"> <a class="url fn n" href="%2$s">%3$s</a></span></span>',
 				$posted_on ? esc_html_x( 'by', 'post author', 'understrap' ) : esc_html_x( 'Posted by', 'post author', 'understrap' ),
-				esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+				esc_url( get_author_posts_url( (int) get_the_author_meta( 'ID' ) ) ),
 				esc_html( get_the_author() )
 			)
 		);

From 177755c0da9183103c65ea2ce7d53dc714067ec6 Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Sat, 23 Jul 2022 01:55:51 +0200
Subject: [PATCH 10/22] ensure variable is of type string

---
 inc/extras.php        | 16 ++++++++++------
 inc/template-tags.php | 43 +++++++++++++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/inc/extras.php b/inc/extras.php
index b34cfe5b..b79f7dcd 100644
--- a/inc/extras.php
+++ b/inc/extras.php
@@ -281,12 +281,16 @@ if ( ! function_exists( 'understrap_all_excerpts_get_more_link' ) ) {
 	 * @return string
 	 */
 	function understrap_all_excerpts_get_more_link( $post_excerpt ) {
-		if ( ! is_admin() ) {
-			$post_excerpt = $post_excerpt . ' [...]<p><a class="btn btn-secondary understrap-read-more-link" href="' . esc_url( get_permalink( get_the_ID() ) ) . '">' . __(
-				'Read More...',
-				'understrap'
-			) . '<span class="screen-reader-text"> from ' . get_the_title( get_the_ID() ) . '</span></a></p>';
+		if ( is_admin() || ! get_the_ID() ) {
+			return $post_excerpt;
 		}
-		return $post_excerpt;
+
+		$permalink = esc_url( get_permalink( (int) get_the_ID() ) ); // @phpstan-ignore-line -- post exists
+
+		return $post_excerpt . ' [...]<p><a class="btn btn-secondary understrap-read-more-link" href="' . $permalink . '">' . __(
+			'Read More...',
+			'understrap'
+		) . '<span class="screen-reader-text"> from ' . get_the_title( get_the_ID() ) . '</span></a></p>';
+
 	}
 }
diff --git a/inc/template-tags.php b/inc/template-tags.php
index 9bd4367e..da7d9e62 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -15,35 +15,50 @@ if ( ! function_exists( 'understrap_posted_on' ) ) {
 	 * Prints HTML with meta information for the current post-date/time and author.
 	 */
 	function understrap_posted_on() {
+		$post = get_post();
+		if ( ! $post ) {
+			return;
+		}
+
 		$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
+
 		if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
 			$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s"> (%4$s) </time>';
 		}
+
 		$time_string = sprintf(
 			$time_string,
-			esc_attr( get_the_date( 'c' ) ),
-			esc_html( get_the_date() ),
-			esc_attr( get_the_modified_date( 'c' ) ),
-			esc_html( get_the_modified_date() )
+			esc_attr( get_the_date( 'c' ) ), // @phpstan-ignore-line -- post exists
+			esc_html( get_the_date() ), // @phpstan-ignore-line -- post exists
+			esc_attr( get_the_modified_date( 'c' ) ), // @phpstan-ignore-line -- post exists
+			esc_html( get_the_modified_date() ) // @phpstan-ignore-line -- post exists
 		);
+
 		$posted_on   = apply_filters(
 			'understrap_posted_on',
 			sprintf(
 				'<span class="posted-on">%1$s <a href="%2$s" rel="bookmark">%3$s</a></span>',
 				esc_html_x( 'Posted on', 'post date', 'understrap' ),
-				esc_url( get_permalink() ),
+				esc_url( get_permalink() ), // @phpstan-ignore-line -- post exists
 				apply_filters( 'understrap_posted_on_time', $time_string )
 			)
 		);
-		$byline      = apply_filters(
-			'understrap_posted_by',
-			sprintf(
-				'<span class="byline"> %1$s<span class="author vcard"> <a class="url fn n" href="%2$s">%3$s</a></span></span>',
-				$posted_on ? esc_html_x( 'by', 'post author', 'understrap' ) : esc_html_x( 'Posted by', 'post author', 'understrap' ),
-				esc_url( get_author_posts_url( (int) get_the_author_meta( 'ID' ) ) ),
-				esc_html( get_the_author() )
-			)
-		);
+
+		$author_id = (int) get_the_author_meta( 'ID' );
+		if ( 0 === $author_id ) {
+			$byline = '';
+		} else {
+			$byline    = apply_filters(
+				'understrap_posted_by',
+				sprintf(
+					'<span class="byline"> %1$s<span class="author vcard"> <a class="url fn n" href="%2$s">%3$s</a></span></span>',
+					$posted_on ? esc_html_x( 'by', 'post author', 'understrap' ) : esc_html_x( 'Posted by', 'post author', 'understrap' ),
+					esc_url( get_author_posts_url( $author_id ) ),
+					esc_html( get_the_author_meta( 'display_name', $author_id ) )
+				)
+			);
+		}
+
 		echo $posted_on . $byline; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	}
 }

From 7911caac266cbb752f274c69e8b959135aae4964 Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Sat, 23 Jul 2022 02:06:16 +0200
Subject: [PATCH 11/22] ensure variable is of type WP_Post

---
 inc/template-tags.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/inc/template-tags.php b/inc/template-tags.php
index da7d9e62..ddd24355 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -218,10 +218,17 @@ if ( ! function_exists( 'understrap_edit_post_link' ) ) {
 if ( ! function_exists( 'understrap_post_nav' ) ) {
 	/**
 	 * Display navigation to next/previous post when applicable.
+	 *
+	 * @global WP_Post|null $post The current post.
 	 */
 	function understrap_post_nav() {
+		global $post;
+		if ( ! $post ) {
+			return;
+		}
+
 		// Don't print empty markup if there's nowhere to navigate.
-		$previous = ( is_attachment() ) ? get_post( get_post()->post_parent ) : get_adjacent_post( false, '', true );
+		$previous = ( is_attachment() ) ? get_post( $post->post_parent ) : get_adjacent_post( false, '', true );
 		$next     = get_adjacent_post( false, '', false );
 		if ( ! $next && ! $previous ) {
 			return;

From ed52d4279153576c1abc265fd3cf1feedbd178b4 Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Sat, 23 Jul 2022 11:36:51 +0200
Subject: [PATCH 12/22] ensure variable is an instance of WP_Customize_Control

---
 inc/customizer.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/inc/customizer.php b/inc/customizer.php
index 1d5377cb..7443dc6d 100644
--- a/inc/customizer.php
+++ b/inc/customizer.php
@@ -206,15 +206,21 @@ if ( ! function_exists( 'understrap_theme_slug_sanitize_select') ) {
 	 *
 	 * @param string               $input   Slug to sanitize.
 	 * @param WP_Customize_Setting $setting Setting instance.
-	 * @return string Sanitized slug if it is a valid choice; otherwise, the setting default.
+	 * @return string|bool Sanitized slug if it is a valid choice; the setting default for
+	 *                     invalid choices and false in all other cases.
 	 */
 	function understrap_theme_slug_sanitize_select( $input, $setting ) {
 
 		// Ensure input is a slug (lowercase alphanumeric characters, dashes and underscores are allowed only).
 		$input = sanitize_key( $input );
 
+		$control = $setting->manager->get_control( $setting->id );
+		if ( ! $control instanceof WP_Customize_Control ) {
+			return false;
+		}
+
 		// Get the list of possible select options.
-		$choices = $setting->manager->get_control( $setting->id )->choices;
+		$choices = $control->choices;
 
 		// If the input is a valid key, return it; otherwise, return the default.
 		return ( array_key_exists( $input, $choices ) ? $input : $setting->default );

From ab3a22a0762baea16c1f9653bf7f7133a77f6456 Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Sat, 23 Jul 2022 12:37:51 +0200
Subject: [PATCH 13/22] remove redundant 'settings' argument

---
 inc/customizer.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/inc/customizer.php b/inc/customizer.php
index 7443dc6d..de72d095 100644
--- a/inc/customizer.php
+++ b/inc/customizer.php
@@ -63,7 +63,6 @@ if ( ! function_exists( 'understrap_theme_customize_register' ) ) {
 					'label'       => __( 'Bootstrap Version', 'understrap' ),
 					'description' => __( 'Choose between Bootstrap 4 or Bootstrap 5', 'understrap' ),
 					'section'     => 'understrap_theme_layout_options',
-					'settings'    => 'understrap_bootstrap_version',
 					'type'        => 'select',
 					'choices'     => array(
 						'bootstrap4' => __( 'Bootstrap 4', 'understrap' ),
@@ -92,7 +91,6 @@ if ( ! function_exists( 'understrap_theme_customize_register' ) ) {
 					'label'       => __( 'Container Width', 'understrap' ),
 					'description' => __( 'Choose between Bootstrap\'s container and container-fluid', 'understrap' ),
 					'section'     => 'understrap_theme_layout_options',
-					'settings'    => 'understrap_container_type',
 					'type'        => 'select',
 					'choices'     => array(
 						'container'       => __( 'Fixed width container', 'understrap' ),
@@ -124,7 +122,6 @@ if ( ! function_exists( 'understrap_theme_customize_register' ) ) {
 						'understrap'
 					),
 					'section'           => 'understrap_theme_layout_options',
-					'settings'          => 'understrap_navbar_type',
 					'type'              => 'select',
 					'sanitize_callback' => 'understrap_theme_slug_sanitize_select',
 					'choices'           => array(
@@ -157,7 +154,6 @@ if ( ! function_exists( 'understrap_theme_customize_register' ) ) {
 						'understrap'
 					),
 					'section'           => 'understrap_theme_layout_options',
-					'settings'          => 'understrap_sidebar_position',
 					'type'              => 'select',
 					'sanitize_callback' => 'understrap_theme_slug_sanitize_select',
 					'choices'           => array(
@@ -189,7 +185,6 @@ if ( ! function_exists( 'understrap_theme_customize_register' ) ) {
 					'label'       => __( 'Footer Site Info', 'understrap' ),
 					'description' => __( 'Override Understrap\'s site info located at the footer of the page.', 'understrap' ),
 					'section'     => 'understrap_theme_layout_options',
-					'settings'    => 'understrap_site_info_override',
 					'type'        => 'textarea',
 					'priority'    => 20,
 				)

From 79ef9f356d4cce83a1ea54a4f46e3776a3beaf3e Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Sat, 23 Jul 2022 21:03:08 +0200
Subject: [PATCH 14/22] add value type to iterable type array

---
 inc/extras.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/extras.php b/inc/extras.php
index b79f7dcd..118917bf 100644
--- a/inc/extras.php
+++ b/inc/extras.php
@@ -111,8 +111,8 @@ if ( ! function_exists( 'understrap_default_body_attributes' ) ) {
 	/**
 	 * Adds schema markup to the body element.
 	 *
-	 * @param array $atts An associative array of attributes.
-	 * @return array
+	 * @param array<string,string> $atts An associative array of attributes.
+	 * @return array<string,string>
 	 */
 	function understrap_default_body_attributes( $atts ) {
 		$atts['itemscope'] = '';

From 60363ae1166d8695d3a765a81409daddf96f2090 Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Sat, 23 Jul 2022 21:08:47 +0200
Subject: [PATCH 15/22] generate new baseline for PHPStan

---
 phpstan-baseline.neon | 165 ++----------------------------------------
 1 file changed, 5 insertions(+), 160 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index bf5b0567..769a041e 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,25 +1,10 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: inc/block-editor.php
-
-		-
-			message: "#^Function understrap_generate_color_palette\\(\\) never returns bool so it can be removed from the return type\\.$#"
-			count: 1
-			path: inc/block-editor.php
-
 		-
 			message: "#^Function understrap_generate_color_palette\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: inc/block-editor.php
 
-		-
-			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, mixed given\\.$#"
-			count: 1
-			path: inc/block-editor.php
-
 		-
 			message: "#^Function understrap_bootstrap_comment_form_fields\\(\\) has parameter \\$fields with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -30,51 +15,6 @@ parameters:
 			count: 1
 			path: inc/custom-comments.php
 
-		-
-			message: "#^Parameter \\#1 \\$post_type of function post_type_supports expects string, string\\|false given\\.$#"
-			count: 1
-			path: inc/custom-comments.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:get_setting\\(\\)\\.$#"
-			count: 3
-			path: inc/customizer.php
-
-		-
-			message: "#^Cannot access property \\$choices on void\\|WP_Customize_Control\\.$#"
-			count: 1
-			path: inc/customizer.php
-
-		-
-			message: "#^Inner named functions are not supported by PHPStan\\. Consider refactoring to an anonymous function, class method, or a top\\-level\\-defined function\\. See issue \\#165 \\(https\\://github\\.com/phpstan/phpstan/issues/165\\) for more details\\.$#"
-			count: 1
-			path: inc/customizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$args of class WP_Customize_Control constructor expects array\\{instance_number\\?\\: int, manager\\?\\: WP_Customize_Manager, id\\?\\: string, settings\\?\\: array, setting\\?\\: string, capability\\?\\: string, priority\\?\\: int, section\\?\\: string, \\.\\.\\.\\}, array\\{label\\: string, description\\: string, section\\: 'understrap_theme…', settings\\: 'understrap_navbar…', type\\: 'select', sanitize_callback\\: 'understrap_theme…', choices\\: array\\{collapse\\: string, offcanvas\\: string\\}, priority\\: mixed\\} given\\.$#"
-			count: 1
-			path: inc/customizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$args of class WP_Customize_Control constructor expects array\\{instance_number\\?\\: int, manager\\?\\: WP_Customize_Manager, id\\?\\: string, settings\\?\\: array, setting\\?\\: string, capability\\?\\: string, priority\\?\\: int, section\\?\\: string, \\.\\.\\.\\}, array\\{label\\: string, description\\: string, section\\: 'understrap_theme…', settings\\: 'understrap_sidebar…', type\\: 'select', sanitize_callback\\: 'understrap_theme…', choices\\: array\\{right\\: string, left\\: string, both\\: string, none\\: string\\}, priority\\: mixed\\} given\\.$#"
-			count: 1
-			path: inc/customizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$args of class WP_Customize_Control constructor expects array\\{instance_number\\?\\: int, manager\\?\\: WP_Customize_Manager, id\\?\\: string, settings\\?\\: array, setting\\?\\: string, capability\\?\\: string, priority\\?\\: int, section\\?\\: string, \\.\\.\\.\\}, array\\{label\\: string, description\\: string, section\\: 'understrap_theme…', settings\\: 'understrap_site…', type\\: 'textarea', priority\\: 20\\} given\\.$#"
-			count: 1
-			path: inc/customizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$args of class WP_Customize_Control constructor expects array\\{instance_number\\?\\: int, manager\\?\\: WP_Customize_Manager, id\\?\\: string, settings\\?\\: array, setting\\?\\: string, capability\\?\\: string, priority\\?\\: int, section\\?\\: string, \\.\\.\\.\\}, array\\{label\\: string, description\\: string, section\\: 'understrap_theme…', settings\\: 'understrap…', type\\: 'select', choices\\: array\\{bootstrap4\\: string, bootstrap5\\: string\\}, priority\\: mixed\\} given\\.$#"
-			count: 1
-			path: inc/customizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$args of class WP_Customize_Control constructor expects array\\{instance_number\\?\\: int, manager\\?\\: WP_Customize_Manager, id\\?\\: string, settings\\?\\: array, setting\\?\\: string, capability\\?\\: string, priority\\?\\: int, section\\?\\: string, \\.\\.\\.\\}, array\\{label\\: string, description\\: string, section\\: 'understrap_theme…', settings\\: 'understrap…', type\\: 'select', choices\\: array\\{container\\: string, container\\-fluid\\: string\\}, priority\\: mixed\\} given\\.$#"
-			count: 1
-			path: inc/customizer.php
-
 		-
 			message: "#^Function understrap_tiny_mce_before_init\\(\\) has parameter \\$settings with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -105,11 +45,6 @@ parameters:
 			count: 1
 			path: inc/editor.php
 
-		-
-			message: "#^Parameter \\#1 \\$arr1 of function array_merge expects array, mixed given\\.$#"
-			count: 1
-			path: inc/editor.php
-
 		-
 			message: "#^Binary operation \"\\.\" between array\\|string\\|false and '\\.' results in an error\\.$#"
 			count: 2
@@ -125,31 +60,6 @@ parameters:
 			count: 1
 			path: inc/extras.php
 
-		-
-			message: "#^Function understrap_default_body_attributes\\(\\) has parameter \\$atts with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: inc/extras.php
-
-		-
-			message: "#^Function understrap_default_body_attributes\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: inc/extras.php
-
-		-
-			message: "#^Parameter \\#1 \\$post of function get_permalink expects int\\|WP_Post, int\\|false given\\.$#"
-			count: 1
-			path: inc/extras.php
-
-		-
-			message: "#^Parameter \\#1 \\$post of function get_the_title expects int\\|WP_Post, int\\|false given\\.$#"
-			count: 1
-			path: inc/extras.php
-
-		-
-			message: "#^Parameter \\#1 \\$url of function esc_url expects string, string\\|false given\\.$#"
-			count: 1
-			path: inc/extras.php
-
 		-
 			message: "#^Parameter \\#2 \\$callback of function add_filter expects callable\\(\\)\\: mixed, 'understrap_adjust…' given\\.$#"
 			count: 1
@@ -160,71 +70,11 @@ parameters:
 			count: 2
 			path: inc/hooks.php
 
-		-
-			message: "#^Parameter \\#2 \\$name of function get_template_part expects string\\|null, string\\|false given\\.$#"
-			count: 1
-			path: inc/jetpack.php
-
-		-
-			message: "#^Argument of an invalid type array\\|string\\|void supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: inc/pagination.php
-
-		-
-			message: "#^Cannot assign offset 'total' to array\\|string\\.$#"
-			count: 1
-			path: inc/pagination.php
-
 		-
 			message: "#^Function understrap_pagination\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: inc/pagination.php
 
-		-
-			message: "#^Cannot access property \\$post_parent on WP_Post\\|null\\.$#"
-			count: 1
-			path: inc/template-tags.php
-
-		-
-			message: "#^Parameter \\#1 \\$author_id of function get_author_posts_url expects int, string given\\.$#"
-			count: 1
-			path: inc/template-tags.php
-
-		-
-			message: "#^Parameter \\#1 \\$text of function esc_attr expects string, int\\|string\\|false given\\.$#"
-			count: 1
-			path: inc/template-tags.php
-
-		-
-			message: "#^Parameter \\#1 \\$text of function esc_attr expects string, string\\|false given\\.$#"
-			count: 1
-			path: inc/template-tags.php
-
-		-
-			message: "#^Parameter \\#1 \\$text of function esc_html expects string, int\\|string\\|false given\\.$#"
-			count: 1
-			path: inc/template-tags.php
-
-		-
-			message: "#^Parameter \\#1 \\$text of function esc_html expects string, string\\|false given\\.$#"
-			count: 1
-			path: inc/template-tags.php
-
-		-
-			message: "#^Parameter \\#1 \\$text of function esc_html expects string, string\\|null given\\.$#"
-			count: 1
-			path: inc/template-tags.php
-
-		-
-			message: "#^Parameter \\#1 \\$url of function esc_url expects string, string\\|false given\\.$#"
-			count: 1
-			path: inc/template-tags.php
-
-		-
-			message: "#^Parameter \\#2 \\.\\.\\.\\$values of function printf expects bool\\|float\\|int\\|string\\|null, string\\|WP_Error given\\.$#"
-			count: 1
-			path: inc/template-tags.php
-
 		-
 			message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, string\\|void given\\.$#"
 			count: 1
@@ -245,6 +95,11 @@ parameters:
 			count: 1
 			path: inc/widgets.php
 
+		-
+			message: "#^Cannot access an offset on mixed\\.$#"
+			count: 12
+			path: inc/woocommerce.php
+
 		-
 			message: "#^Function understrap_quantity_input_classes\\(\\) has parameter \\$classes with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -255,13 +110,3 @@ parameters:
 			count: 1
 			path: inc/woocommerce.php
 
-		-
-			message: "#^Offset 'type' does not exist on string\\.$#"
-			count: 1
-			path: inc/woocommerce.php
-
-		-
-			message: "#^Parameter \\#1 \\$text of function esc_attr expects string, mixed given\\.$#"
-			count: 1
-			path: inc/woocommerce.php
-

From 187209a3bc6bff89d70f9f0ca9c8e11a6040acc4 Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Sat, 23 Jul 2022 21:16:01 +0200
Subject: [PATCH 16/22] exclude PHPStan source files from wpcs checks

---
 phpcs.xml.dist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 226d83a7..c0996e77 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -20,6 +20,7 @@
 
 	<!-- Directories and third party library exclusions. -->
 	<exclude-pattern>/vendor/*</exclude-pattern>
+	<exclude-pattern>/src/phpstan/*</exclude-pattern>
 	<exclude-pattern>/node_modules/*</exclude-pattern>
 	<exclude-pattern>/languages/*</exclude-pattern>
 	<exclude-pattern>/inc/deprecated.php</exclude-pattern>

From 0f44c0a0bd6b12ee82211bf8a7d20d3d23a15742 Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Sat, 23 Jul 2022 21:21:23 +0200
Subject: [PATCH 17/22] fix wpcs

---
 inc/customizer.php    | 2 +-
 inc/pagination.php    | 5 +++--
 inc/template-tags.php | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/inc/customizer.php b/inc/customizer.php
index de72d095..33295a5f 100644
--- a/inc/customizer.php
+++ b/inc/customizer.php
@@ -195,7 +195,7 @@ if ( ! function_exists( 'understrap_theme_customize_register' ) ) {
 } // End of if function_exists( 'understrap_theme_customize_register' ).
 add_action( 'customize_register', 'understrap_theme_customize_register' );
 
-if ( ! function_exists( 'understrap_theme_slug_sanitize_select') ) {
+if ( ! function_exists( 'understrap_theme_slug_sanitize_select' ) ) {
 	/**
 	 * Sanitize select.
 	 *
diff --git a/inc/pagination.php b/inc/pagination.php
index 85a81a74..b6ca2bc1 100644
--- a/inc/pagination.php
+++ b/inc/pagination.php
@@ -12,7 +12,7 @@ if ( ! function_exists( 'understrap_pagination' ) ) {
 	/**
 	 * Displays the navigation to next/previous set of posts.
 	 *
-	 * @param array $args {
+	 * @param array  $args {
 	 *     (Optional) Array of arguments for generating paginated links for archives.
 	 *
 	 *     @type string $base               Base of the paginated url. Default empty.
@@ -37,7 +37,7 @@ if ( ! function_exists( 'understrap_pagination' ) ) {
 	 *     @type string $after_page_number  A string to append after the page number. Default empty.
 	 *     @type string $screen_reader_text Screen reader text for the nav element. Default 'Posts navigation'.
 	 * }
-	 * @param string       $class           (Optional) Classes to be added to the <ul> element. Default 'pagination'.
+	 * @param string $class                 (Optional) Classes to be added to the <ul> element. Default 'pagination'.
 	 */
 	function understrap_pagination( $args = array(), $class = 'pagination' ) {
 
@@ -62,6 +62,7 @@ if ( ! function_exists( 'understrap_pagination' ) ) {
 
 		/**
 		 * Array of paginated links.
+		 *
 		 * @var array<int,string>
 		 */
 		$links = paginate_links( $args );
diff --git a/inc/template-tags.php b/inc/template-tags.php
index ddd24355..1b8c7424 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -34,7 +34,7 @@ if ( ! function_exists( 'understrap_posted_on' ) ) {
 			esc_html( get_the_modified_date() ) // @phpstan-ignore-line -- post exists
 		);
 
-		$posted_on   = apply_filters(
+		$posted_on = apply_filters(
 			'understrap_posted_on',
 			sprintf(
 				'<span class="posted-on">%1$s <a href="%2$s" rel="bookmark">%3$s</a></span>',
@@ -48,7 +48,7 @@ if ( ! function_exists( 'understrap_posted_on' ) ) {
 		if ( 0 === $author_id ) {
 			$byline = '';
 		} else {
-			$byline    = apply_filters(
+			$byline = apply_filters(
 				'understrap_posted_by',
 				sprintf(
 					'<span class="byline"> %1$s<span class="author vcard"> <a class="url fn n" href="%2$s">%3$s</a></span></span>',

From e0b0004178d4c028a00afac9a5c7f8a372d3a754 Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Sun, 24 Jul 2022 08:11:36 +0200
Subject: [PATCH 18/22] bump composer dependencies

---
 composer.lock | 489 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 352 insertions(+), 137 deletions(-)

diff --git a/composer.lock b/composer.lock
index 6c6490c7..a1e4ffe1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -9,30 +9,30 @@
     "packages-dev": [
         {
             "name": "composer/pcre",
-            "version": "1.0.1",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560"
+                "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560",
-                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd",
+                "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
                 "phpstan/phpstan": "^1.3",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "symfony/phpunit-bridge": "^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.x-dev"
+                    "dev-main": "3.x-dev"
                 }
             },
             "autoload": {
@@ -60,7 +60,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/1.0.1"
+                "source": "https://github.com/composer/pcre/tree/3.0.0"
             },
             "funding": [
                 {
@@ -76,31 +76,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-21T20:24:37+00:00"
+            "time": "2022-02-25T20:21:48+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "2.0.5",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a"
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a",
-                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
                 "shasum": ""
             },
             "require": {
-                "composer/pcre": "^1",
-                "php": "^5.3.2 || ^7.0 || ^8.0",
+                "composer/pcre": "^1 || ^2 || ^3",
+                "php": "^7.2.5 || ^8.0",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "require-dev": {
                 "phpstan/phpstan": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0"
+                "symfony/phpunit-bridge": "^6.0"
             },
             "type": "library",
             "autoload": {
@@ -126,7 +126,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/2.0.5"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
             },
             "funding": [
                 {
@@ -142,7 +142,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-24T20:20:32+00:00"
+            "time": "2022-02-25T21:32:43+00:00"
         },
         {
             "name": "pdepend/pdepend",
@@ -562,16 +562,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.8.1",
+            "version": "1.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "8dbba631fa32f4b289404469c2afd6122fd61d67"
+                "reference": "c53312ecc575caf07b0e90dee43883fdf90ca67c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8dbba631fa32f4b289404469c2afd6122fd61d67",
-                "reference": "8dbba631fa32f4b289404469c2afd6122fd61d67",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c53312ecc575caf07b0e90dee43883fdf90ca67c",
+                "reference": "c53312ecc575caf07b0e90dee43883fdf90ca67c",
                 "shasum": ""
             },
             "require": {
@@ -597,7 +597,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.8.1"
+                "source": "https://github.com/phpstan/phpstan/tree/1.8.2"
             },
             "funding": [
                 {
@@ -617,24 +617,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-12T16:08:06+00:00"
+            "time": "2022-07-20T09:57:31+00:00"
         },
         {
             "name": "psr/container",
-            "version": "1.1.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.0"
+                "php": ">=7.4.0"
             },
             "type": "library",
             "autoload": {
@@ -663,9 +663,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/1.1.1"
+                "source": "https://github.com/php-fig/container/tree/1.1.2"
             },
-            "time": "2021-03-05T17:36:06+00:00"
+            "time": "2021-11-05T16:50:12+00:00"
         },
         {
             "name": "psr/log",
@@ -723,24 +723,27 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Roave/SecurityAdvisories.git",
-                "reference": "6cdb8691f0733e3994a4f1c4d976acfdce4d58a9"
+                "reference": "4bc2609bf9e2c2146d25465546bb10651cce47ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/6cdb8691f0733e3994a4f1c4d976acfdce4d58a9",
-                "reference": "6cdb8691f0733e3994a4f1c4d976acfdce4d58a9",
+                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/4bc2609bf9e2c2146d25465546bb10651cce47ac",
+                "reference": "4bc2609bf9e2c2146d25465546bb10651cce47ac",
                 "shasum": ""
             },
             "conflict": {
                 "3f/pygmentize": "<1.2",
+                "admidio/admidio": "<4.1.9",
                 "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3",
                 "akaunting/akaunting": "<2.1.13",
+                "alextselegidis/easyappointments": "<=1.4.3",
                 "alterphp/easyadmin-extension-bundle": ">=1.2,<1.2.11|>=1.3,<1.3.1",
                 "amazing/media2click": ">=1,<1.3.3",
                 "amphp/artax": "<1.0.6|>=2,<2.0.6",
                 "amphp/http": "<1.0.1",
                 "amphp/http-client": ">=4,<4.4",
                 "anchorcms/anchor-cms": "<=0.12.7",
+                "andreapollastri/cipi": "<=3.1.15",
                 "api-platform/core": ">=2.2,<2.2.10|>=2.3,<2.3.6",
                 "appwrite/server-ce": "<0.11.1|>=0.12,<0.12.2",
                 "area17/twill": "<1.2.5|>=2,<2.5.3",
@@ -749,18 +752,23 @@
                 "bagisto/bagisto": "<0.1.5",
                 "barrelstrength/sprout-base-email": "<1.2.7",
                 "barrelstrength/sprout-forms": "<3.9",
+                "barryvdh/laravel-translation-manager": "<0.6.2",
                 "baserproject/basercms": "<4.5.4",
                 "billz/raspap-webgui": "<=2.6.6",
                 "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3",
+                "bmarshall511/wordpress_zero_spam": "<5.2.13",
                 "bolt/bolt": "<3.7.2",
-                "bolt/core": "<4.1.13",
+                "bolt/core": "<=4.2",
                 "bottelet/flarepoint": "<2.2.1",
                 "brightlocal/phpwhois": "<=4.2.5",
+                "brotkrueml/codehighlight": "<2.7",
+                "brotkrueml/schema": "<1.13.1|>=2,<2.5.1",
+                "brotkrueml/typo3-matomo-integration": "<1.3.2",
                 "buddypress/buddypress": "<7.2.1",
                 "bugsnag/bugsnag-laravel": ">=2,<2.0.2",
                 "bytefury/crater": "<6.0.2",
                 "cachethq/cachet": "<2.5.1",
-                "cakephp/cakephp": "<4.0.6",
+                "cakephp/cakephp": "<3.10.3|>=4,<4.0.6",
                 "cardgate/magento2": "<2.0.33",
                 "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4",
                 "cartalyst/sentry": "<=2.1.6",
@@ -771,15 +779,20 @@
                 "codeigniter/framework": "<=3.0.6",
                 "codeigniter4/framework": "<4.1.9",
                 "codiad/codiad": "<=2.8.4",
-                "composer/composer": "<1.10.23|>=2-alpha.1,<2.1.9",
+                "composer/composer": "<1.10.26|>=2-alpha.1,<2.2.12|>=2.3,<2.3.5",
                 "concrete5/concrete5": "<9",
-                "concrete5/core": "<8.5.7",
+                "concrete5/core": "<8.5.8|>=9,<9.1",
                 "contao-components/mediaelement": ">=2.14.2,<2.21.1",
+                "contao/contao": ">=4,<4.4.56|>=4.5,<4.9.18|>=4.10,<4.11.7|>=4.13,<4.13.3",
                 "contao/core": ">=2,<3.5.39",
-                "contao/core-bundle": "<4.9.18|>=4.10,<4.11.7|= 4.10.0",
+                "contao/core-bundle": "<4.9.18|>=4.10,<4.11.7|>=4.13,<4.13.3|= 4.10.0",
                 "contao/listing-bundle": ">=4,<4.4.8",
-                "craftcms/cms": "<3.7.14",
+                "contao/managed-edition": "<=1.5",
+                "craftcms/cms": "<3.7.36",
                 "croogo/croogo": "<3.0.7",
+                "cuyz/valinor": "<0.12",
+                "czproject/git-php": "<4.0.3",
+                "darylldoyle/safe-svg": "<1.9.10",
                 "datadog/dd-trace": ">=0.30,<0.30.2",
                 "david-garcia/phpwhois": "<=4.3.1",
                 "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1",
@@ -793,13 +806,14 @@
                 "doctrine/mongodb-odm": ">=1,<1.0.2",
                 "doctrine/mongodb-odm-bundle": ">=2,<3.0.1",
                 "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4",
-                "dolibarr/dolibarr": "<16|>= 3.3.beta1, < 13.0.2",
-                "dompdf/dompdf": ">=0.6,<0.6.2",
+                "dolibarr/dolibarr": "<16|= 12.0.5|>= 3.3.beta1, < 13.0.2",
+                "dompdf/dompdf": "<2",
                 "drupal/core": ">=7,<7.88|>=8,<9.2.13|>=9.3,<9.3.6",
                 "drupal/drupal": ">=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4",
                 "dweeves/magmi": "<=0.7.24",
                 "ecodev/newsletter": "<=4",
                 "ectouch/ectouch": "<=2.7.2",
+                "elefant/cms": "<1.3.13",
                 "elgg/elgg": "<3.3.24|>=4,<4.0.5",
                 "endroid/qr-code-bundle": "<3.4.2",
                 "enshrined/svg-sanitize": "<0.15",
@@ -810,37 +824,43 @@
                 "ezsystems/ezdemo-ls-extension": ">=5.4,<5.4.2.1",
                 "ezsystems/ezfind-ls": ">=5.3,<5.3.6.1|>=5.4,<5.4.11.1|>=2017.12,<2017.12.0.1",
                 "ezsystems/ezplatform": "<=1.13.6|>=2,<=2.5.24",
-                "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<=1.5.25",
+                "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.27",
                 "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2.1|>=5,<5.0.1|>=5.1,<5.1.1",
-                "ezsystems/ezplatform-kernel": "<=1.2.5|>=1.3,<=1.3.1",
+                "ezsystems/ezplatform-kernel": "<=1.2.5|>=1.3,<1.3.19",
                 "ezsystems/ezplatform-rest": ">=1.2,<=1.2.2|>=1.3,<1.3.8",
                 "ezsystems/ezplatform-richtext": ">=2.3,<=2.3.7",
                 "ezsystems/ezplatform-user": ">=1,<1.0.1",
-                "ezsystems/ezpublish-kernel": "<=6.13.8.1|>=7,<7.5.26",
+                "ezsystems/ezpublish-kernel": "<=6.13.8.1|>=7,<7.5.29",
                 "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.3.5.1",
                 "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3",
                 "ezsystems/repository-forms": ">=2.3,<2.3.2.1",
                 "ezyang/htmlpurifier": "<4.1.1",
                 "facade/ignition": "<1.16.15|>=2,<2.4.2|>=2.5,<2.5.2",
+                "facturascripts/facturascripts": "<=2022.8",
                 "feehi/cms": "<=2.1.1",
                 "feehi/feehicms": "<=0.1.3",
+                "fenom/fenom": "<=2.12.1",
+                "filegator/filegator": "<7.8",
                 "firebase/php-jwt": "<2",
                 "flarum/core": ">=1,<=1.0.1",
                 "flarum/sticky": ">=0.1-beta.14,<=0.1-beta.15",
                 "flarum/tags": "<=0.1-beta.13",
                 "fluidtypo3/vhs": "<5.1.1",
+                "fof/upload": "<1.2.3",
                 "fooman/tcpdf": "<6.2.22",
-                "forkcms/forkcms": "<=5.9.2",
+                "forkcms/forkcms": "<5.11.1",
                 "fossar/tcpdf-parser": "<6.2.22",
-                "francoisjacquet/rosariosis": "<8.1.1",
+                "francoisjacquet/rosariosis": "<9.1",
                 "friendsofsymfony/oauth2-php": "<1.3",
                 "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2",
                 "friendsofsymfony/user-bundle": ">=1.2,<1.3.5",
                 "friendsoftypo3/mediace": ">=7.6.2,<7.6.5",
                 "froala/wysiwyg-editor": "<3.2.7",
+                "froxlor/froxlor": "<=0.10.22",
                 "fuel/core": "<1.8.1",
                 "gaoming13/wechat-php-sdk": "<=1.10.2",
-                "getgrav/grav": "<1.7.31",
+                "genix/cms": "<=1.1.11",
+                "getgrav/grav": "<1.7.34",
                 "getkirby/cms": "<3.5.8",
                 "getkirby/panel": "<2.5.14",
                 "gilacms/gila": "<=1.11.4",
@@ -850,25 +870,34 @@
                 "gree/jose": "<=2.2",
                 "gregwar/rst": "<1.0.3",
                 "grumpydictator/firefly-iii": "<5.6.5",
-                "guzzlehttp/guzzle": ">=4-rc.2,<4.2.4|>=5,<5.3.1|>=6,<6.2.1",
-                "helloxz/imgurl": "<=2.31",
+                "guzzlehttp/guzzle": "<6.5.8|>=7,<7.4.5",
+                "guzzlehttp/psr7": "<1.8.4|>=2,<2.1.1",
+                "helloxz/imgurl": "= 2.31|<=2.31",
                 "hillelcoren/invoice-ninja": "<5.3.35",
                 "hjue/justwriting": "<=1",
                 "hov/jobfair": "<1.0.13|>=2,<2.0.2",
+                "hyn/multi-tenant": ">=5.6,<5.7.2",
+                "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4",
                 "ibexa/post-install": "<=1.0.4",
                 "icecoder/icecoder": "<=8.1",
+                "idno/known": "<=1.3.1",
                 "illuminate/auth": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.10",
                 "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.99999|>=4.2,<=4.2.99999|>=5,<=5.0.99999|>=5.1,<=5.1.99999|>=5.2,<=5.2.99999|>=5.3,<=5.3.99999|>=5.4,<=5.4.99999|>=5.5,<=5.5.49|>=5.6,<=5.6.99999|>=5.7,<=5.7.99999|>=5.8,<=5.8.99999|>=6,<6.18.31|>=7,<7.22.4",
                 "illuminate/database": "<6.20.26|>=7,<7.30.5|>=8,<8.40",
                 "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15",
                 "illuminate/view": "<6.20.42|>=7,<7.30.6|>=8,<8.75",
-                "impresscms/impresscms": "<=1.4.2",
+                "impresscms/impresscms": "<=1.4.3",
                 "in2code/femanager": "<5.5.1|>=6,<6.3.1",
+                "in2code/lux": "<17.6.1|>=18,<24.0.2",
                 "intelliants/subrion": "<=4.2.1",
+                "islandora/islandora": ">=2,<2.4.1",
                 "ivankristianto/phpwhois": "<=4.3",
                 "jackalope/jackalope-doctrine-dbal": "<1.7.4",
                 "james-heinrich/getid3": "<1.9.21",
-                "joomla/archive": "<1.1.10",
+                "joomla/archive": "<1.1.12|>=2,<2.0.1",
+                "joomla/filesystem": "<1.6.2|>=2,<2.0.1",
+                "joomla/filter": "<1.4.4|>=2,<2.0.1",
+                "joomla/input": ">=2,<2.0.2",
                 "joomla/session": "<1.3.1",
                 "jsdecena/laracom": "<2.0.9",
                 "jsmitty12/phpwhois": "<5.1",
@@ -876,12 +905,14 @@
                 "kevinpapst/kimai2": "<1.16.7",
                 "kitodo/presentation": "<3.1.2",
                 "klaviyo/magento2-extension": ">=1,<3",
+                "krayin/laravel-crm": "<1.2.2",
                 "kreait/firebase-php": ">=3.2,<3.8.1",
                 "la-haute-societe/tcpdf": "<6.2.22",
                 "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1",
                 "laminas/laminas-http": "<2.14.2",
                 "laravel/fortify": "<1.11.1",
                 "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75",
+                "laravel/laravel": "<=9.1.8",
                 "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10",
                 "latte/latte": "<2.10.8",
                 "lavalite/cms": "<=5.8",
@@ -889,52 +920,60 @@
                 "league/commonmark": "<0.18.3",
                 "league/flysystem": "<1.1.4|>=2,<2.1.1",
                 "lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3",
-                "librenms/librenms": "<22.2.2",
+                "librenms/librenms": "<22.4",
                 "limesurvey/limesurvey": "<3.27.19",
                 "livehelperchat/livehelperchat": "<=3.91",
                 "livewire/livewire": ">2.2.4,<2.2.6",
                 "lms/routes": "<2.1.1",
                 "localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2",
+                "luyadev/yii-helpers": "<1.2.1",
                 "magento/community-edition": ">=2,<2.2.10|>=2.3,<2.3.3",
                 "magento/magento1ce": "<1.9.4.3",
                 "magento/magento1ee": ">=1,<1.14.4.3",
                 "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2-p.2",
                 "marcwillmann/turn": "<0.3.3",
-                "mautic/core": "<4.2|= 2.13.1",
+                "matyhtf/framework": "<3.0.6",
+                "mautic/core": "<4.3|= 2.13.1",
                 "mediawiki/core": ">=1.27,<1.27.6|>=1.29,<1.29.3|>=1.30,<1.30.2|>=1.31,<1.31.9|>=1.32,<1.32.6|>=1.32.99,<1.33.3|>=1.33.99,<1.34.3|>=1.34.99,<1.35",
                 "microweber/microweber": "<1.3",
                 "miniorange/miniorange-saml": "<1.4.3",
                 "mittwald/typo3_forum": "<1.2.1",
-                "modx/revolution": "<2.8",
+                "modx/revolution": "<= 2.8.3-pl|<2.8",
+                "mojo42/jirafeau": "<4.4",
                 "monolog/monolog": ">=1.8,<1.12",
-                "moodle/moodle": "<3.9.11|>=3.10-beta,<3.10.8|>=3.11,<3.11.5",
+                "moodle/moodle": "<4.0.1",
                 "mustache/mustache": ">=2,<2.14.1",
                 "namshi/jose": "<2.2",
                 "neoan3-apps/template": "<1.1.1",
+                "neorazorx/facturascripts": "<2022.4",
                 "neos/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6",
                 "neos/form": ">=1.2,<4.3.3|>=5,<5.0.9|>=5.1,<5.1.3",
-                "neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.9.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<3.3.23|>=4,<4.0.17|>=4.1,<4.1.16|>=4.2,<4.2.12|>=4.3,<4.3.3",
+                "neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.9.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<5.3.10|>=7,<7.0.9|>=7.1,<7.1.7|>=7.2,<7.2.6|>=7.3,<7.3.4|>=8,<8.0.2",
                 "neos/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5",
                 "netgen/tagsbundle": ">=3.4,<3.4.11|>=4,<4.0.15",
                 "nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6",
                 "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13",
                 "nilsteampassnet/teampass": "<=2.1.27.36",
-                "nukeviet/nukeviet": "<4.3.4",
-                "nystudio107/craft-seomatic": "<3.3",
+                "noumo/easyii": "<=0.9",
+                "nukeviet/nukeviet": "<4.5.2",
+                "nystudio107/craft-seomatic": "<3.4.12",
                 "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1",
                 "october/backend": "<1.1.2",
                 "october/cms": "= 1.1.1|= 1.0.471|= 1.0.469|>=1.0.319,<1.0.469",
                 "october/october": ">=1.0.319,<1.0.466|>=2.1,<2.1.12",
                 "october/rain": "<1.0.472|>=1.1,<1.1.2",
-                "october/system": "<1.0.475|>=1.1,<1.1.11|>=2,<2.1.27",
+                "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.15",
                 "onelogin/php-saml": "<2.10.4",
                 "oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5",
+                "open-web-analytics/open-web-analytics": "<1.7.4",
                 "opencart/opencart": "<=3.0.3.2",
                 "openid/php-openid": "<2.3",
                 "openmage/magento-lts": "<19.4.15|>=20,<20.0.13",
                 "orchid/platform": ">=9,<9.4.4",
+                "oro/commerce": ">=5,<5.0.4",
                 "oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7",
                 "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<4.2.8",
+                "packbackbooks/lti-1-3-php-library": "<5",
                 "padraic/humbug_get_contents": "<1.1.2",
                 "pagarme/pagarme-php": ">=0,<3",
                 "pagekit/pagekit": "<=1.0.18",
@@ -949,18 +988,21 @@
                 "phpfastcache/phpfastcache": "<6.1.5|>=7,<7.1.2|>=8,<8.0.7",
                 "phpmailer/phpmailer": "<6.5",
                 "phpmussel/phpmussel": ">=1,<1.6",
-                "phpmyadmin/phpmyadmin": "<4.9.8|>=5,<5.0.3|>=5.1,<5.1.2",
-                "phpoffice/phpexcel": "<1.8.2",
+                "phpmyadmin/phpmyadmin": "<5.1.3",
+                "phpoffice/phpexcel": "<1.8",
                 "phpoffice/phpspreadsheet": "<1.16",
                 "phpseclib/phpseclib": "<2.0.31|>=3,<3.0.7",
                 "phpservermon/phpservermon": "<=3.5.2",
-                "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3",
+                "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5,<5.6.3",
                 "phpwhois/phpwhois": "<=4.2.5",
                 "phpxmlrpc/extras": "<0.6.1",
-                "pimcore/pimcore": "<10.3.2",
-                "pocketmine/pocketmine-mp": "<4.0.7",
+                "pimcore/data-hub": "<1.2.4",
+                "pimcore/pimcore": "<10.4.4",
+                "pocketmine/bedrock-protocol": "<8.0.2",
+                "pocketmine/pocketmine-mp": ">= 4.0.0-BETA5, < 4.4.2|<4.2.10",
                 "pressbooks/pressbooks": "<5.18",
                 "prestashop/autoupgrade": ">=4,<4.10.1",
+                "prestashop/blockwishlist": ">=2,<2.1.1",
                 "prestashop/contactform": ">1.0.1,<4.3",
                 "prestashop/gamification": "<2.3.2",
                 "prestashop/prestashop": ">=1.7,<=1.7.8.2",
@@ -968,7 +1010,7 @@
                 "prestashop/ps_emailsubscription": "<2.6.1",
                 "prestashop/ps_facetedsearch": "<3.4.1",
                 "prestashop/ps_linklist": "<3.1",
-                "privatebin/privatebin": "<1.2.2|>=1.3,<1.3.2",
+                "privatebin/privatebin": "<1.4",
                 "propel/propel": ">=2-alpha.1,<=2-alpha.7",
                 "propel/propel1": ">=1,<=1.7.1",
                 "pterodactyl/panel": "<1.7",
@@ -976,30 +1018,35 @@
                 "pusher/pusher-php-server": "<2.2.1",
                 "pwweb/laravel-core": "<=0.3.6-beta",
                 "rainlab/debugbar-plugin": "<3.1",
-                "remdex/livehelperchat": "<3.93",
+                "remdex/livehelperchat": "<3.99",
                 "rmccue/requests": ">=1.6,<1.8",
                 "robrichards/xmlseclibs": "<3.0.4",
-                "rudloff/alltube": "<3.0.2",
-                "s-cart/s-cart": "<6.7.2",
+                "rudloff/alltube": "<3.0.3",
+                "s-cart/core": "<6.9",
+                "s-cart/s-cart": "<6.9",
                 "sabberworm/php-css-parser": ">=1,<1.0.1|>=2,<2.0.1|>=3,<3.0.1|>=4,<4.0.1|>=5,<5.0.9|>=5.1,<5.1.3|>=5.2,<5.2.1|>=6,<6.0.2|>=7,<7.0.4|>=8,<8.0.1|>=8.1,<8.1.1|>=8.2,<8.2.1|>=8.3,<8.3.1",
                 "sabre/dav": ">=1.6,<1.6.99|>=1.7,<1.7.11|>=1.8,<1.8.9",
                 "scheb/two-factor-bundle": ">=0,<3.26|>=4,<4.11",
                 "sensiolabs/connect": "<4.2.3",
                 "serluck/phpwhois": "<=4.2.6",
-                "shopware/core": "<=6.4.6",
-                "shopware/platform": "<=6.4.6",
+                "shopware/core": "<=6.4.9",
+                "shopware/platform": "<=6.4.9",
                 "shopware/production": "<=6.3.5.2",
-                "shopware/shopware": "<5.7.7",
-                "showdoc/showdoc": "<=2.10.2",
+                "shopware/shopware": "<5.7.12",
+                "shopware/storefront": "<=6.4.8.1",
+                "shopxo/shopxo": "<2.2.6",
+                "showdoc/showdoc": "<2.10.4",
                 "silverstripe/admin": ">=1,<1.8.1",
-                "silverstripe/assets": ">=1,<1.4.7|>=1.5,<1.5.2",
+                "silverstripe/assets": ">=1,<1.10.1",
                 "silverstripe/cms": "<4.3.6|>=4.4,<4.4.4",
                 "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1",
                 "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3",
-                "silverstripe/framework": "<4.10.1",
-                "silverstripe/graphql": "<3.5.2|>=4-alpha.1,<4-alpha.2",
+                "silverstripe/framework": "<4.10.9",
+                "silverstripe/graphql": "<3.5.2|>=4-alpha.1,<4-alpha.2|= 4.0.0-alpha1",
+                "silverstripe/hybridsessions": ">=1,<2.4.1|>=2.5,<2.5.1",
                 "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1",
                 "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4",
+                "silverstripe/silverstripe-omnipay": "<2.5.2|>=3,<3.0.2|>=3.1,<3.1.4|>=3.2,<3.2.1",
                 "silverstripe/subsites": ">=2,<2.1.1",
                 "silverstripe/taxonomy": ">=1.3,<1.3.1|>=2,<2.0.1",
                 "silverstripe/userforms": "<3",
@@ -1009,14 +1056,15 @@
                 "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1",
                 "simplito/elliptic-php": "<1.0.6",
                 "slim/slim": "<2.6",
-                "smarty/smarty": "<3.1.43|>=4,<4.0.3",
-                "snipe/snipe-it": "<5.3.11",
+                "smarty/smarty": "<3.1.45|>=4,<4.1.1",
+                "snipe/snipe-it": "<=6.0.2|>= 6.0.0-RC-1, <= 6.0.0-RC-5",
                 "socalnick/scn-social-auth": "<1.15.2",
                 "socialiteproviders/steam": "<1.1",
                 "spipu/html2pdf": "<5.2.4",
                 "spoonity/tcpdf": "<6.2.22",
                 "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1",
-                "ssddanbrown/bookstack": "<21.12.1",
+                "ssddanbrown/bookstack": "<22.2.3",
+                "statamic/cms": "<3.2.39|>=3.3,<3.3.2",
                 "stormpath/sdk": ">=0,<9.9.99",
                 "studio-42/elfinder": "<2.1.59",
                 "subrion/cms": "<=4.2.1",
@@ -1024,10 +1072,10 @@
                 "swiftmailer/swiftmailer": ">=4,<5.4.5",
                 "sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2",
                 "sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1",
-                "sylius/grid-bundle": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1",
+                "sylius/grid-bundle": "<1.10.1",
                 "sylius/paypal-plugin": ">=1,<1.2.4|>=1.3,<1.3.1",
                 "sylius/resource-bundle": "<1.3.14|>=1.4,<1.4.7|>=1.5,<1.5.2|>=1.6,<1.6.4",
-                "sylius/sylius": "<1.6.9|>=1.7,<1.7.9|>=1.8,<1.8.3|>=1.9,<1.9.5",
+                "sylius/sylius": "<1.9.10|>=1.10,<1.10.11|>=1.11,<1.11.2",
                 "symbiote/silverstripe-multivaluefield": ">=3,<3.0.99",
                 "symbiote/silverstripe-queuedjobs": ">=3,<3.0.2|>=3.1,<3.1.4|>=4,<4.0.7|>=4.1,<4.1.2|>=4.2,<4.2.4|>=4.3,<4.3.3|>=4.4,<4.4.3|>=4.5,<4.5.1|>=4.6,<4.6.4",
                 "symbiote/silverstripe-versionedfiles": "<=2.0.3",
@@ -1052,7 +1100,7 @@
                 "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.9",
                 "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11",
                 "symfony/security-guard": ">=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8",
-                "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8|>=5.3,<5.3.2",
+                "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7|>=5.1,<5.2.8|>=5.3,<5.3.2",
                 "symfony/serializer": ">=2,<2.0.11|>=4.1,<4.4.35|>=5,<5.3.12",
                 "symfony/symfony": ">=2,<3.4.49|>=4,<4.4.35|>=5,<5.3.12|>=5.3.14,<=5.3.14|>=5.4.3,<=5.4.3|>=6.0.3,<=6.0.3",
                 "symfony/translation": ">=2,<2.0.17",
@@ -1062,22 +1110,24 @@
                 "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7",
                 "t3/dce": ">=2.2,<2.6.2",
                 "t3g/svg-sanitizer": "<1.0.3",
+                "tastyigniter/tastyigniter": "<3.3",
                 "tecnickcom/tcpdf": "<6.2.22",
                 "terminal42/contao-tablelookupwizard": "<3.3.5",
                 "thelia/backoffice-default-template": ">=2.1,<2.1.2",
                 "thelia/thelia": ">=2.1-beta.1,<2.1.3",
                 "theonedemon/phpwhois": "<=4.2.5",
+                "thinkcmf/thinkcmf": "<=5.1.7",
                 "tinymce/tinymce": "<5.10",
                 "titon/framework": ">=0,<9.9.99",
-                "topthink/framework": "<6.0.9",
+                "topthink/framework": "<=6.0.12",
                 "topthink/think": "<=6.0.9",
                 "topthink/thinkphp": "<=3.2.3",
                 "tribalsystems/zenario": "<9.2.55826",
                 "truckersmp/phpwhois": "<=4.3.1",
                 "twig/twig": "<1.38|>=2,<2.14.11|>=3,<3.3.8",
-                "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.29|>=10,<10.4.19|>=11,<11.5",
+                "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.29|>=10,<10.4.29|>=11,<11.5.11",
                 "typo3/cms-backend": ">=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1",
-                "typo3/cms-core": ">=6.2,<=6.2.56|>=7,<=7.6.52|>=8,<=8.7.41|>=9,<9.5.29|>=10,<10.4.19|>=11,<11.5",
+                "typo3/cms-core": ">=6.2,<=6.2.56|>=7,<7.6.57|>=8,<8.7.47|>=9,<9.5.35|>=10,<10.4.29|>=11,<11.5.11",
                 "typo3/cms-form": ">=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1",
                 "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6",
                 "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.3.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<3.3.23|>=4,<4.0.17|>=4.1,<4.1.16|>=4.2,<4.2.12|>=4.3,<4.3.3",
@@ -1090,15 +1140,21 @@
                 "usmanhalalit/pixie": "<1.0.3|>=2,<2.0.2",
                 "vanilla/safecurl": "<0.9.2",
                 "verot/class.upload.php": "<=1.0.3|>=2,<=2.0.4",
-                "vrana/adminer": "<4.7.9",
+                "vrana/adminer": "<4.8.1",
                 "wallabag/tcpdf": "<6.2.22",
                 "wanglelecc/laracms": "<=1.0.3",
                 "web-auth/webauthn-framework": ">=3.3,<3.3.4",
                 "webcoast/deferred-image-processing": "<1.0.2",
                 "wikimedia/parsoid": "<0.12.2",
                 "willdurand/js-translation-bundle": "<2.1.1",
+                "wintercms/winter": "<1.0.475|>=1.1,<1.1.9",
+                "woocommerce/woocommerce": "<6.6",
                 "wp-cli/wp-cli": "<2.5",
-                "yetiforce/yetiforce-crm": "<=6.3",
+                "wp-graphql/wp-graphql": "<0.3.5",
+                "wpanel/wpanel4-cms": "<=4.3.1",
+                "wwbn/avideo": "<=11.6",
+                "yeswiki/yeswiki": "<4.1",
+                "yetiforce/yetiforce-crm": "<6.4",
                 "yidashi/yii2cmf": "<=2",
                 "yii2mod/yii2-cms": "<1.9.2",
                 "yiisoft/yii": ">=1.1.14,<1.1.15",
@@ -1117,10 +1173,10 @@
                 "zendframework/zend-crypt": ">=2,<2.4.9|>=2.5,<2.5.2",
                 "zendframework/zend-db": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.10|>=2.3,<2.3.5",
                 "zendframework/zend-developer-tools": ">=1.2.2,<1.2.3",
-                "zendframework/zend-diactoros": ">=1,<1.8.4",
-                "zendframework/zend-feed": ">=1,<2.10.3",
+                "zendframework/zend-diactoros": "<1.8.4",
+                "zendframework/zend-feed": "<2.10.3",
                 "zendframework/zend-form": ">=2,<2.2.7|>=2.3,<2.3.1",
-                "zendframework/zend-http": ">=1,<2.8.1",
+                "zendframework/zend-http": "<2.8.1",
                 "zendframework/zend-json": ">=2.1,<2.1.6|>=2.2,<2.2.6",
                 "zendframework/zend-ldap": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.8|>=2.3,<2.3.3",
                 "zendframework/zend-mail": ">=2,<2.4.11|>=2.5,<2.7.2",
@@ -1171,7 +1227,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-08T16:29:59+00:00"
+            "time": "2022-07-21T23:04:29+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -1231,34 +1287,35 @@
         },
         {
             "name": "symfony/config",
-            "version": "v4.4.42",
+            "version": "v5.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "83cdafd1bd3370de23e3dc2ed01026908863be81"
+                "reference": "8f551fe22672ac7ab2c95fe46d899f960ed4d979"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/83cdafd1bd3370de23e3dc2ed01026908863be81",
-                "reference": "83cdafd1bd3370de23e3dc2ed01026908863be81",
+                "url": "https://api.github.com/repos/symfony/config/zipball/8f551fe22672ac7ab2c95fe46d899f960ed4d979",
+                "reference": "8f551fe22672ac7ab2c95fe46d899f960ed4d979",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3",
-                "symfony/filesystem": "^3.4|^4.0|^5.0",
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/filesystem": "^4.4|^5.0|^6.0",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-php80": "^1.16",
                 "symfony/polyfill-php81": "^1.22"
             },
             "conflict": {
-                "symfony/finder": "<3.4"
+                "symfony/finder": "<4.4"
             },
             "require-dev": {
-                "symfony/event-dispatcher": "^3.4|^4.0|^5.0",
-                "symfony/finder": "^3.4|^4.0|^5.0",
-                "symfony/messenger": "^4.1|^5.0",
-                "symfony/service-contracts": "^1.1|^2",
-                "symfony/yaml": "^3.4|^4.0|^5.0"
+                "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
+                "symfony/finder": "^4.4|^5.0|^6.0",
+                "symfony/messenger": "^4.4|^5.0|^6.0",
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/yaml": "^4.4|^5.0|^6.0"
             },
             "suggest": {
                 "symfony/yaml": "To use the yaml reference dumper"
@@ -1289,7 +1346,7 @@
             "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v4.4.42"
+                "source": "https://github.com/symfony/config/tree/v5.4.9"
             },
             "funding": [
                 {
@@ -1305,32 +1362,35 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-17T07:10:14+00:00"
+            "time": "2022-05-17T10:39:36+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v4.4.43",
+            "version": "v5.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "8d0ae6d87ceea5f3a352413f9d1f71ed2234dcbd"
+                "reference": "88d1c0d38c2e60f757fa11d89cfc885f0b7f5171"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8d0ae6d87ceea5f3a352413f9d1f71ed2234dcbd",
-                "reference": "8d0ae6d87ceea5f3a352413f9d1f71ed2234dcbd",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/88d1c0d38c2e60f757fa11d89cfc885f0b7f5171",
+                "reference": "88d1c0d38c2e60f757fa11d89cfc885f0b7f5171",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3",
-                "psr/container": "^1.0",
+                "php": ">=7.2.5",
+                "psr/container": "^1.1.1",
+                "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-php80": "^1.16",
+                "symfony/polyfill-php81": "^1.22",
                 "symfony/service-contracts": "^1.1.6|^2"
             },
             "conflict": {
-                "symfony/config": "<4.3|>=5.0",
-                "symfony/finder": "<3.4",
-                "symfony/proxy-manager-bridge": "<3.4",
+                "ext-psr": "<1.1|>=2",
+                "symfony/config": "<5.3",
+                "symfony/finder": "<4.4",
+                "symfony/proxy-manager-bridge": "<4.4",
                 "symfony/yaml": "<4.4.26"
             },
             "provide": {
@@ -1338,9 +1398,9 @@
                 "symfony/service-implementation": "1.0|2.0"
             },
             "require-dev": {
-                "symfony/config": "^4.3",
-                "symfony/expression-language": "^3.4|^4.0|^5.0",
-                "symfony/yaml": "^4.4.26|^5.0"
+                "symfony/config": "^5.3|^6.0",
+                "symfony/expression-language": "^4.4|^5.0|^6.0",
+                "symfony/yaml": "^4.4.26|^5.0|^6.0"
             },
             "suggest": {
                 "symfony/config": "",
@@ -1375,7 +1435,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v4.4.43"
+                "source": "https://github.com/symfony/dependency-injection/tree/v5.4.10"
             },
             "funding": [
                 {
@@ -1391,25 +1451,93 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-22T15:01:38+00:00"
+            "time": "2022-06-26T13:00:04+00:00"
         },
         {
-            "name": "symfony/filesystem",
-            "version": "v4.4.42",
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.5.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "815412ee8971209bd4c1eecd5f4f481eacd44bf5"
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/815412ee8971209bd4c1eecd5f4f481eacd44bf5",
-                "reference": "815412ee8971209bd4c1eecd5f4f481eacd44bf5",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3",
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-02T09:53:40+00:00"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v5.4.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/36a017fa4cce1eff1b8e8129ff53513abcef05ba",
+                "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
                 "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.8",
                 "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
@@ -1438,7 +1566,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v4.4.42"
+                "source": "https://github.com/symfony/filesystem/tree/v5.4.9"
             },
             "funding": [
                 {
@@ -1454,7 +1582,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-20T08:49:14+00:00"
+            "time": "2022-05-20T13:55:35+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -1538,6 +1666,89 @@
             ],
             "time": "2022-05-24T11:49:31+00:00"
         },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.26.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.26-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-24T11:49:31+00:00"
+        },
         {
             "name": "symfony/polyfill-php73",
             "version": "v1.26.0",
@@ -1781,21 +1992,25 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v1.1.13",
+            "version": "v2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "afa00c500c2d6aea6e3b2f4862355f507bc5ebb4"
+                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/afa00c500c2d6aea6e3b2f4862355f507bc5ebb4",
-                "reference": "afa00c500c2d6aea6e3b2f4862355f507bc5ebb4",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3",
-                "psr/container": "^1.0"
+                "php": ">=7.2.5",
+                "psr/container": "^1.1",
+                "symfony/deprecation-contracts": "^2.1|^3"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
             },
             "suggest": {
                 "symfony/service-implementation": ""
@@ -1803,7 +2018,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.1-dev"
+                    "dev-main": "2.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -1840,7 +2055,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v1.1.13"
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.2"
             },
             "funding": [
                 {
@@ -1856,7 +2071,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-27T14:01:05+00:00"
+            "time": "2022-05-30T19:17:29+00:00"
         },
         {
             "name": "szepeviktor/phpstan-wordpress",

From 0b13b87a43a763e6fff334ce6c79411ff1b5df28 Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Sun, 24 Jul 2022 08:12:17 +0200
Subject: [PATCH 19/22] ensure variable is of type string

---
 inc/template-tags.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/inc/template-tags.php b/inc/template-tags.php
index 1b8c7424..aee3a5a6 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -153,14 +153,19 @@ if ( ! function_exists( 'understrap_body_attributes' ) ) {
 		if ( ! is_array( $atts ) || empty( $atts ) ) {
 			return;
 		}
+
 		$attributes = '';
 		foreach ( $atts as $name => $value ) {
 			if ( $value ) {
+				if ( ! is_string( $value ) ) {
+					continue;
+				}
 				$attributes .= sanitize_key( $name ) . '="' . esc_attr( $value ) . '" ';
 			} else {
 				$attributes .= sanitize_key( $name ) . ' ';
 			}
 		}
+
 		echo trim( $attributes ); // phpcs:ignore WordPress.Security.EscapeOutput
 	}
 }

From 8f0c0f6525824f0fbb01043d2b40aff43329702f Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Sun, 24 Jul 2022 08:48:57 +0200
Subject: [PATCH 20/22] ensure variable is instance of WP_Query

---
 inc/pagination.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/pagination.php b/inc/pagination.php
index b6ca2bc1..d7f620d7 100644
--- a/inc/pagination.php
+++ b/inc/pagination.php
@@ -41,7 +41,7 @@ if ( ! function_exists( 'understrap_pagination' ) ) {
 	 */
 	function understrap_pagination( $args = array(), $class = 'pagination' ) {
 
-		if ( ! isset( $args['total'] ) && $GLOBALS['wp_query']->max_num_pages <= 1 ) {
+		if ( ! $GLOBALS['wp_query'] instanceof WP_Query || ( ! isset( $args['total'] ) && $GLOBALS['wp_query']->max_num_pages <= 1 ) ) {
 			return;
 		}
 

From d4128945bedc99946a1915a0512b119e213a1ece Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Sun, 24 Jul 2022 08:55:12 +0200
Subject: [PATCH 21/22] add regex to silence 'no value type specified' on
 demand

---
 phpstan.neon.dist | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index a8e8a279..24b62b06 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -14,6 +14,10 @@ parameters:
 		- inc/class-wp-bootstrap-navwalker.php
 	tmpDir: .phpstan-cache
 	ignoreErrors:
+		# no value type specified in iterable type:
+		#- "#Function [a-zA-Z0-9\\()_]+ return type has no value type specified in iterable type array#"
+		#- "#Function [a-zA-Z0-9\\()_]+ has parameter \\$[a-zA-Z0-9_]+ with no value type specified in iterable type array#"
+		# has no return type specified:
 		- '#Function understrap_block_editor_setup\(\) has no return type specified.#'
 		- '#Function understrap_custom_header_setup\(\) has no return type specified.#'
 		- '#Function understrap_comment_form_comments_closed\(\) has no return type specified.#'

From 6d157d8caa68e4c41cbb76177f131ada0704ca6e Mon Sep 17 00:00:00 2001
From: IanDelMar <42134098+IanDelMar@users.noreply.github.com>
Date: Sun, 24 Jul 2022 09:03:29 +0200
Subject: [PATCH 22/22] update PHPMD baseline

---
 phpmd.baseline.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpmd.baseline.xml b/phpmd.baseline.xml
index 9a71ffa2..8ba4dd94 100644
--- a/phpmd.baseline.xml
+++ b/phpmd.baseline.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <phpmd-baseline>
   <violation rule="PHPMD\Rule\Design\LongMethod" file="inc/customizer.php"/>
+  <violation rule="PHPMD\Rule\CyclomaticComplexity" file="inc/template-tags.php"/>
   <violation rule="PHPMD\Rule\Naming\LongVariable" file="inc/widgets.php"/>
   <violation rule="PHPMD\Rule\UnusedFormalParameter" file="inc/woocommerce.php"/>
 </phpmd-baseline>