PB-41252 fixes the rendering of entities when the v5 flag is down

Author: pabloelcolombiano

plugins/PassboltCe/Metadata/src/Service/Folders/MetadataFoldersRenderService.php

@@ -48,17 +48,21 @@ public function renderFolder(array $folder, bool $isV5): array
     public function renderFolders(array $folders): array
     {
         $isV5Enabled = Configure::read('passbolt.v5.enabled');
-        foreach ($folders as $key => &$folder) {
+        $result = [];
+
+        foreach ($folders as $folder) {
             // For performance reason, the detection of a v5 resource is made on the
             // presence of metadata
             $isV5 = !empty($folder['metadata']);
+
+            // Do not return v5 resource if v5 flag is disabled
             if ($isV5 && !$isV5Enabled) {
-                unset($folders[$key]);
-            } else {
-                $folder = $this->renderFolder($folder, $isV5);
+                continue;
             }
+
+            $result[] = $this->renderFolder($folder, $isV5);
         }
 
-        return $folders;
+        return $result;
     }
 }

plugins/PassboltCe/Metadata/src/Service/MetadataResourcesRenderService.php

@@ -48,17 +48,21 @@ public function renderResource(array $resource, bool $isV5): array
     public function renderResources(array $resources): array
     {
         $isV5Enabled = Configure::read('passbolt.v5.enabled');
-        foreach ($resources as $i => &$resource) {
+        $result = [];
+
+        foreach ($resources as $resource) {
             // For performance reason, the detection of a v5 resource is made on the
             // presence of metadata
             $isResourceV5 = !empty($resource[MetadataResourceDto::METADATA]);
+
+            // Do not return v5 resource if v5 flag is disabled
             if ($isResourceV5 && !$isV5Enabled) {
-                unset($resources[$i]);
-            } else {
-                $resource = $this->renderResource($resource, $isResourceV5);
+                continue;
             }
+
+            $result[] = $this->renderResource($resource, $isResourceV5);
         }
 
-        return $resources;
+        return $result;
     }
 }

plugins/PassboltCe/Metadata/tests/TestCase/Controller/Folders/MetadataFoldersIndexControllerTest.php

@@ -20,8 +20,10 @@
 use App\Test\Factory\GpgkeyFactory;
 use App\Test\Factory\UserFactory;
 use App\Test\Lib\AppIntegrationTestCaseV5;
+use Cake\Core\Configure;
 use Passbolt\Folders\FoldersPlugin;
 use Passbolt\Folders\Test\Factory\FolderFactory;
+use Passbolt\Metadata\Model\Dto\MetadataFolderDto;
 use Passbolt\Metadata\Test\Factory\MetadataKeyFactory;
 use Passbolt\Metadata\Test\Utility\GpgMetadataKeysTestTrait;
 
@@ -286,4 +288,23 @@ public function testMetadataFoldersIndexController_Success_FilterHasParent()
         $this->assertSame($metadata, $result['metadata']);
         $this->assertSame($parentFolder->get('id'), $result['folder_parent_id']);
     }
+
+    public function testMetadataFoldersIndexController_Metadata_Disabled_Success(): void
+    {
+        Configure::write('passbolt.v5.enabled', false);
+
+        $user = $this->logInAsUser();
+        FolderFactory::make(3)->withPermissionsFor([$user])->persist();
+        FolderFactory::make(3)->withPermissionsFor([$user])->v5Fields([
+            'metadata' => 'foo',
+        ])->persist();
+
+        $this->getJson('/folders.json?sort=Folders.modified');
+        $this->assertSuccess();
+        $response = (array)json_decode(json_encode($this->_responseJsonBody), true);
+        $this->assertCount(3, $response);
+        $this->assertSame([0, 1, 2], array_keys($response));
+        $folderV4 = array_pop($response);
+        $this->assertArrayHasAttributes(MetadataFolderDto::V4_META_PROPS, $folderV4);
+    }
 }

plugins/PassboltCe/Metadata/tests/TestCase/Controller/Resources/MetadataResourcesIndexControllerTest.php

@@ -56,13 +56,14 @@ public function testMetadataResourcesIndexController_Metadata_Disabled_Success()
         Configure::write('passbolt.v5.enabled', false);
 
         $user = $this->logInAsUser();
-        ResourceFactory::make()->withPermissionsFor([$user])->persist();
-        ResourceFactory::make()->withPermissionsFor([$user])->v5Fields()->persist();
+        ResourceFactory::make(3)->withPermissionsFor([$user])->persist();
+        ResourceFactory::make(3)->withPermissionsFor([$user])->v5Fields()->persist();
 
-        $this->getJson('/resources.json');
+        $this->getJson('/resources.json?sort=Resources.modified');
         $this->assertSuccess();
-        $response = json_decode(json_encode($this->_responseJsonBody), true);
-        $this->assertCount(1, $response);
+        $response = (array)json_decode(json_encode($this->_responseJsonBody), true);
+        $this->assertCount(3, $response);
+        $this->assertSame([0, 1, 2], array_keys($response));
         $resourceV4 = array_pop($response);
         $this->assertArrayHasAttributes(MetadataResourceDto::V4_META_PROPS, $resourceV4);
     }

psalm-baseline-v5-upgrade.xml

@@ -495,11 +495,6 @@
       <code><![CDATA[MetadataTypesSettingsFactory]]></code>
     </MethodSignatureMismatch>
   </file>
-  <file src="plugins/PassboltCe/Metadata/tests/TestCase/Controller/Resources/MetadataResourcesIndexControllerTest.php">
-    <InvalidArgument>
-      <code><![CDATA[$response]]></code>
-    </InvalidArgument>
-  </file>
   <file src="plugins/PassboltCe/Mobile/src/Model/Table/TransfersTable.php">
     <ImplementedParamTypeMismatch>
       <code><![CDATA[\Passbolt\Mobile\Model\Entity\Transfer get($primaryKey, ?array $options = [])]]></code>