fix(php-yoshi): do not add version to root version map (#2199)

* fix: do not add version to root version map * add versionmap for directories * add test case * chore: fix lint --------- Co-authored-by: Jeff Ching <chingor@google.com>
googleapis · Jan 26, 2024 · 32a972a · 32a972a
1 parent 03e12ef
commit 32a972a
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 2 deletions.
diff --git a/src/strategies/php-yoshi.ts b/src/strategies/php-yoshi.ts
@@ -114,7 +114,6 @@ export class PHPYoshi extends BaseStrategy {
           splitCommits[directory]
         );
         versionsMap.set(composer.name, newVersion);
-        versionsMap.set('version', newVersion);
         const partialReleaseNotes = await this.changelogNotes.buildNotes(
           splitCommits[directory],
           {
@@ -173,6 +172,16 @@ export class PHPYoshi extends BaseStrategy {
           version,
         }),
       });
+      const directoryVersion: VersionsMap = new Map();
+      directoryVersion.set('version', version);
+      updates.push({
+        path: this.addPath(`${directory}/composer.json`),
+        createIfMissing: false,
+        updater: new RootComposerUpdatePackages({
+          version,
+          versionsMap: directoryVersion,
+        }),
+      });
       if (componentInfo.composer.extra?.component?.entry) {
         updates.push({
           path: this.addPath(

diff --git a/test/strategies/php-yoshi.ts b/test/strategies/php-yoshi.ts
@@ -64,7 +64,9 @@ describe('PHPYoshi', () => {
       .resolves(buildGitHubFileRaw('0.1.2'));
     getFileStub
       .withArgs('Client1/composer.json', 'main')
-      .resolves(buildGitHubFileRaw('{"name": "google/client1"}'));
+      .resolves(
+        buildGitHubFileRaw('{"name": "google/client1", "version": "1.2.3"}')
+      );
     getFileStub
       .withArgs('Client2/composer.json', 'main')
       .resolves(buildGitHubFileRaw('{"name": "google/client2"}'));
@@ -164,8 +166,15 @@ describe('PHPYoshi', () => {
       );
       const updates = release!.updates;
       assertHasUpdate(updates, 'Client1/VERSION', DefaultUpdater);
+      assertHasUpdate(
+        updates,
+        'Client1/composer.json',
+        RootComposerUpdatePackages
+      );
       assertHasUpdate(updates, 'Client2/VERSION', DefaultUpdater);
+      assertHasUpdate(updates, 'Client2/composer.json');
       assertHasUpdate(updates, 'Client3/VERSION', DefaultUpdater);
+      assertHasUpdate(updates, 'Client3/composer.json');
       assertHasUpdate(updates, 'Client3/src/Entry.php', PHPClientVersion);
     });
     it('ignores non client top level directories', async () => {
@@ -194,10 +203,41 @@ describe('PHPYoshi', () => {
       );
       const updates = release!.updates;
       assertHasUpdate(updates, 'Client1/VERSION', DefaultUpdater);
+      assertHasUpdate(
+        updates,
+        'Client1/composer.json',
+        RootComposerUpdatePackages
+      );
       assertHasUpdate(updates, 'Client2/VERSION', DefaultUpdater);
+      assertHasUpdate(updates, 'Client2/composer.json');
       assertHasUpdate(updates, 'Client3/VERSION', DefaultUpdater);
+      assertHasUpdate(updates, 'Client3/composer.json');
       assertHasUpdate(updates, 'Client3/src/Entry.php', PHPClientVersion);
     });
+    it('updates component composer version', async () => {
+      const strategy = new PHPYoshi({
+        targetBranch: 'main',
+        github,
+      });
+      const latestRelease = undefined;
+      const release = await strategy.buildReleasePullRequest(
+        commits,
+        latestRelease
+      );
+      const updates = release!.updates;
+      assertHasUpdate(
+        updates,
+        'Client1/composer.json',
+        RootComposerUpdatePackages
+      );
+      const client1Composer = updates.find(update => {
+        return update.path === 'Client1/composer.json';
+      });
+      const newContent = client1Composer!.updater.updateContent(
+        '{"name":"google/client1","version":"1.2.3"}'
+      );
+      expect(newContent).to.eql('{"name":"google/client1","version":"1.2.4"}');
+    });
   });
   describe('buildRelease', () => {
     it('parses the release notes', async () => {