fix: use working-dir from "composer-options" (#107)

.github/workflows/continuous-integration.yml

@@ -37,9 +37,7 @@ jobs:
           - "locked"
         composer-options:
           - "--ignore-platform-reqs"
-          - ""
-        working-directory:
-          - "subdirectory"
+          - "--working-dir subdirectory"
           - ""
     steps:
       - uses: "actions/checkout@v2"
@@ -50,4 +48,3 @@ jobs:
         with:
           dependency-versions: "${{ matrix.dependency-versions }}"
           composer-options: "${{ matrix.composer-options }}"
-          working-directory: "${{ matrix.working-directory }}"

README.md

@@ -83,20 +83,7 @@ For example:
 ```yaml
 - uses: "ramsey/composer-install@v1"
   with:
-    composer-options: "--ignore-platform-reqs"
-```
-
-#### working-directory
-
-If your `composer.json` is located in a sub-folder (e.g.: `packages/api`), 
-you must use `working-directory` input to get the action working properly. 
-
-For example:
-
-```yaml
-- uses: "ramsey/composer-install@v1"
-  with:
-    working-directory: "packages/api"
+    composer-options: "--ignore-platform-reqs --working-dir backend"
 ```
 
 ### Matrix Example

__tests__/actions/mainAction.test.ts

@@ -64,7 +64,6 @@ describe('main action', () => {
     expect(composerInstallMock).toHaveBeenCalledWith(
       'lowest',
       '--ignore-platform-reqs',
-      ''
     )
   })
 
@@ -74,9 +73,8 @@ describe('main action', () => {
     const composerInstallMock = jest.spyOn(composer, 'install')
     const mockFactory = cache.restoreFactory()
 
-    process.env['INPUT_COMPOSER-OPTIONS'] = '--ignore-platform-reqs'
+    process.env['INPUT_COMPOSER-OPTIONS'] = '--ignore-platform-reqs --working-dir subdirectory'
     process.env['INPUT_DEPENDENCY-VERSIONS'] = 'lowest'
-    process.env['INPUT_WORKING-DIRECTORY'] = 'subdirectory'
 
     await mainAction()
 
@@ -91,8 +89,7 @@ describe('main action', () => {
     expect(composerInstallMock).toHaveBeenCalledTimes(1)
     expect(composerInstallMock).toHaveBeenCalledWith(
       'lowest',
-      '--ignore-platform-reqs',
-      'subdirectory'
+      '--ignore-platform-reqs --working-dir subdirectory',
     )
   })
 

__tests__/actions/postAction.test.ts

@@ -57,9 +57,8 @@ describe('post action', () => {
     const cacheMock = jest.spyOn(cache, 'cache')
     const mockFactory = cache.saveFactory()
 
-    process.env['INPUT_COMPOSER-OPTIONS'] = ''
+    process.env['INPUT_COMPOSER-OPTIONS'] = ' --working-dir subdirectory'
     process.env['INPUT_DEPENDENCY-VERSIONS'] = 'highest'
-    process.env['INPUT_WORKING-DIRECTORY'] = 'subdirectory'
 
     await postAction()
 

__tests__/composer/install.test.ts

@@ -14,12 +14,7 @@ describe('composer.install with mocked exec', () => {
     await composer.install('locked')
 
     expect(execMock).toHaveBeenCalledTimes(1)
-    expect(execMock).toHaveBeenCalledWith('composer', [
-      'install',
-      '--no-interaction',
-      '--no-progress',
-      '--ansi'
-    ])
+    expect(execMock).toHaveBeenCalledWith('composer install --no-interaction --no-progress --ansi')
   })
 
   test('executes command to install composer with highest dependencies', async () => {
@@ -28,12 +23,7 @@ describe('composer.install with mocked exec', () => {
     await composer.install('highest')
 
     expect(execMock).toHaveBeenCalledTimes(1)
-    expect(execMock).toHaveBeenCalledWith('composer', [
-      'update',
-      '--no-interaction',
-      '--no-progress',
-      '--ansi'
-    ])
+    expect(execMock).toHaveBeenCalledWith('composer update --no-interaction --no-progress --ansi')
   })
 
   test('executes command to install composer with lowest dependencies', async () => {
@@ -42,13 +32,7 @@ describe('composer.install with mocked exec', () => {
     await composer.install('lowest')
 
     expect(execMock).toHaveBeenCalledTimes(1)
-    expect(execMock).toHaveBeenCalledWith('composer', [
-      'update',
-      '--prefer-lowest',
-      '--no-interaction',
-      '--no-progress',
-      '--ansi'
-    ])
+    expect(execMock).toHaveBeenCalledWith('composer update --prefer-lowest --no-interaction --no-progress --ansi')
   })
 
   test('executes command to install composer with locked dependencies when provided invalid dependencyPreference', async () => {
@@ -57,44 +41,15 @@ describe('composer.install with mocked exec', () => {
     await composer.install('foobar')
 
     expect(execMock).toHaveBeenCalledTimes(1)
-    expect(execMock).toHaveBeenCalledWith('composer', [
-      'install',
-      '--no-interaction',
-      '--no-progress',
-      '--ansi'
-    ])
+    expect(execMock).toHaveBeenCalledWith('composer install --no-interaction --no-progress --ansi')
   })
 
-  test('executes command to install composer with locked dependencies and working directory', async () => {
+  test('executes command to install composer with locked dependencies and options', async () => {
     const execMock = jest.spyOn(exec, 'exec')
 
-    await composer.install('locked', '', 'subdirectory')
+    await composer.install('locked', '--profile --no-plugins --working-dir subdirectory')
 
     expect(execMock).toHaveBeenCalledTimes(1)
-    expect(execMock).toHaveBeenCalledWith('composer', [
-      'install',
-      '--no-interaction',
-      '--no-progress',
-      '--ansi',
-      '--working-dir=subdirectory'
-    ])
-  })
-
-  test('executes command to install composer with locked dependencies, working directory and options', async () => {
-    const execMock = jest.spyOn(exec, 'exec')
-
-    await composer.install('locked', '--opt1 --opt2 --opt3', 'subdirectory')
-
-    expect(execMock).toHaveBeenCalledTimes(1)
-    expect(execMock).toHaveBeenCalledWith('composer', [
-      'install',
-      '--no-interaction',
-      '--no-progress',
-      '--ansi',
-      '--working-dir=subdirectory',
-      '--opt1',
-      '--opt2',
-      '--opt3'
-    ])
+    expect(execMock).toHaveBeenCalledWith('composer install --no-interaction --no-progress --ansi --profile --no-plugins --working-dir subdirectory')
   })
 })

__tests__/utils/getCacheKeys.test.ts

@@ -56,8 +56,8 @@ describe('cache keys', () => {
     await expect(
       getCacheKeys('highest', '--some-other-option --and-another', 'subdirectory')
     ).resolves.toEqual({
-      key: 'fooplatform-php-7.99.99-subdirectory-highest-foobar---some-other-option --and-another',
-      restoreKeys: ['fooplatform-php-7.99.99-subdirectory-highest-foobar-', 'fooplatform-php-7.99.99-subdirectory-highest-']
+      key: 'fooplatform-php-7.99.99-highest-foobar---some-other-option --and-another',
+      restoreKeys: ['fooplatform-php-7.99.99-highest-foobar-', 'fooplatform-php-7.99.99-highest-']
     })
     expect(utils.hashFiles).toHaveBeenCalledWith('subdirectory/composer.json\nsubdirectory/composer.lock');
   })

__tests__/utils/getComposerWorkingDir.test.ts

@@ -0,0 +1,25 @@
+import { getComposerWorkingDir } from '../../src/utils/getComposerWorkingDir';
+
+jest.mock('@actions/core');
+
+describe('getComposerWorkingDir', () => {
+  test('with empty options', () => {
+    expect(getComposerWorkingDir()).toEqual('');
+  });
+
+  test('with --working-dir option', () => {
+    expect(getComposerWorkingDir('--working-dir subdirectory')).toEqual('subdirectory');
+  });
+
+  test('with -d (alias of --working-dir) option', () => {
+    expect(getComposerWorkingDir('-d subdirectory')).toEqual('subdirectory');
+  });
+
+  test('with other options AND without --working-dir', () => {
+    expect(getComposerWorkingDir('-vv --no-plugins')).toEqual('');
+  });
+
+  test('with other options AND with --working-dir', () => {
+    expect(getComposerWorkingDir('-vv --working-dir subdirectory --no-plugins')).toEqual('subdirectory');
+  });
+});

__tests__/utils/parseStringToArguments.test.ts

@@ -0,0 +1,28 @@
+import {parseStringToArguments} from '../../src/utils'
+
+describe('parseStringToArguments', () => {
+  test('empty args', () => {
+    expect(parseStringToArguments('')).toEqual({
+      _: []
+    })
+  })
+
+  test('only positional argument', () => {
+    expect(parseStringToArguments('test')).toEqual({
+      _: ['test']
+    })
+  })
+
+  test('positional argument with lot of options', () => {
+    expect(
+      parseStringToArguments(
+        '--no-plugins --profile --working-dir subdirectory test'
+      )
+    ).toEqual({
+      _: ['test'],
+      plugins: false,
+      profile: true,
+      'working-dir': 'subdirectory'
+    })
+  })
+})