Merge branch 'main' into fix/dont-cast-arrays-as-strings

.changeset/great-pans-poke.md

@@ -0,0 +1,5 @@
+---
+"@wpengine/wp-graphql-content-blocks": patch
+---
+
+fix: Change Block:get_block_attribute_fields()`$prefix parameter be an optional`string`.

.github/workflows/upload-schema-artifact.yml

@@ -1,10 +1,9 @@
 name: Upload Schema Artifact
 
 on:
-  workflow_run:
-    workflows: ["Release"]
-    types:
-      - completed
+  push:
+    tags:
+      - "*"
 
 jobs:
   run:
@@ -22,8 +21,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
+
       - name: Setup WordPress
         uses: ./.github/actions/setup-wordpress
 
@@ -34,8 +32,9 @@ jobs:
           wp graphql generate-static-schema
 
       - name: Upload schema as release artifact
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
+          tag_name: ${{ format('v{0}',github.ref_name)}}
           files: /tmp/schema.graphql
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.gitignore

@@ -28,3 +28,9 @@ docker-compose.override.yml
 
 # Built Zip
 @wpengine
+
+# Ignore WordPress sorce directory
+wordpress/
+
+# Ignore config file from Kana development environment
+.kana.json

includes/Blocks/Block.php

@@ -185,10 +185,10 @@ private function get_attribute_type( $name, $attribute, $prefix ) {
 	/**
 	 * Gets the WPGraphQL field registration config for the block attributes.
 	 *
-	 * @param ?array      $block_attributes The block attributes.
-	 * @param string|null $prefix The current prefix string to use for the get_query_type
+	 * @param ?array $block_attributes The block attributes.
+	 * @param string $prefix The current prefix string to use for the get_query_type
 	 */
-	private function get_block_attribute_fields( ?array $block_attributes, $prefix = '' ): array {
+	private function get_block_attribute_fields( ?array $block_attributes, string $prefix = '' ): array {
 		$fields = [];
 
 		// Bail early if no attributes are defined.

phpstan-baseline.neon

@@ -15,11 +15,6 @@ parameters:
 			count: 1
 			path: includes/Blocks/Block.php
 
-		-
-			message: "#^Parameter \\#3 \\$prefix of method WPGraphQL\\\\ContentBlocks\\\\Blocks\\\\Block\\:\\:get_attribute_type\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: includes/Blocks/Block.php
-
 		-
 			message: "#^Call to an undefined method DiDom\\\\Element\\|DOMElement\\:\\:html\\(\\)\\.$#"
 			count: 1