Skip to content

Commit 09fb84b

Browse files
bshafferchingor13
andauthored
fix(php-yoshi): remove manifest.json, Version.php, and ServiceBuilder.php (#1949)
* chore: remove manifest.json, Version.php, and ServiceBuilder.php * remove php-manifest updater test --------- Co-authored-by: Jeff Ching <chingor@google.com>
1 parent 417fd5e commit 09fb84b

5 files changed

Lines changed: 1 addition & 188 deletions

File tree

src/strategies/php-yoshi.ts

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {BaseStrategy, BuildUpdatesOptions, BaseStrategyOptions} from './base';
1616
import {Update} from '../update';
1717
import {Changelog} from '../updaters/changelog';
1818
import {RootComposerUpdatePackages} from '../updaters/php/root-composer-update-packages';
19-
import {PHPManifest} from '../updaters/php/php-manifest';
2019
import {PHPClientVersion} from '../updaters/php/php-client-version';
2120
import {VersionsMap, Version} from '../version';
2221
import {Commit, parseConventionalCommits} from '../commit';
@@ -242,8 +241,7 @@ export class PHPYoshi extends BaseStrategy {
242241
}),
243242
});
244243

245-
// update the aggregate package information in the root
246-
// composer.json and manifest.json.
244+
// update the aggregate package information in the root composer.json
247245
updates.push({
248246
path: this.addPath('composer.json'),
249247
createIfMissing: false,
@@ -253,33 +251,6 @@ export class PHPYoshi extends BaseStrategy {
253251
}),
254252
});
255253

256-
updates.push({
257-
path: this.addPath('docs/manifest.json'),
258-
createIfMissing: false,
259-
updater: new PHPManifest({
260-
version,
261-
versionsMap,
262-
}),
263-
});
264-
265-
updates.push({
266-
path: this.addPath('src/Version.php'),
267-
createIfMissing: false,
268-
updater: new PHPClientVersion({
269-
version,
270-
versionsMap,
271-
}),
272-
});
273-
274-
updates.push({
275-
path: this.addPath('src/ServiceBuilder.php'),
276-
createIfMissing: false,
277-
updater: new PHPClientVersion({
278-
version,
279-
versionsMap,
280-
}),
281-
});
282-
283254
return updates;
284255
}
285256
}

src/updaters/php/php-manifest.ts

Lines changed: 0 additions & 58 deletions
This file was deleted.

test/strategies/php-yoshi.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import {TagName} from '../../src/util/tag-name';
2323
import {Version} from '../../src/version';
2424
import {Changelog} from '../../src/updaters/changelog';
2525
import {RootComposerUpdatePackages} from '../../src/updaters/php/root-composer-update-packages';
26-
import {PHPManifest} from '../../src/updaters/php/php-manifest';
2726
import {PHPClientVersion} from '../../src/updaters/php/php-client-version';
2827
import {DefaultUpdater} from '../../src/updaters/default';
2928
import snapshot = require('snap-shot-it');
@@ -152,9 +151,6 @@ describe('PHPYoshi', () => {
152151
const updates = release!.updates;
153152
assertHasUpdate(updates, 'CHANGELOG.md', Changelog);
154153
assertHasUpdate(updates, 'composer.json', RootComposerUpdatePackages);
155-
assertHasUpdate(updates, 'docs/manifest.json', PHPManifest);
156-
assertHasUpdate(updates, 'src/Version.php', PHPClientVersion);
157-
assertHasUpdate(updates, 'src/ServiceBuilder.php', PHPClientVersion);
158154
});
159155
it('finds touched components', async () => {
160156
const strategy = new PHPYoshi({

test/updaters/fixtures/php/manifest.json

Lines changed: 0 additions & 55 deletions
This file was deleted.

test/updaters/php-manifest.ts

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)