Merge branch 'master' of github.com:ashhitch/wp-graphql-yoast-seo

Author: ashhitch

includes/helpers/functions.php

@@ -64,7 +64,7 @@ function wp_gql_seo_get_og_image($images)
     if (isset($image['id']) && $url === $image['url']) {
         return $image['id'];
     }
-    return wpcom_vip_attachment_url_to_postid($url);
+    return wp_gql_seo_attachment_url_to_postid($url);
 }
 
 /**
@@ -85,48 +85,69 @@ function wp_gql_seo_get_field_key($field_key)
 
 /**
  * Generate cache key for attachment URL.
+ * Only declare if not already defined (e.g., by VIP platform).
  *
  * @param string $url URL to generate cache key for.
  * @return string
  */
-function wpcom_vip_attachment_cache_key($url)
-{
-    return 'wpcom_vip_attachment_url_post_id_' . md5($url);
+if (!function_exists('wpcom_vip_attachment_cache_key')) {
+    function wpcom_vip_attachment_cache_key($url)
+    {
+        return 'wpcom_vip_attachment_url_post_id_' . md5($url);
+    }
 }
 
 /**
  * Get post ID from attachment URL with caching.
+ * Only declare if not already defined (e.g., by VIP platform).
  *
  * @param string $url URL to get post ID for.
  * @return int|null
  */
-function wpcom_vip_attachment_url_to_postid($url)
-{
-    $cache_key = wpcom_vip_attachment_cache_key($url);
-    $id = wp_cache_get($cache_key);
-    if (false === $id) {
-        $id = attachment_url_to_postid($url); // phpcs:ignore
-        if (empty($id)) {
-            wp_cache_set(
-                $cache_key,
-                'not_found',
-                'default',
-                12 * HOUR_IN_SECONDS + mt_rand(0, 4 * HOUR_IN_SECONDS) // phpcs:ignore
-            );
-            $id = null; // Set $id to null instead of false
-        } else {
-            wp_cache_set(
-                $cache_key,
-                $id,
-                'default',
-                24 * HOUR_IN_SECONDS + mt_rand(0, 12 * HOUR_IN_SECONDS) // phpcs:ignore
-            );
+if (!function_exists('wpcom_vip_attachment_url_to_postid')) {
+    function wpcom_vip_attachment_url_to_postid($url)
+    {
+        $cache_key = wpcom_vip_attachment_cache_key($url);
+        $id = wp_cache_get($cache_key);
+        if (false === $id) {
+            $id = attachment_url_to_postid($url); // phpcs:ignore
+            if (empty($id)) {
+                wp_cache_set(
+                    $cache_key,
+                    'not_found',
+                    'default',
+                    12 * HOUR_IN_SECONDS + mt_rand(0, 4 * HOUR_IN_SECONDS) // phpcs:ignore
+                );
+                $id = null; // Set $id to null instead of false
+            } else {
+                wp_cache_set(
+                    $cache_key,
+                    $id,
+                    'default',
+                    24 * HOUR_IN_SECONDS + mt_rand(0, 12 * HOUR_IN_SECONDS) // phpcs:ignore
+                );
+            }
+        } elseif ('not_found' === $id) {
+            return false;
         }
-    } elseif ('not_found' === $id) {
-        return null; // Return null instead of false
+
+        return $id;
     }
+}
 
-    return $id;
+/**
+ * Wrapper for wpcom_vip_attachment_url_to_postid that returns null instead of false.
+ * This is needed for GraphQL compatibility - fixes
+ * "Cannot return null for non-nullable field 'MediaItem.id'" errors.
+ *
+ * @see https://github.com/ashhitch/wp-graphql-yoast-seo/issues/132
+ * @param string $url URL to get post ID for.
+ * @return int|null
+ */
+function wp_gql_seo_attachment_url_to_postid($url)
+{
+    $id = wpcom_vip_attachment_url_to_postid($url);
+    return (false === $id || empty($id)) ? null : $id;
 }
 
 /**

includes/resolvers/post-type.php

@@ -73,7 +73,7 @@ function wp_gql_seo_get_post_type_graphql_fields($post, array $args, AppContext
                 return null;
             }
 
-            $id = wpcom_vip_attachment_url_to_postid($twitter_image);
+            $id = wp_gql_seo_attachment_url_to_postid($twitter_image);
 
             return $context->get_loader('post')->load_deferred(absint($id));
         },