Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/strategies/php.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// Generic
import {Changelog} from '../updaters/changelog';
// PHP Specific.
import {RootComposerUpdatePackages} from '../updaters/php/root-composer-update-packages';
// import {RootComposerUpdatePackages} from '../updaters/php/root-composer-update-packages';
import {BaseStrategy, BuildUpdatesOptions, BaseStrategyOptions} from './base';
import {Update} from '../update';
import {VersionsMap} from '../version';
Expand Down Expand Up @@ -57,6 +57,11 @@ export class PHP extends BaseStrategy {
}),
});

/**

STAINLESS-EDIT: Note from Hao & Jacob: In Packagist we want to prefer using the github tag rather than
composer version. Releases can be skipped if the tag version misaligns with the composer version.

// update composer.json
updates.push({
path: this.addPath('composer.json'),
Expand All @@ -65,7 +70,8 @@ export class PHP extends BaseStrategy {
version,
versionsMap,
}),
});
});
*/

return updates;
}
Expand Down
11 changes: 8 additions & 3 deletions test/strategies/php.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {buildMockConventionalCommit} from '../helpers';
import {TagName} from '../../src/util/tag-name';
import {Version} from '../../src/version';
import {Changelog} from '../../src/updaters/changelog';
import {RootComposerUpdatePackages} from '../../src/updaters/php/root-composer-update-packages';
// import {RootComposerUpdatePackages} from '../../src/updaters/php/root-composer-update-packages';

const sandbox = sinon.createSandbox();

Expand Down Expand Up @@ -95,9 +95,14 @@ describe('PHP', () => {
latestRelease,
});
const updates = release!.updates;
expect(updates).lengthOf(2);
// Stainless EDIT: we removed updates to the composer.json file
expect(updates).lengthOf(1);
assertHasUpdate(updates, 'CHANGELOG.md', Changelog);
assertHasUpdate(updates, 'composer.json', RootComposerUpdatePackages);

// Original:
// expect(updates).lengthOf(2);
// assertHasUpdate(updates, 'CHANGELOG.md', Changelog);
// assertHasUpdate(updates, 'composer.json', RootComposerUpdatePackages);
});
});
});