diff --git a/lib/manager/composer/lock-file.js b/lib/manager/composer/artifacts.js similarity index 97% rename from lib/manager/composer/lock-file.js rename to lib/manager/composer/artifacts.js index 300f6506905ad15bb3da7d900e8310e4b2a387ae..45adef79844a24434426145d8b384534702dd95c 100644 --- a/lib/manager/composer/lock-file.js +++ b/lib/manager/composer/artifacts.js @@ -5,16 +5,16 @@ const os = require('os'); const hostRules = require('../../util/host-rules'); module.exports = { - getLockFile, + getArtifacts, }; -async function getLockFile( +async function getArtifacts( packageFileName, updatedDeps, newPackageFileContent, config ) { - logger.debug(`composer.getLockFile(${packageFileName})`); + logger.debug(`composer.getArtifacts(${packageFileName})`); process.env.COMPOSER_CACHE_DIR = process.env.COMPOSER_CACHE_DIR || upath.join(os.tmpdir(), '/renovate/cache/composer'); diff --git a/lib/manager/composer/index.js b/lib/manager/composer/index.js index 5d7233f2472d3e7c128fcceb0d15d11f02868449..ec190b633af60392454606caa45f727435e2e35a 100644 --- a/lib/manager/composer/index.js +++ b/lib/manager/composer/index.js @@ -1,12 +1,12 @@ const { extractDependencies } = require('./extract'); const { updateDependency } = require('../npm/update'); -const { getLockFile } = require('./lock-file'); +const { getArtifacts } = require('./artifacts'); const language = 'php'; module.exports = { extractDependencies, - getLockFile, + getArtifacts, language, updateDependency, // TODO: support this diff --git a/lib/workers/branch/get-updated.js b/lib/workers/branch/get-updated.js index a3597965eb5a56a6b16d74a1687d9da9f0035992..7c6c28897142294fdbdc56a7566519b4605dc5ba 100644 --- a/lib/workers/branch/get-updated.js +++ b/lib/workers/branch/get-updated.js @@ -56,9 +56,9 @@ async function getUpdatedPackageFiles(config) { for (const packageFile of updatedPackageFiles) { const manager = packageFileManagers[packageFile.name]; const updatedDeps = packageFileUpdatedDeps[packageFile.name]; - const getLockFile = get(manager, 'getLockFile'); - if (getLockFile) { - const updatedLockFile = await getLockFile( + const getArtifacts = get(manager, 'getArtifacts'); + if (getArtifacts) { + const updatedLockFile = await getArtifacts( packageFile.name, updatedDeps, packageFile.contents, diff --git a/test/manager/composer/lock-file.spec.js b/test/manager/composer/artifacts.spec.js similarity index 77% rename from test/manager/composer/lock-file.spec.js rename to test/manager/composer/artifacts.spec.js index f4291362295dfe5cacfad3dc0db143b95a28bb2b..b96c28bcb635f02182ba279d2451346fefcf03ac 100644 --- a/test/manager/composer/lock-file.spec.js +++ b/test/manager/composer/artifacts.spec.js @@ -3,19 +3,19 @@ jest.mock('child-process-promise'); const fs = require('fs-extra'); const { exec } = require('child-process-promise'); -const composer = require('../../../lib/manager/composer/lock-file'); +const composer = require('../../../lib/manager/composer/artifacts'); const config = { localDir: '/tmp/github/some/repo', }; -describe('.getLockFile()', () => { +describe('.getArtifacts()', () => { beforeEach(() => { jest.resetAllMocks(); }); it('returns if no composer.lock found', async () => { expect( - await composer.getLockFile('composer.json', [], '{}', config) + await composer.getArtifacts('composer.json', [], '{}', config) ).toBeNull(); }); it('returns null if unchanged', async () => { @@ -26,7 +26,7 @@ describe('.getLockFile()', () => { }); fs.readFile = jest.fn(() => 'Current composer.lock'); expect( - await composer.getLockFile('composer.json', [], '{}', config) + await composer.getArtifacts('composer.json', [], '{}', config) ).toBeNull(); }); it('returns updated composer.lock', async () => { @@ -37,7 +37,7 @@ describe('.getLockFile()', () => { }); fs.readFile = jest.fn(() => 'New composer.lock'); expect( - await composer.getLockFile('composer.json', [], '{}', config) + await composer.getArtifacts('composer.json', [], '{}', config) ).not.toBeNull(); }); it('supports docker mode', async () => { @@ -48,7 +48,7 @@ describe('.getLockFile()', () => { }); fs.readFile = jest.fn(() => 'New composer.lock'); expect( - await composer.getLockFile('composer.json', [], '{}', { + await composer.getArtifacts('composer.json', [], '{}', { ...config, binarySource: 'docker', }) @@ -60,7 +60,7 @@ describe('.getLockFile()', () => { throw new Error('not found'); }); expect( - await composer.getLockFile('composer.json', [], '{}', config) + await composer.getArtifacts('composer.json', [], '{}', config) ).toBeNull(); }); }); diff --git a/test/workers/branch/get-updated.spec.js b/test/workers/branch/get-updated.spec.js index 859380b14f8e6a7711aae4f619b1e31b67d89a75..8965ef312e22e5cd8697b72ae17658446f992b59 100644 --- a/test/workers/branch/get-updated.spec.js +++ b/test/workers/branch/get-updated.spec.js @@ -14,7 +14,7 @@ describe('workers/branch/get-updated', () => { upgrades: [], }; composer.updateDependency = jest.fn(); - composer.getLockFile = jest.fn(); + composer.getArtifacts = jest.fn(); npm.updateDependency = jest.fn(); }); it('handles empty', async () => { @@ -49,7 +49,7 @@ describe('workers/branch/get-updated', () => { manager: 'composer', }); composer.updateDependency.mockReturnValue('some new content'); - composer.getLockFile.mockReturnValue({ + composer.getArtifacts.mockReturnValue({ name: 'composer.json', contents: 'some contents', });