PHPCS Cleanup

.deploy/config/local-config-dokku.php

@@ -9,10 +9,8 @@
  *
  * @param string $key
  * @param string $default
- *
- * @return string|bool
  */
-function fromenv( string $key, mixed $default = null ) {
+function fromenv( string $key, mixed $default = null ): string|array|bool {
 	$value = getenv( $key );
 	if ( $value === false ) {
 		$value = $default;

composer.json

@@ -111,7 +111,6 @@
 	},
 	"require": {
 		"php": "^8.0|^8.1",
-		"block-editor-custom-alignments/block-editor-custom-alignments": "*",
 		"composer/installers": "^2.2",
 		"gravityforms/gravityforms": "*",
 		"humanmade/s3-uploads": "^3.0",

phpcs.xml.dist

@@ -10,7 +10,7 @@
 	<!--  Update to the PHP version your production/local docker container runs on -->
 	<config name="testVersion" value="8.0" />
 	<!-- php -r 'echo PHP_VERSION_ID;' -->
-	<config name="php_version" value="70407" />
+	<config name="php_version" value="80118" />
 
 	<!-- Fix WordPress's terrible typing breaking PHPCS -->
 	<config name="minimum_supported_wp_version" value="6.0.2" />

wp-content/plugins/core/src/Assets/Admin_Assets_Enqueuer.php

@@ -77,7 +77,7 @@ public function update_login_header(): void {
 					padding-top: 86px;
 				}
 			</style>',
-			$login_logo
+			esc_url( $login_logo )
 		);
 	}
 

wp-content/plugins/core/src/Core.php

@@ -8,10 +8,7 @@ class Core {
 
 	public const PLUGIN_FILE = 'plugin.file';
 
-	/**
-	 * @var \Psr\Container\ContainerInterface|\Invoker\InvokerInterface|\DI\FactoryInterface
-	 */
-	private $container;
+	private \Psr\Container\ContainerInterface|\Invoker\InvokerInterface|\DI\FactoryInterface $container;
 
 	/**
 	 * @var string[] Names of classes implementing Definer_Interface.
@@ -56,10 +53,7 @@ public function init( string $plugin_path ): void {
 		$this->init_container( $plugin_path );
 	}
 
-	/**
-	 * @return \Psr\Container\ContainerInterface|\Invoker\InvokerInterface|\DI\FactoryInterface
-	 */
-	public function container() {
+	public function container(): \Psr\Container\ContainerInterface|\Invoker\InvokerInterface|\DI\FactoryInterface {
 		return $this->container;
 	}
 

wp-content/themes/core/blocks/tribe/post-permalink/render.php

@@ -3,6 +3,6 @@
 $post_permalink = get_the_permalink();
 ?>
 
-<div <?php echo get_block_wrapper_attributes(); ?>>
+<div <?php echo wp_kses_data( get_block_wrapper_attributes() ); ?>>
 	<span class="wp-block-tribe-post-permalink__label"><?php esc_html_e( $post_permalink, 'tribe' ); ?></span>
 </div>

wp-content/themes/core/blocks/tribe/post-type-name/render.php

@@ -1,19 +1,19 @@
 <?php declare(strict_types=1);
 
 // this gets us the post type, but we really want the name
-$post_type = get_post_type();
+$block_post_type = get_post_type();
 
-if ( ! $post_type ) {
+if ( ! $block_post_type ) {
 	return;
 }
 
-$post_object = get_post_type_object( $post_type );
+$post_object = get_post_type_object( $block_post_type );
 
 if ( ! $post_object ) {
 	return;
 }
 ?>
 
-<div <?php echo get_block_wrapper_attributes(); ?>>
+<div <?php echo wp_kses_data( get_block_wrapper_attributes() ); ?>>
 	<span class="wp-block-tribe-post-type-name__label"><?php esc_html_e( $post_object->labels->singular_name, 'tribe' ); ?></span>
 </div>

wp-content/themes/core/blocks/tribe/query-results-count/render.php

@@ -19,6 +19,6 @@
 }
 ?>
 
-<div <?php echo get_block_wrapper_attributes(); ?>>
+<div <?php echo wp_kses_data( get_block_wrapper_attributes() ); ?>>
 	<p><?php echo wp_kses_post( $output ); ?></p>
 </div>

wp-content/themes/core/blocks/tribe/terms/render.php

@@ -10,24 +10,24 @@
  * @var \WP_Block $block          The instance of the WP_Block class that represents the block being rendered.
  */
 
-$terms_block = new Terms_Block( $attributes );
-$terms       = $terms_block->get_the_terms();
+$terms_block       = new Terms_Block( $attributes );
+$terms_block_terms = $terms_block->get_the_terms();
 
-echo '<div ' . get_block_wrapper_attributes() . '>';
+echo '<div ' .  wp_kses_data( get_block_wrapper_attributes() ) . '>';
 
-if ( 0 === count( $terms ) ) {
+if ( 0 === count( $terms_block_terms ) ) {
 	echo '<!-- Terms block: No terms to list. -->';
 	echo '</div>';
 
 	return;
 }
 
-if ( count( $terms ) > 1 ) {
+if ( count( $terms_block_terms ) > 1 ) {
 	echo  '<ul class="wp-block-tribe-terms__list">';
 }
 
-foreach ( $terms as $term ) {
-	if ( count( $terms ) > 1 ) {
+foreach ( $terms_block_terms as $term ) {
+	if ( count( $terms_block_terms ) > 1 ) {
 		echo '<li class="wp-block-tribe-terms__term">';
 	}
 
@@ -36,7 +36,7 @@
 	if ( $terms_block->display_as_links() ) {
 		echo sprintf(
 			'<a href="%s" class="wp-block-tribe-terms__link t-category">%s</a>',
-			esc_url( get_term_link( $term ) ),
+			esc_url( get_term_link( $term ) ?? '' ),
 			esc_html( $term->name )
 		);
 	} else {
@@ -48,12 +48,12 @@
 
 	echo '</span>';
 
-	if ( count( $terms ) > 1 ) { // phpcs:ignore SlevomatCodingStandard.ControlStructures.EarlyExit.EarlyExitNotUsed
+	if ( count( $terms_block_terms ) > 1 ) { // phpcs:ignore SlevomatCodingStandard.ControlStructures.EarlyExit.EarlyExitNotUsed
 		echo '</li>';
 	}
 }
 
-if ( count( $terms ) > 1 ) {
+if ( count( $terms_block_terms ) > 1 ) {
 	echo '</ul>';
 }