Merge branch 'trunk' into try/adding-transform

Author: ryanwelcher

.github/workflows/phpunit.yml

@@ -1,4 +1,4 @@
-name: PHP Composer
+name: PHPUnit
 
 on:
   push:

composer.json

@@ -34,6 +34,9 @@
 		"phpunit/phpunit": "^8.5",
 		"yoast/phpunit-polyfills": "^2.0"
 	},
+	"require": {
+		"php": ">=7.4"
+	},
 	"config": {
 		"allow-plugins": {
 			"dealerdirect/phpcodesniffer-composer-installer": true,

includes/Query_Params_Generator.php

@@ -57,9 +57,9 @@ class Query_Params_Generator {
 	 * @param array $default_params Default values from the default block.
 	 * @param array $custom_params  Custom values from AQL.
 	 */
-	public function __construct( array $default_params, array $custom_params ) {
-		$this->default_params = $default_params;
-		$this->custom_params  = $custom_params;
+	public function __construct( $default_params, $custom_params ) {
+		$this->default_params = is_array( $default_params ) ? $default_params : [];
+		$this->custom_params  = is_array( $custom_params ) ? $custom_params : [];
 	}
 
 	/**
@@ -76,9 +76,11 @@ public function has_custom_param( string $param_name ): bool {
 	 *
 	 * @param string $name The param to retrieve.
 	 *
+	 * @todo Return mixed type hint for 8.0
+	 *
 	 * @return mixed
 	 */
-	public function get_custom_param( string $name ): mixed {
+	public function get_custom_param( string $name ) {
 		if ( $this->has_custom_param( $name ) ) {
 			return $this->custom_params[ $name ];
 		}

includes/query-loop.php

@@ -58,7 +58,7 @@ function ( $pre_render, $parsed_block ) {
 					'query_loop_block_query_vars',
 					function ( $default_query, $block ) {
 						// Retrieve the query from the passed block context.
-						$block_query = $block->context['query'];
+						$block_query = $block->context['query'] ?? [];
 
 						// Process all of the params
 						$qpg = new Query_Params_Generator( $default_query, $block_query );

index.php

@@ -3,7 +3,7 @@
  * Plugin Name:       Advanced Query Loop
  * Description:       Query loop block variations to create custom queries.
  * Plugin URI:        https://github.com/ryanwelcher/advanced-query-loop/
- * Version:           3.0.0
+ * Version:           3.0.1
  * Requires at least: 6.2
  * Requires PHP:      7.4
  * Author:            Ryan Welcher

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "advanced-query-loop",
-	"version": "3.0.0",
+	"version": "3.0.1",
 	"description": "Query loop block variations to create custom queries.",
 	"main": "index.js",
 	"scripts": {

readme.md

@@ -1,5 +1,7 @@
 # Advanced Query Loop
 
+![Unit Tests](https://github.com/ryanwelcher/advanced-query-loop/actions/workflows/phpunit.yml/badge.svg?branch=trunk)
+
 ## Description
 
 This plugin introduces a Query Loop block variation that will empower users to be able to do much more complicated queries with the Query Loop block, such number of posts to display and post meta

readme.txt

@@ -3,7 +3,7 @@ Contributors: welcher
 Tags: Query Loop, Custom Queries
 Requires at least: 6.2
 Tested up to: 6.5.2
-Stable tag: 3.0.0
+Stable tag: 3.0.1
 Requires PHP: 7.4
 License: GPL v2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -65,6 +65,9 @@ Sort in ascending or descending order by:
 3. Query posts before a date, after a date or between two dates.
 
 == Changelog ==
+= 3.0.1 =
+* Addresses some PHP fatal errors caused by type hinting.
+
 = 3.0.0 =
 * Add Sorting by Included Posts IDs.
 * Add sorting by Comment Count.

tests/unit/Query_Params_Generator_Tests.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Tests for the Query_Params_Generator class functions
+ */
+
+namespace AdvancedQueryLoop\UnitTests;
+
+use AdvancedQueryLoop\Query_Params_Generator;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test the generator class
+ */
+class Query_Params_Generator_Tests extends TestCase {
+
+	/**
+	 * Data provider for the empty array tests
+	 *
+	 * @return array
+	 */
+	public function data_empty_null_passed_constructor() {
+		return array(
+			array(
+				null,
+				null,
+			),
+			array(
+				array(),
+				null,
+			),
+			array(
+				null,
+				array(),
+			),
+			array(
+				array(),
+				array(),
+			),
+		);
+	}
+
+	/**
+	 * All of these tests will return empty arrays
+	 *
+	 * @param null|array $default_data The params coming from the default block.
+	 * @param null|array $custom_data  The params coming from AQL.
+	 *
+	 * @dataProvider data_empty_null_passed_constructor
+	 */
+	public function test_empty_null_passed_constructor( $default_data, $custom_data ) {
+
+		$qpg = new Query_Params_Generator( $default_data, $custom_data, );
+		$qpg->process_all();
+
+		// Empty arrays return empty.
+		$this->assertEmpty( $qpg->get_query_args() );
+	}
+}