feat(action): Separate origin and prefix repositories

Author: anibalsanchez

README.md

@@ -76,7 +76,8 @@ Parameter | Description | Required | Example
 ---------|----------| ---------|----------
 PERSONAL_ACCESS_TOKEN | The PHP-Prefixer PAT/Personal Access Token. The token must be configured in the PHP-Prefixer account. | Yes | `789\|123456789...`
 PROJECT_ID | The project ID to process the source code. The project must be configured in your account in the PHP-Prefixer account. | Yes | `5432`
-TOKEN | The GitHub PAT/Personal Access Token to access private repositories. It is only required if the project, the library or the dependencies are private. | No | `ghp_F4fZ9Cq7QF...`
+TOKEN | The GitHub PAT/Personal Access Token to access private repositories. It is only required if the project, the library or the dependencies are private. | Yes | `ghp_F4fZ9Cq7QF...`
+SCHEMA | The PHP-Prefixer JSON configuration to be applied to the project. By default, the prefixer uses the configuration present in composer.json. If there is no extra configuration or the extra configuration must be replaced, this parameter overrides the `composer.json` extra configuration to define the PHP-Prefixer schema. | No | `{"project-name": "Prefixed Project","namespaces-prefix": "PPP","global-scope-prefix": "PPP_"}`
 
 The Action integrates the [GitHub Action Checkout - actions/checkout](https://github.com/actions/checkout). The following parameters are also available:
 

__tests__/Mock-Composer/composer.json

@@ -1,5 +1,10 @@
 {
-    "require": {
-        "symfony/console": "^5.3"
+  "require": {},
+  "extra": {
+    "php-prefixer": {
+      "project-name": "Prefixed Project",
+      "namespaces-prefix": "PPP",
+      "global-scope-prefix": "PPP_"
     }
-}
+  }
+}

__tests__/git-helper.test.ts

@@ -18,7 +18,7 @@ async function createTmpRepo(): Promise<IGitHelper> {
   await gitHelper.init()
 
   await getExecOutput(`touch ${srcTmpPath}/composer.json`)
-  await gitHelper.commitAll()
+  await gitHelper.addAllAndCommit()
 
   return gitHelper
 }
@@ -37,8 +37,8 @@ let gitHelper: IGitHelper
 beforeEach(async () => {
   sourceSettings = {
     repositoryPath: '',
-    repositoryOwner: '',
-    repositoryName: '',
+    repositoryOwner: 'lorem',
+    repositoryName: 'ipsum',
     ref: '',
     commit: '',
     clean: true,
@@ -93,12 +93,12 @@ test('checkout new branch', async () => {
   let branch = await tmpIGitHelper.currentBranch()
   expect(branch).toBe('master')
 
-  await tmpIGitHelper.checkoutToBranch(false, '', 'prefixed-1.0.0')
+  await tmpIGitHelper.checkoutToBranch('', 'prefixed-1.0.0')
   branch = await tmpIGitHelper.currentBranch()
   expect(branch).toBe('prefixed-1.0.0')
 
   await tmpIGitHelper.checkout('master', '')
-  await tmpIGitHelper.checkoutToBranch(false, '', 'prefixed-1.0.0')
+  await tmpIGitHelper.checkoutToBranch('', 'prefixed-1.0.0')
 
   branch = await tmpIGitHelper.currentBranch()
   expect(branch).toBe('prefixed-1.0.0')
@@ -116,25 +116,6 @@ test('current revision', async () => {
   expect(result.length).toBe(40)
 })
 
-test('current tag', async () => {
-  const tmpIGitHelper = await createTmpRepo()
-
-  await tmpIGitHelper.tag('1.0.0')
-  const result = await tmpIGitHelper.currentTag()
-  expect(result).toBe('1.0.0')
-
-  destroyTmpRepo()
-})
-
-test('current tag error', async () => {
-  const tmpIGitHelper = await createTmpRepo()
-
-  const result = await tmpIGitHelper.currentTag()
-  expect(result).toBeUndefined()
-
-  destroyTmpRepo()
-})
-
 test('last matching tag', async () => {
   const tmpIGitHelper = await createTmpRepo()
 
@@ -160,7 +141,7 @@ test('push', async () => {
   const gitHelper = await createGitHelper(settings)
   await gitHelper.init()
   await getExecOutput(`touch ${srcTmpPath}/composer.json`)
-  await gitHelper.commitAll()
+  await gitHelper.addAllAndCommit()
   await gitHelper.tag('1.2.3')
 
   const upstreamTmpPath = await makeTempPath()
@@ -173,7 +154,7 @@ test('push', async () => {
   const targetIGitHelper = await createGitHelper(targetSettings)
   const licenseFile = `${targetTmpPath}/license.txt`
   await getExecOutput(`touch ${licenseFile}`)
-  await targetIGitHelper.commitAll()
+  await targetIGitHelper.addAllAndCommit()
   await targetIGitHelper.tag('1.2.4')
   await targetIGitHelper.push('origin', 'master')
 
@@ -231,27 +212,33 @@ test('has changes', async () => {
   await fs.promises.rm(srcTmpPath, {recursive: true})
 })
 
-test('remote add', async () => {
+test('remote add url', async () => {
   const tmpIGitHelper = await createTmpRepo()
 
-  await tmpIGitHelper.remoteAdd(false, 'prefixed-origin-1')
-  const result1 = await tmpIGitHelper.remoteExists('prefixed-origin-1')
-  expect(result1).toBeTruthy()
+  const commandManager = await createCommandManager(
+    srcTmpPath || '/undefined-path',
+    false
+  )
+  await commandManager.config(
+    'remote.origin.url',
+    'git@github.com:PHP-Prefixer/php-prefixer-build-action.git'
+  )
+  await tmpIGitHelper.remoteAddUrl('prefixed-origin-3')
+  const result = await tmpIGitHelper.remoteExists('prefixed-origin-3')
+  expect(result).toBeTruthy()
 
-  await tmpIGitHelper.remoteAdd(true, 'prefixed-origin-2')
-  const result2 = await tmpIGitHelper.remoteExists('prefixed-origin-2')
-  expect(result2).toBeTruthy()
+  destroyTmpRepo()
+})
 
-  if (srcTmpPath) {
-    const commandManager = await createCommandManager(srcTmpPath, false)
-    await commandManager.config(
-      'remote.origin.url',
-      'git@github.com:PHP-Prefixer/php-prefixer-build-action.git'
-    )
-    await tmpIGitHelper.remoteAdd(true, 'prefixed-origin-3')
-    const result3 = await tmpIGitHelper.remoteExists('prefixed-origin-3')
-    expect(result3).toBeTruthy()
-  }
+test('remote add local path', async () => {
+  const tmpIGitHelper = await createTmpRepo()
+
+  await tmpIGitHelper.remoteAddLocalPath(
+    'prefixed-origin-1',
+    srcTmpPath || '/undefined-path'
+  )
+  const result1 = await tmpIGitHelper.remoteExists('prefixed-origin-1')
+  expect(result1).toBeTruthy()
 
   destroyTmpRepo()
 })

__tests__/main-helper.test.ts

@@ -39,7 +39,7 @@ test('main - prefix anibalsanchez/hello-wp-world', async () => {
   )
   const gitHelper = await createGitHelper(sourceSettings)
   const currentBranch = await gitHelper.currentBranch()
-  await gitHelper.commitAll()
+  await gitHelper.addAllAndCommit()
   await gitHelper.push('origin', currentBranch)
   await fs.promises.rm(sourceSettings.repositoryPath, {recursive: true})
   sourceSettings.repositoryPath = ''