Fix macos

__tests__/extensions.test.ts

@@ -3,7 +3,7 @@ import * as extensions from '../src/extensions';
 describe('Extension tests', () => {
   it('checking addExtensionOnWindows', async () => {
     let win32: string = await extensions.addExtension(
-      'Xdebug, pcov, sqlite, :intl, phalcon4, ioncube, oci8, pdo_oci, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2',
+      'Xdebug, pcov, sqlite, :intl, phalcon4, ioncube, oci8, pdo_oci, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2, sqlsrv-1.2.3preview1',
       '7.4',
       'win32'
     );
@@ -18,6 +18,7 @@ describe('Extension tests', () => {
     expect(win32).toContain('Add-Extension ast beta');
     expect(win32).toContain('Add-Extension grpc stable 1.2.3');
     expect(win32).toContain('Add-Extension inotify alpha 1.2.3');
+    expect(win32).toContain('Add-Extension sqlsrv devel 1.2.3');
 
     win32 = await extensions.addExtension('pcov', '5.6', 'win32');
     expect(win32).toContain(

__tests__/utils.test.ts

@@ -42,11 +42,12 @@ describe('Utils tests', () => {
   it('checking asyncForEach', async () => {
     const array: Array<string> = ['a', 'b', 'c'];
     let concat = '';
-    await utils.asyncForEach(array, async function (
+    await utils.asyncForEach(
-      str: string
+      array,
-    ): Promise<void> {
+      async function (str: string): Promise<void> {
         concat += str;
-    });
+      }
+    );
     expect(concat).toBe('abc');
   });
 
@@ -83,12 +84,12 @@ describe('Utils tests', () => {
     const runner_dir: string = process.env['RUNNER_TOOL_CACHE'] || '';
     const script_path: string = path.join(runner_dir, 'test.sh');
     await utils.writeScript('test.sh', testString);
-    await fs.readFile(script_path, function (
+    await fs.readFile(
-      error: Error | null,
+      script_path,
-      data: Buffer
+      function (error: Error | null, data: Buffer) {
-    ) {
         expect(testString).toBe(data.toString());
-    });
+      }
+    );
     await cleanup(script_path);
   });
 

dist/index.js

@@ -2974,9 +2974,9 @@ async function addExtensionWindows(extension_csv, version) {
                 add_script += await utils.joins('\nAdd-Extension', ext_name, 'stable', ext_version);
                 break;
             // match semver with state
-            case /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.test(version_extension):
+            case /.*-(\d+\.\d+\.\d)([a-zA-Z+]+)\d*/.test(version_extension):
-                matches = /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.exec(version_extension);
+                matches = /.*-(\d+\.\d+\.\d)([a-zA-Z+]+)\d*/.exec(version_extension);
-                add_script += await utils.joins('\nAdd-Extension', ext_name, matches[2], matches[1]);
+                add_script += await utils.joins('\nAdd-Extension', ext_name, matches[2].replace('preview', 'devel'), matches[1]);
                 break;
             // match 5.3pcov to 7.0pcov
             case /(5\.[3-6]|7\.0)pcov/.test(version_extension):

src/extensions.ts

@@ -164,16 +164,14 @@ export async function addExtensionWindows(
         );
         break;
       // match semver with state
-      case /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.test(
+      case /.*-(\d+\.\d+\.\d)([a-zA-Z+]+)\d*/.test(version_extension):
-        version_extension
+        matches = /.*-(\d+\.\d+\.\d)([a-zA-Z+]+)\d*/.exec(
-      ):
-        matches = /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.exec(
           version_extension
         ) as RegExpExecArray;
         add_script += await utils.joins(
           '\nAdd-Extension',
           ext_name,
-          matches[2],
+          matches[2].replace('preview', 'devel'),
           matches[1]
         );
         break;

src/scripts/darwin.sh

@@ -71,7 +71,7 @@ check_extension() {
 # Function to get the PECL version.
 get_pecl_version() {
   extension=$1
-  stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")"
+  stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot|preview)")"
   pecl_rest='https://pecl.php.net/rest/r/'
   response=$(curl "${curl_opts[@]}" "$pecl_rest$extension"/allreleases.xml)
   pecl_version=$(echo "$response" | grep -m 1 -Eio "(\d*\.\d*\.\d*$stability\d*)")
@@ -92,7 +92,7 @@ add_pecl_extension() {
   extension=$1
   pecl_version=$2
   prefix=$3
-  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot).* ]]; then
+  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
     pecl_version=$(get_pecl_version "$extension" "$pecl_version")
   fi
   if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
@@ -271,10 +271,10 @@ setup_php() {
   export HOMEBREW_NO_INSTALL_CLEANUP=TRUE
   brew tap --shallow shivammathur/homebrew-php
   update_dependencies
-  if brew list php@"$version" 2>/dev/null | grep -q "Error" && [ "$action" != "upgrade" ]; then
+  if ! [[ "$(find "$(brew --cellar)"/php/ -maxdepth 1 -name "$version*" | wc -l 2>/dev/null)" -eq 0 ]] && [ "$action" != "upgrade" ]; then
-    brew unlink php@"$version"
+    brew unlink shivammathur/php/php@"$version"
   else
-    brew "$action" shivammathur/php/php@"$version"
+    brew upgrade "shivammathur/php/php@$version" 2>/dev/null || brew install "shivammathur/php/php@$version"
   fi
   brew link --force --overwrite php@"$version"
 }

src/scripts/linux.sh

@@ -92,7 +92,7 @@ configure_pecl() {
 # Function to get the PECL version of an extension.
 get_pecl_version() {
   extension=$1
-  stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")"
+  stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot|preview)")"
   pecl_rest='https://pecl.php.net/rest/r/'
   response=$(curl "${curl_opts[@]}" "$pecl_rest$extension"/allreleases.xml)
   pecl_version=$(echo "$response" | grep -m 1 -Pio "(\d*\.\d*\.\d*$stability\d*)")
@@ -202,7 +202,7 @@ add_pecl_extension() {
   extension=$1
   pecl_version=$2
   prefix=$3
-  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot).* ]]; then
+  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
     pecl_version=$(get_pecl_version "$extension" "$pecl_version")
   fi
   if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
@@ -339,7 +339,7 @@ add_composertool() {
 add_devtools() {
   tool=$1
   if ! [ -e "/usr/bin/phpize$version" ] || ! [ -e "/usr/bin/php-config$version" ]; then
-    update_lists && $apt_install php"$version"-dev php"$version"-xml >/dev/null 2>&1
+    $apt_install --no-upgrade php"$version"-dev php"$version"-xml >/dev/null 2>&1 || update_lists && $apt_install --no-upgrade php"$version"-dev php"$version"-xml >/dev/null 2>&1
   fi
   sudo update-alternatives --set php-config /usr/bin/php-config"$version" >/dev/null 2>&1
   sudo update-alternatives --set phpize /usr/bin/phpize"$version" >/dev/null 2>&1
@@ -363,7 +363,7 @@ setup_old_versions() {
 add_pecl() {
   add_devtools phpize >/dev/null 2>&1
   if [ ! -e /usr/bin/pecl ]; then
-    $apt_install php-pear >/dev/null 2>&1 || update_lists && $apt_install php-pear >/dev/null 2>&1
+    $apt_install --no-upgrade php-pear >/dev/null 2>&1 || update_lists && $apt_install php-pear >/dev/null 2>&1
   fi
   configure_pecl >/dev/null 2>&1
   pecl_version=$(get_tool_version "pecl" "version")