Merge pull request #76 from shivammathur/develop

Edit extension installation, update cache yml

Author: shivammathur

README.md

@@ -187,20 +187,23 @@ You can persist composer's internal cache directory using the [`action/cache`](h
 - name: Get Composer Cache Directory
   id: composer-cache
   run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
 - name: Cache on linux and macOS
-  if: matrix.operating-system != 'windows-latest'
+  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: Cache on windows
-  if: matrix.operating-system == 'windows-latest'
+  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
 ```

__tests__/extensions.test.ts

@@ -48,10 +48,6 @@ describe('Extension tests', () => {
     );
     expect(linux).toContain('pecl install pcov');
 
-    linux = await extensions.addExtension('xdebug, pcov', '7.4', 'linux');
-    expect(linux).toContain('xdebug.sh');
-    expect(linux).toContain('pcov.sh');
-
     linux = await extensions.addExtension('phalcon3, phalcon4', '7.2', 'linux');
     expect(linux).toContain('phalcon.sh master 7.2');
     expect(linux).toContain('phalcon.sh 4.0.x 7.2');
@@ -82,12 +78,6 @@ describe('Extension tests', () => {
     darwin = await extensions.addExtension('xdebug', '5.6', 'darwin');
     expect(darwin).toContain('sudo pecl install xdebug-2.5.5');
 
-    darwin = await extensions.addExtension('xdebug', '7.4', 'darwin');
-    expect(darwin).toContain('xdebug_darwin.sh');
-
-    darwin = await extensions.addExtension('pcov', '7.4', 'darwin');
-    expect(darwin).toContain('pcov.sh');
-
     darwin = await extensions.addExtension('xdebug', '7.2', 'darwin');
     expect(darwin).toContain('sudo pecl install xdebug');
 

lib/extensions.js

@@ -69,18 +69,6 @@ function addExtensionDarwin(extension_csv, version) {
                 // add script to enable extension is already installed along with php
                 let install_command = '';
                 switch (version + extension) {
-                    case '7.4xdebug':
-                        install_command =
-                            'sh ' +
-                                path.join(__dirname, '../src/scripts/xdebug_darwin.sh') +
-                                ' >/dev/null 2>&1 && echo "zend_extension=xdebug.so" >> $ini_file';
-                        break;
-                    case '7.4pcov':
-                        install_command =
-                            'sh ' +
-                                path.join(__dirname, '../src/scripts/pcov.sh') +
-                                ' >/dev/null 2>&1 && echo "extension=pcov.so" >> $ini_file';
-                        break;
                     case '5.6xdebug':
                         install_command = 'sudo pecl install xdebug-2.5.5 >/dev/null 2>&1';
                         break;
@@ -159,18 +147,6 @@ function addExtensionLinux(extension_csv, version) {
                 // add script to enable extension is already installed along with php
                 let install_command = '';
                 switch (version + extension) {
-                    case '7.4xdebug':
-                        install_command =
-                            'sh ' +
-                                path.join(__dirname, '../src/scripts/xdebug.sh') +
-                                ' >/dev/null 2>&1 && echo "zend_extension=xdebug.so" >> $ini_file';
-                        break;
-                    case '7.4pcov':
-                        install_command =
-                            'sh ' +
-                                path.join(__dirname, '../src/scripts/pcov.sh') +
-                                ' >/dev/null 2>&1 && echo "extension=pcov.so" >> $ini_file';
-                        break;
                     case '7.2phalcon3':
                     case '7.3phalcon3':
                         install_command =