Merge pull request #32 from wp-graphql/fix/lodash-get-restored

fix: lodashGet access restored
wp-graphql · May 2, 2024 · c18eb27 · c18eb27
2 parents 706c2d7 + 8ed3e07
commit c18eb27
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 19 deletions.
diff --git a/src/Constraint/QueryConstraint.php b/src/Constraint/QueryConstraint.php
@@ -11,8 +11,9 @@
 
 use PHPUnit\Framework\Exception;
 use PHPUnit\Framework\Constraint\Constraint;
-use Test\WPGraphQL\Logger\CodeceptLogger;
-use Test\WPGraphQL\Logger\PHPUnitLogger;
+use Tests\WPGraphQL\Logger\CodeceptLogger;
+use Tests\WPGraphQL\Logger\PHPUnitLogger;
+use Tests\WPGraphQL\Utils\Utils;
 
 class QueryConstraint extends Constraint {
 
@@ -418,24 +419,11 @@ protected function getPossibleDataAtPath( array $data, string $path, &$is_group
 	 * @param array  $object   The object to query.
 	 * @param string $path     The path of the property to get.
 	 * @param mixed  $default  The value returned for undefined resolved values.
-	 * @return void
+	 * 
+	 * @return mixed
 	 */
 	protected function lodashGet( array $data, string $string, $default = null ) {
-		$arrStr = explode( '.', $string );
-		if ( ! is_array( $arrStr ) ) {
-			$arrStr = [ $arrStr ];
-		}
-
-		$result = $data;
-		foreach ( $arrStr as $lvl ) {
-			if ( ! is_null( $lvl ) && isset( $result[ $lvl ] ) ) {
-				$result = $result[ $lvl ];
-			} else {
-				$result = $default;
-			}
-		}
-
-		return $result;
+		return Utils::lodashGet( $data, $string, $default );
 	}
 
     /**

diff --git a/src/TestCase/WPGraphQLTestCommon.php b/src/TestCase/WPGraphQLTestCommon.php
@@ -12,6 +12,7 @@
 use Tests\WPGraphQL\Constraint\QueryConstraint;
 use Tests\WPGraphQL\Constraint\QueryErrorConstraint;
 use Tests\WPGraphQL\Constraint\QuerySuccessfulConstraint;
+use Tests\WPGraphQL\Utils\Utils;
 
 /**
  * trait WPGraphQLTestCommon
@@ -211,14 +212,29 @@ public static function assertQuerySuccessful( array $response, array $expected =
 	 * @param string $message   Error message.
 	 * @return void
 	 */
-	public function assertQueryError( array $response, array $expected = [], $message = '' ) {
+	public static function assertQueryError( array $response, array $expected = [], $message = '' ) {
 		static::assertThat(
 			$response,
 			new QueryErrorConstraint( static::getLogger(), $expected ),
 			$message
 		);
 	}
 
+	/**
+	 * The value returned for undefined resolved values.
+	 *
+	 * Clone of the "get" function from the Lodash JS libra
+	 *
+	 * @param array  $object   The object to query.
+	 * @param string $path     The path of the property to get.
+	 * @param mixed  $default  The value returned for undefined resolved values.
+	 *
+	 * @return mixed
+	 */
+	public static function lodashGet( array $data, string $string, $default = null ) {
+		return Utils::lodashGet( $data, $string, $default );
+	}
+
 	/**
 	 * Returns the logger instance
 	 * 

diff --git a/src/Utils/Utils.php b/src/Utils/Utils.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Utils class
+ * 
+ * @since TBD
+ * @package Tests\WPGraphQL\Utils
+ */
+
+namespace Tests\WPGraphQL\Utils;
+
+class Utils {
+    /**
+	 * The value returned for undefined resolved values.
+	 *
+	 * Clone of the "get" function from the Lodash JS libra
+	 *
+	 * @param array  $object   The object to query.
+	 * @param string $path     The path of the property to get.
+	 * @param mixed  $default  The value returned for undefined resolved values.
+	 * @return void
+	 */
+    public static function lodashGet( array $data, string $string, $default = null ) {
+		$arrStr = explode( '.', $string );
+		if ( ! is_array( $arrStr ) ) {
+			$arrStr = [ $arrStr ];
+		}
+
+		$result = $data;
+		foreach ( $arrStr as $lvl ) {
+			if ( ! is_null( $lvl ) && isset( $result[ $lvl ] ) ) {
+				$result = $result[ $lvl ];
+			} else {
+				$result = $default;
+			}
+		}
+
+		return $result;
+	}
+}