Merge pull request #890 from alleyinteractive/hotfix/query-cb

Fix issue where query callback is a non-string callable

Author: srtfisher

.github/workflows/phpunit.yml

@@ -41,9 +41,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Set up Composer caching
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-composer-dependencies
+        uses: actions/cache@v4
         with:
           path: |
             ${{ steps.composer-cache.outputs.dir }}

php/class-fieldmanager-autocomplete.php

@@ -42,7 +42,7 @@ class Fieldmanager_Autocomplete extends Fieldmanager_Field {
 	 *
 	 * The function signature should be query_callback( $match, $args );
 	 *
-	 * @var callable
+	 * @var callable|null
 	 */
 	public $query_callback = null;
 

php/datasource/class-fieldmanager-datasource-post.php

@@ -14,7 +14,7 @@ class Fieldmanager_Datasource_Post extends Fieldmanager_Datasource {
 	 * Supply a function which returns a list of posts; takes one argument,
 	 * a possible fragment.
 	 *
-	 * @var null
+	 * @var callback|null
 	 */
 	public $query_callback = null;
 
@@ -202,8 +202,20 @@ public function get_ajax_action() {
 		if ( ! empty( $this->ajax_action ) ) {
 			return $this->ajax_action;
 		}
-		$unique_key  = wp_json_encode( $this->query_args );
-		$unique_key .= (string) $this->query_callback;
+		$unique_key = wp_json_encode( $this->query_args );
+		if ( is_string( $this->query_callback ) ) {
+			$unique_key .= $this->query_callback;
+		} elseif (
+			is_array( $this->query_callback )
+			&& isset( $this->query_callback[0] )
+			&& isset( $this->query_callback[1] )
+			&& is_string( $this->query_callback[1] )
+		) {
+			$unique_key .= is_object( $this->query_callback[0] ) ? get_debug_type( $this->query_callback[0] ) : (string) $this->query_callback[0];
+			$unique_key .= $this->query_callback[1];
+		} else {
+			$unique_key .= get_debug_type( $this->query_callback );
+		}
 		$unique_key .= get_called_class();
 		return 'fm_datasource_post_' . crc32( $unique_key );
 	}

php/datasource/class-fieldmanager-datasource-user.php

@@ -14,7 +14,7 @@ class Fieldmanager_Datasource_User extends Fieldmanager_Datasource {
 	 * Supply a function which returns a list of users; takes one argument,
 	 * a possible fragment.
 	 *
-	 * @var callable
+	 * @var callable|null
 	 */
 	public $query_callback = null;