Merge pull request #543 from Smartling/WP-911

add support for ACF `relation` field groups (WP-911)

Author: vsolovei-smartling

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "smartling/wordpress-connector",
   "license": "GPL-2.0-or-later",
-  "version": "3.9.10",
+  "version": "3.9.11",
   "description": "",
   "type": "wordpress-plugin",
   "repositories": [

inc/Smartling/Services/ContentRelationsDiscoveryService.php

@@ -711,7 +711,13 @@ public function getReferencesFromAcf(GutenbergBlock $block): array
                 AcfDynamicSupport::REFERENCED_TYPE_POST,
             ], true)) {
                 $referencedValue = $block->getAttributes()['data'][substr($attribute, 1)] ?? null;
-                if (is_numeric($referencedValue)) {
+                if (is_array($referencedValue)) {
+                    foreach ($referencedValue as $innerReferencedValue) {
+                        if (is_numeric($innerReferencedValue)) {
+                            $result[] = (int)$innerReferencedValue;
+                        }
+                    }
+                } elseif (is_numeric($referencedValue)) {
                     $result[] = (int)$referencedValue;
                 }
             }

readme.txt

@@ -4,7 +4,7 @@ Tags: translation, localization, localisation, translate, multilingual, smartlin
 Requires at least: 5.5
 Tested up to: 6.4.1
 Requires PHP: 8.0
-Stable tag: 3.9.10
+Stable tag: 3.9.11
 License: GPLv2 or later
 
 Translate content in WordPress quickly and seamlessly with Smartling, the industry-leading Translation Management System.
@@ -62,6 +62,9 @@ Additional information on the Smartling Connector for WordPress can be found [he
 3. Track translation status within WordPress from the Submissions Board. View overall progress of submitted translation requests as well as resend updated content.
 
 == Changelog ==
+= 3.9.11 =
+* Added related content detection for ACF field groups with group type `relation`
+
 = 3.9.10 =
 * Added logging of registered post types
 

smartling-connector.php

@@ -11,7 +11,7 @@
  * Plugin Name:       Smartling Connector
  * Plugin URI:        https://www.smartling.com/products/automate/integrations/wordpress/
  * Description:       Integrate your WordPress site with Smartling to upload your content and download translations.
- * Version:           3.9.10
+ * Version:           3.9.11
  * Author:            Smartling
  * Author URI:        https://www.smartling.com
  * License:           GPL-2.0+

…/ContentRelationDiscoveryServiceTest.php …ContentRelationsDiscoveryServiceTest.phptests/Services/ContentRelationDiscoveryServiceTest.php renamed to tests/Services/ContentRelationsDiscoveryServiceTest.php tests/Services/ContentRelationDiscoveryServiceTest.php renamed to tests/Services/ContentRelationsDiscoveryServiceTest.php

@@ -67,7 +67,7 @@ function apply_filters($a, ...$b) {
     use Smartling\Tuner\MediaAttachmentRulesManager;
     use Smartling\Vendor\Smartling\AuditLog\Params\CreateRecordParameters;
 
-    class ContentRelationDiscoveryServiceTest extends TestCase
+    class ContentRelationsDiscoveryServiceTest extends TestCase
     {
         private ?\Exception $exception = null;
         protected function setUp(): void
@@ -750,19 +750,28 @@ public function testAcfReferencesDetected() {
             $irrelevantKey = 'field_5d5db4597e812';
 
             $acfDynamicSupport = $this->createMock(AcfDynamicSupport::class);
-            $acfDynamicSupport->expects($this->exactly(2))->method('getReferencedTypeByKey')
-                ->withConsecutive([$attachmentKey], [$irrelevantKey])
-                ->willReturnOnConsecutiveCalls(AcfDynamicSupport::REFERENCED_TYPE_MEDIA, AcfDynamicSupport::REFERENCED_TYPE_NONE);
+            $matcher = $this->exactly(2);
+            $acfDynamicSupport->expects($matcher)->method('getReferencedTypeByKey')
+                ->willReturnCallback(function ($key) use ($attachmentKey, $irrelevantKey, $matcher) {
+                    switch ($matcher->getInvocationCount()) {
+                        case 1:
+                            $this->assertEquals($attachmentKey, $key);
+
+                            return AcfDynamicSupport::REFERENCED_TYPE_MEDIA;
+                        case 2:
+                            $this->assertEquals($irrelevantKey, $key);
+
+                            return AcfDynamicSupport::REFERENCED_TYPE_NONE;
+                    }
+                    $this->fail('Expected two calls');
+                });
 
             $x = $this->getContentRelationDiscoveryService(
                 $this->createMock(ApiWrapper::class),
                 $this->createMock(ContentHelper::class),
                 $this->createMock(SettingsManager::class),
                 $this->createMock(SubmissionManager::class),
-                null,
-                null,
-                null,
-                $acfDynamicSupport
+                acfDynamicSupport: $acfDynamicSupport,
             );
 
             $this->assertEquals([$attachmentId], $x->getReferencesFromAcf(new GutenbergBlock('acf/gallery-carousel', [
@@ -777,6 +786,28 @@ public function testAcfReferencesDetected() {
             ], [], '', [])));
         }
 
+        public function testAcfReferencesArraysDetected() {
+            $acfDynamicSupport = $this->createMock(AcfDynamicSupport::class);
+            $acfDynamicSupport->expects($this->once())->method('getReferencedTypeByKey')
+                ->willReturn(AcfDynamicSupport::REFERENCED_TYPE_POST);
+
+            $x = $this->getContentRelationDiscoveryService(
+                $this->createMock(ApiWrapper::class),
+                $this->createMock(ContentHelper::class),
+                $this->createMock(SettingsManager::class),
+                $this->createMock(SubmissionManager::class),
+                acfDynamicSupport: $acfDynamicSupport,
+            );
+
+            $this->assertEquals([22892, 22893], $x->getReferencesFromAcf(new GutenbergBlock('acf/gallery-carousel', [
+                'name' => 'acf/testimonial-slider',
+                'data' => [
+                    'testimonials_slider' => ["22892", "22893"],
+                    '_testimonials_slider' => 'field_66c32d42be1aa',
+                ]
+            ], [], '', [])));
+        }
+
         public function testGetRelations()
         {
             $contentType = 'post';