Merge pull request shivammathur#78 from shivammathur/develop

1.5.1

README.md

@@ -188,22 +188,13 @@ You can persist composer's internal cache directory using the [`action/cache`](h
  id: composer-cache
  run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
-- name: Cache on linux and macOS
- if: runner.os != 'Windows'
+- name: Cache dependencies 
  uses: actions/cache@v1
  with:
  path: ${{ steps.composer-cache.outputs.dir }}
  key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
  restore-keys: ${{ runner.os }}-composer-
 
-- name: Cache on windows
- if: runner.os == 'Windows'
- uses: actions/cache@v1
- with:
- path: ${{ steps.composer-cache.outputs.dir }}
- key: ${{ runner.os }}-composer-${{ hashFiles('**composer.lock') }}
- restore-keys: ${{ runner.os }}-composer-
-
 - name: Install Dependencies
  run: composer install --prefer-dist
 ```

lib/extensions.js

@@ -171,7 +171,7 @@ function addExtensionLinux(extension_csv, version) {
  'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php' +
  version +
  '-' +
- extension +
+ extension.replace('pdo_', '').replace('pdo-', '') +
  ' >/dev/null 2>&1 || sudo pecl install ' +
  extension +
  ' >/dev/null 2>&1';

lib/utils.js

@@ -110,9 +110,7 @@ function extensionArray(extension_csv) {
  return extension
  .trim()
  .replace('php-', '')
- .replace('php_', '')
- .replace('pdo_', '')
- .replace('pdo-', '');
+ .replace('php_', '');
  });
  }
  });

package.json

@@ -1,6 +1,6 @@
 {
  "name": "setup-php",
- "version": "1.5.0",
+ "version": "1.5.1",
  "private": false,
  "description": "Setup PHP for use with GitHub Actions",
  "main": "lib/setup-php.js",

src/extensions.ts

@@ -164,7 +164,7 @@ export async function addExtensionLinux(
  'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php' +
  version +
  '-' +
- extension +
+ extension.replace('pdo_', '').replace('pdo-', '') +
  ' >/dev/null 2>&1 || sudo pecl install ' +
  extension +
  ' >/dev/null 2>&1';

src/utils.ts

@@ -112,9 +112,7 @@ export async function extensionArray(
  return extension
  .trim()
  .replace('php-', '')
- .replace('php_', '')
- .replace('pdo_', '')
- .replace('pdo-', '');
+ .replace('php_', '');
  });
  }
 }