Bump Node.js dependencies

Continue on npm audit failure

.github/workflows/php.yml

@@ -30,7 +30,7 @@ jobs:
         operating-system: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, windows-2019, macos-latest]
         php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
     env:
-      extensions: xml, opcache, xdebug, pcov
+      extensions: xml, opcache, xdebug, pcov, gd
       key: cache-v5
     steps:
       - name: Checkout
@@ -70,6 +70,7 @@ jobs:
       - name: Testing Extensions
         run: |
           php -m
+          php -r "if(! extension_loaded('gd')) {throw new Exception('gd not found');}"
           php -r "if(! extension_loaded('xml')) {throw new Exception('xml not found');}"
           php -r "if(! extension_loaded('Xdebug')) {throw new Exception('Xdebug not found');}"
           php -r "if(phpversion()>=7.1 && ! extension_loaded('pcov')) {throw new Exception('PCOV not found');}"

README.md

@@ -207,7 +207,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
 - These extensions have custom support:
   - `cubrid`, `pdo_cubrid` and `gearman` on `Ubuntu`.
   - `geos` and `event` on `Ubuntu` and `macOS`.
-  - `blackfire`, `couchbase`, `ioncube`, `oci8`, `pdo_firebird`, `pdo_oci`, `pecl_http`, `phalcon3` and `phalcon4` on all supported OS.
+  - `blackfire`, `couchbase`, `ioncube`, `oci8`, `pdo_firebird`, `pdo_oci`, `pecl_http`, `phalcon3`, `phalcon4` and `phalcon5` on all supported OS.
 
 - By default, extensions which cannot be added or disabled gracefully leave an error message in the logs, the execution is not interrupted. To change this behaviour you can set `fail-fast` flag to `true`.
 
@@ -225,7 +225,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
 
 These tools can be set up globally using the `tools` input. It accepts a string in csv-format.
 
-[`behat`], [`blackfire`], [`blackfire-player`], [`churn`], [`codeception`], [`composer`], [`composer-normalize`], [`composer-prefetcher`], [`composer-require-checker`], [`composer-unused`], [`cs2pr`], [`deployer`], [`flex`], [`grpc_php_plugin`], [`infection`], [`parallel-lint`], [`pecl`], [`phan`], [`phing`], [`phinx`], [`phive`], [`php-config`], [`php-cs-fixer`], [`phpcbf`], [`phpcpd`], [`phpcs`], [`phpdoc`] or [`phpDocumentor`], [`phpize`], [`phplint`], [`phpmd`], [`phpspec`], [`phpstan`], [`phpunit`], [`phpunit-bridge`], [`phpunit-polyfills`], [`prestissimo`], [`protoc`], [`psalm`], [`symfony`] or [`symfony-cli`], [`vapor`] or [`vapor-cli`], [`wp`] or [`wp-cli`]
+[`behat`], [`blackfire`], [`blackfire-player`], [`churn`], [`codeception`], [`composer`], [`composer-normalize`], [`composer-prefetcher`], [`composer-require-checker`], [`composer-unused`], [`cs2pr`], [`deployer`], [`flex`], [`grpc_php_plugin`], [`infection`], [`parallel-lint`], [`pecl`], [`phan`], [`phing`], [`phinx`], [`phive`], [`php-config`], [`php-cs-fixer`], [`phpcbf`], [`phpcpd`], [`phpcs`], [`phpdoc`] or [`phpDocumentor`], [`phpize`], [`phplint`], [`phpmd`], [`phpspec`], [`phpstan`], [`phpunit`], [`phpunit-bridge`], [`phpunit-polyfills`], [`pint`], [`prestissimo`], [`protoc`], [`psalm`], [`rector`], [`symfony`] or [`symfony-cli`], [`vapor`] or [`vapor-cli`], [`wp`] or [`wp-cli`]
 
 ```yaml
 - name: Setup PHP with tools
@@ -254,7 +254,8 @@ These tools can be set up globally using the `tools` input. It accepts a string
   
   When you specify just the major version or the version in `major.minor` format, the latest patch version matching the input will be setup. 
 
-  Except for major versions of `composer`, For other tools when you specify only the `major` version or the version in `major.minor` format for any tool you can get rate limited by GitHub's API. To avoid this, it is recommended to provide a [`GitHub` OAuth token](https://github.com/shivammathur/setup-php#composer-github-oauth "Composer GitHub OAuth"). You can do that by setting `GITHUB_TOKEN` environment variable. The `COMPOSER_TOKEN` environment variable has been deprecated in favor of `GITHUB_TOKEN` and will be removed in a future release.
+  Except for major versions of `composer`, For other tools when you specify only the `major` version or the version in `major.minor` format for any tool you can get rate limited by GitHub's API. To avoid this, it is recommended to provide a [`GitHub` OAuth token](https://github.com/shivammathur/setup-php#composer-github-oauth "Composer GitHub OAuth").
+  You can do that by setting `GITHUB_TOKEN` environment variable. The `COMPOSER_TOKEN` environment variable has been deprecated in favor of `GITHUB_TOKEN` and will be removed in the next major version.
 
 ```yaml
 - name: Setup PHP with tools
@@ -741,7 +742,8 @@ restore-keys: ${{ runner.os }}-composer-${{ matrix.prefer }}-
 ### GitHub Composer Authentication
 
 If you have a number of workflows which set up multiple tools or have many composer dependencies, you might hit the GitHub's rate limit for composer. Also, if you specify only the major version or the version in `major.minor` format, you can hit the rate limit. To avoid this you can specify an `OAuth` token by setting `GITHUB_TOKEN` environment variable. You can use [`GITHUB_TOKEN`](https://help.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token "GITHUB_TOKEN documentation") secret for this purpose.
-The `COMPOSER_TOKEN` key has been deprecated in favor of `GITHUB_TOKEN` and will be removed in the next major version.
+
+The `COMPOSER_TOKEN` environment variable has been deprecated in favor of `GITHUB_TOKEN` and will be removed in the next major version.
 
 ```yaml
 - name: Setup PHP
@@ -1033,9 +1035,11 @@ These companies generously provide setup-php their products and services to aid
 [`phpunit`]:                  https://phpunit.de/
 [`phpunit-bridge`]:           https://symfony.com/doc/current/components/phpunit_bridge.html
 [`phpunit-polyfills`]:        https://github.com/Yoast/PHPUnit-Polyfills
+[`pint`]:                     https://github.com/laravel/pint
 [`prestissimo`]:              https://github.com/hirak/prestissimo
 [`protoc`]:                   https://developers.google.com/protocol-buffers/
 [`psalm`]:                    https://psalm.dev/
+[`rector`]:                   https://getrector.org/
 [`symfony`]:                  https://symfony.com/download
 [`symfony-cli`]:              https://symfony.com/download
 [`vapor`]:                    https://docs.vapor.build/

__tests__/extensions.test.ts

@@ -117,7 +117,7 @@ describe('Extension tests', () => {
       )
         ? `add_${extension}`
         : `add_brew_extension ${formula} ${prefix}`;
-      return [formula, '7.3', output];
+      return [formula, formula === 'phalcon3' ? '7.3' : '7.4', output];
     });
 
   it.each(data)(

__tests__/tools.test.ts

@@ -372,7 +372,7 @@ describe('Tools tests', () => {
 
   it.each([
     [
-      'blackfire, blackfire-player, churn, cs2pr, flex, grpc_php_plugin, parallel-lint, php-cs-fixer, phpDocumentor, phplint, phpstan, phpunit, pecl, phing, phinx, phinx:1.2.3, phive, phpunit-bridge, phpunit-polyfills, php-config, phpize, protoc, symfony, vapor, wp',
+      'blackfire, blackfire-player, churn, cs2pr, flex, grpc_php_plugin, parallel-lint, php-cs-fixer, phpDocumentor, phplint, phpstan, phpunit, pecl, phing, phinx, phinx:1.2.3, phive, phpunit-bridge, phpunit-polyfills, pint, php-config, phpize, protoc, symfony, vapor, wp',
       [
         'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-stable.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-stable.phar,https://getcomposer.org/composer-stable.phar composer',
         'add_blackfire',
@@ -394,6 +394,7 @@ describe('Tools tests', () => {
         'add_tool https://github.com/phar-io/phive/releases/download/3.2.1/phive-3.2.1.phar phive "status"',
         'add_composertool phpunit-bridge phpunit-bridge symfony/ global',
         'add_composertool phpunit-polyfills phpunit-polyfills yoast/ global',
+        'add_tool https://github.com/laravel/pint/releases/latest/download/pint.phar pint "-V"',
         'add_devtools php-config',
         'add_devtools phpize',
         'add_protoc latest',
@@ -411,7 +412,7 @@ describe('Tools tests', () => {
 
   it.each([
     [
-      'behat, blackfire, blackfire-player, churn, composer-normalize, composer-require-checker, composer-unused, cs2pr:1.2.3, flex, grpc_php_plugin:1.2.3, infection, phan, phan:1.2.3, phing:1.2.3, phinx, phive:1.2.3, php-config, phpcbf, phpcpd, phpcs, phpdoc, phpize, phpmd, phpspec, phpunit-bridge:5.6, phpunit-polyfills:1.0.1, protoc:v1.2.3, psalm, symfony-cli, vapor-cli, wp-cli',
+      'behat, blackfire, blackfire-player, churn, composer-normalize, composer-require-checker, composer-unused, cs2pr:1.2.3, flex, grpc_php_plugin:1.2.3, infection, phan, phan:1.2.3, phing:1.2.3, phinx, phive:1.2.3, php-config, phpcbf, phpcpd, phpcs, phpdoc, phpize, phpmd, phpspec, phpunit-bridge:5.6, phpunit-polyfills:1.0.1, protoc:v1.2.3, psalm, rector, symfony-cli, vapor-cli, wp-cli',
       [
         'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-stable.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-stable.phar,https://getcomposer.org/composer-stable.phar composer',
         'add_composertool behat behat behat/ scoped',
@@ -442,6 +443,7 @@ describe('Tools tests', () => {
         'add_composertool phpunit-polyfills phpunit-polyfills:1.0.1 yoast/ global',
         'add_protoc 1.2.3',
         'add_tool https://github.com/vimeo/psalm/releases/latest/download/psalm.phar psalm "-v"',
+        'add_composertool rector rector rector/ scoped',
         'add_symfony latest',
         'add_composertool vapor-cli vapor-cli laravel/ scoped',
         'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "2.20.1",
+  "version": "2.21.2",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "lib/install.js",
@@ -34,27 +34,27 @@
   "author": "shivammathur",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.9.0",
+    "@actions/core": "^1.9.1",
     "@actions/exec": "^1.1.1",
     "@actions/io": "^1.1.2"
   },
   "devDependencies": {
-    "@types/jest": "^28.1.4",
-    "@types/node": "^18.0.3",
-    "@typescript-eslint/eslint-plugin": "^5.30.5",
-    "@typescript-eslint/parser": "^5.30.5",
+    "@types/jest": "^28.1.7",
+    "@types/node": "^18.7.6",
+    "@typescript-eslint/eslint-plugin": "^5.33.1",
+    "@typescript-eslint/parser": "^5.33.1",
     "@vercel/ncc": "^0.34.0",
-    "eslint": "^8.19.0",
+    "eslint": "^8.22.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^26.5.3",
+    "eslint-plugin-jest": "^26.8.3",
     "eslint-plugin-prettier": "^4.2.1",
-    "jest": "^28.1.2",
-    "jest-circus": "^28.1.2",
-    "nock": "^13.2.8",
+    "jest": "^28.1.3",
+    "jest-circus": "^28.1.3",
+    "nock": "^13.2.9",
     "prettier": "^2.7.1",
     "simple-git-hooks": "^2.8.0",
-    "ts-jest": "^28.0.5",
+    "ts-jest": "^28.0.8",
     "typescript": "^4.7.4"
   },
   "bugs": {

src/configs/brew_extensions

@@ -1,5 +1,6 @@
 amqp=amqp
 apcu=apcu
+ast=ast
 couchbase=couchbase
 event=event
 expect=expect
@@ -18,6 +19,7 @@ pcov=pcov
 pecl_http=http
 phalcon3=phalcon
 phalcon4=phalcon
+phalcon5=phalcon
 propro=propro
 protobuf=protobuf
 psr=psr

src/configs/tools.json

@@ -105,6 +105,14 @@
     "version_prefix": "",
     "version_parameter": "-V"
   },
+  "pint": {
+    "type": "phar",
+    "repository": "laravel/pint",
+    "extension": ".phar",
+    "domain": "https://github.com",
+    "version_prefix": "Pint ",
+    "version_parameter": "-V"
+  },
   "psalm": {
     "type": "phar",
     "repository": "vimeo/psalm",
@@ -176,6 +184,11 @@
     "repository": "laravel/vapor-cli",
     "scope": "scoped"
   },
+  "rector": {
+    "type": "composer",
+    "repository": "rector/rector",
+    "scope": "scoped"
+  },
   "blackfire": {
     "type": "custom-package",
     "alias": "blackfire-agent"

src/extensions.ts

@@ -35,7 +35,7 @@ export async function addExtensionDarwin(
       // match 5.3blackfire-(semver)...8.1blackfire-(semver)
       // match couchbase, event, geos, pdo_oci, oci8, http, pecl_http
       // match 5.3ioncube...7.4ioncube
-      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
+      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.2phalcon5
       case /^(5\.[3-6]|7\.[0-4]|8\.[0-1])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
@@ -43,7 +43,9 @@ export async function addExtensionDarwin(
         extension
       ):
       case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
-      case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4/.test(version_extension):
+      case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4|(7\.4|8\.[0-2])phalcon5/.test(
+        version_extension
+      ):
       case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
         add_script += await utils.customPackage(
           ext_name,
@@ -83,7 +85,7 @@ export async function addExtensionDarwin(
       ):
       case /(5\.6|7\.[0-4])propro/.test(version_extension):
       case /(?<!5\.[3-6]|7\.0)pcov/.test(version_extension):
-      case /(?<!5\.[3-6])(vips|xlswriter)/.test(version_extension):
+      case /(?<!5\.[3-6])(ast|vips|xlswriter)/.test(version_extension):
         add_script += await utils.joins(
           '\nadd_brew_extension',
           ext_name,
@@ -132,14 +134,16 @@ export async function addExtensionWindows(
       // match 5.3blackfire-(semver)...8.1blackfire-(semver)
       // match pdo_oci and oci8
       // match 5.3ioncube...7.4ioncube
-      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
+      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.2phalcon5
       // match 7.1pecl_http...8.1pecl_http and 7.1http...8.1http
       case /^(5\.[3-6]|7\.[0-4]|8\.1)blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
       case /^pdo_oci$|^oci8$|^pdo_firebird$/.test(extension):
       case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
-      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-2])phalcon5$/.test(
+        version_extension
+      ):
       case /^(7\.[1-4]|8\.1)(pecl_)?http/.test(version_extension):
         add_script += await utils.customPackage(
           ext_name,
@@ -255,7 +259,7 @@ export async function addExtensionLinux(
       // match 5.3pdo_cubrid...7.2php_cubrid, 5.3cubrid...7.4cubrid
       // match couchbase, geos, pdo_oci, oci8, http, pecl_http
       // match 5.3ioncube...7.4ioncube
-      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
+      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, 7.4phalcon5...8.2phalcon5
       case /^(5\.[3-6]|7\.[0-4]|8\.[0-1])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
@@ -267,7 +271,9 @@ export async function addExtensionLinux(
       ):
       case /(?<!5\.[3-5])intl-[\d]+\.[\d]+$/.test(version_extension):
       case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
-      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-2])phalcon5$/.test(
+        version_extension
+      ):
       case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
         add_script += await utils.customPackage(
           ext_name,

src/scripts/extensions/add_extensions.sh

@@ -144,13 +144,18 @@ add_extension() {
 # Function to get the PECL version of an extension.
 get_pecl_version() {
   local extension=$1
-  stability="$(echo "$2" | grep -m 1 -Eio "(stable|alpha|beta|rc|snapshot|preview)")"
+  states=("stable" "rc" "preview" "beta" "alpha" "snapshot")
+  stability="$(echo "$2" | grep -m 1 -Eio "($(IFS='|' ; echo "${states[*]}"))")"
+  IFS=' ' read -r -a states <<< "$(echo "${states[@]}" | grep -Eo "$stability.*")"
+  major_version=${3:-'[0-9]+'}
   pecl_rest='https://pecl.php.net/rest/r/'
   response=$(get -s -n "" "$pecl_rest$extension"/allreleases.xml)
-  pecl_version=$(echo "$response" | grep -m 1 -Eio "([0-9]+\.[0-9]+\.[0-9]+${stability}[0-9]+)")
-  if [ ! "$pecl_version" ]; then
-    pecl_version=$(echo "$response" | grep -m 1 -Eo "([0-9]+\.[0-9]+\.[0-9]+)")
-  fi
+  for state in "${states[@]}"; do
+    pecl_version=$(echo "$response" | grep -m 1 -Eio "($major_version\.[0-9]+\.[0-9]+${state}[0-9]+<)" | cut -d '<' -f 1)
+    [ -z "$pecl_version" ] && pecl_version=$(echo "$response" | grep -m 1 -Eio "v>(.*)<\/v>.*$state<" | grep -m 1 -Eo "($major_version\.[0-9]+\.[0-9]+.*)<" | cut -d '<' -f 1)
+    [ -n "$pecl_version" ] && break;
+  done
+  [ -z "$pecl_version" ] && pecl_version=$(echo "$response" | grep -m 1 -Eo "($major_version\.[0-9]+\.[0-9]+)<" | cut -d '<' -f 1)
   echo "$pecl_version"
 }
 
@@ -184,8 +189,9 @@ add_pecl_extension() {
     add_log "${tick:?}" "$extension" "Enabled"
   else
     disable_extension_helper "$extension" >/dev/null 2>&1
-    pecl_install "$extension-$pecl_version"
-    add_extension_log "$extension-$pecl_version" "Installed and enabled"
+    [ -n "$pecl_version" ] && pecl_version="-$pecl_version"
+    pecl_install "$extension$pecl_version" || add_extension "$extension" "$(get_extension_prefix "$extension")" >/dev/null 2>&1
+    add_extension_log "$extension-$(php -r "echo phpversion('$extension');")" "Installed and enabled"
   fi
 }
 
@@ -197,3 +203,8 @@ add_unstable_extension() {
   pecl_version=$(get_pecl_version "$extension" "$stability")
   add_pecl_extension "$extension" "$pecl_version" "$prefix"
 }
+
+# Function to get extension prefix
+get_extension_prefix() {
+  echo "$1" | grep -Eq "xdebug([2-3])?$|opcache|ioncube|eaccelerator" && echo zend_extension || echo extension
+}

src/scripts/extensions/phalcon.ps1

@@ -1,16 +1,36 @@
-# Function to install phalcon
-Function Add-PhalconHelper() {
-  if ($extension_version -eq '4') {
-    Install-Phpextension -Extension phalcon -MinimumStability stable -Path $php_dir
-  } else {
-    $domain = 'https://github.com'
-    $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
-    $match = Invoke-WebRequest -Uri "$domain/phalcon/cphalcon/releases/v3.4.5" | Select-String -Pattern "href=`"(.*phalcon_x64_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)`""
+# Function to add phalcon using GitHub releases.
+Function Add-PhalconFromGitHub() {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [string]
+    $Semver
+  )
+  $domain = 'https://github.com'
+  $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
+  $match = Invoke-WebRequest -Uri "$domain/phalcon/cphalcon/releases/v$Semver" | Select-String -Pattern "href=`"(.*phalcon_x64_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)`""
+  if($NULL -eq $match) {
+    $nts = if (!$installed.ThreadSafe) { "-nts" } else { "-ts" }
+    $match = Invoke-WebRequest -Uri "$domain/phalcon/cphalcon/releases/v$Semver" | Select-String -Pattern "href=`"(.*phalcon-php${version}${nts}-windows.*-x64.zip)`""
+  }
+  if($NULL -ne $match) {
     $zip_file = $match.Matches[0].Groups[1].Value
     Invoke-WebRequest -Uri $domain/$zip_file -OutFile $ENV:RUNNER_TOOL_CACHE\phalcon.zip > $null 2>&1
     Expand-Archive -Path $ENV:RUNNER_TOOL_CACHE\phalcon.zip -DestinationPath $ENV:RUNNER_TOOL_CACHE\phalcon -Force > $null 2>&1
     Copy-Item -Path "$ENV:RUNNER_TOOL_CACHE\phalcon\php_phalcon.dll" -Destination "$ext_dir\php_phalcon.dll"
     Enable-PhpExtension -Extension phalcon -Path $php_dir
+  } else {
+    throw "Unable to get Phalcon release from the GitHub release"
+  }
+}
+# Function to install phalcon
+Function Add-PhalconHelper() {
+  if ($extension_version -eq '5') {
+    Add-PhalconFromGitHub -Semver (Get-PeclPackageVersion phalcon 5 snapshot stable | Select-Object -First 1)
+  } elseif ($extension_version -eq '4') {
+    Install-Phpextension -Extension phalcon -MinimumStability stable -Path $php_dir
+  } elseif ($extension_version -eq '3') {
+    Add-PhalconFromGitHub -Semver 3.4.5
   }
 }
 
@@ -18,7 +38,7 @@ Function Add-Phalcon() {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
     [ValidateNotNull()]
-    [ValidateSet('phalcon3', 'phalcon4')]
+    [ValidateSet('phalcon3', 'phalcon4', 'phalcon5')]
     [string]
     $extension
   )

src/scripts/extensions/phalcon.sh

@@ -1,13 +1,39 @@
+# Helper function to get phalcon version
+get_phalcon_version() {
+  if [ "$extension" = "phalcon5" ]; then
+    semver="$(get_pecl_version phalcon stable 5)"
+    ([ -n "$semver" ] && echo "$semver") || get_pecl_version phalcon rc 5
+  elif [ "$extension" = "phalcon4" ]; then
+    echo '4.1.3'
+  elif [ "$extension" = "phalcon3" ]; then
+    echo '3.4.5'
+  fi
+}
+
+# Function to add phalcon from repo.
+add_phalcon_from_repo(){
+  version=${version:?}
+  if [ "$extension" = "phalcon5" ]; then
+    PHALCON_PATH=build/phalcon
+  else
+    PHALCON_PATH=build/php"${version%.*}"/64bits
+  fi
+  PHALCON_CONFIGURE_OPTS="--enable-phalcon --with-php-config=$(command -v php-config)"
+  export PHALCON_PATH
+  export PHALCON_CONFIGURE_OPTS
+  add_extension_from_source phalcon https://github.com phalcon cphalcon v"$(get_phalcon_version)" extension
+}
+
 # Helper function to add phalcon.
 add_phalcon_helper() {
   status='Installed and enabled'
   if [ "$(uname -s)" = "Darwin" ]; then
     add_brew_extension "$extension" extension
   else
-    packages=("php${version:?}-$extension")
-    [ "$extension" = "phalcon4" ] && packages+=("php${version:?}-psr")
+    package="php${version:?}-$extension"
     add_ppa ondrej/php >/dev/null 2>&1 || update_ppa ondrej/php
-    check_package "${packages[0]}" && install_packages "${packages[@]}"
+    [ "$extension" = "phalcon4" ] && (install_packages "php${version:?}-psr" || pecl_install psr || pecl_install psr-1.1.0)
+    (check_package "$package" && install_packages "$package") || add_phalcon_from_repo
   fi
 }
 
@@ -44,15 +70,27 @@ add_phalcon4() {
   fi
 }
 
+# Function to add phalcon3.
+add_phalcon5() {
+  if shared_extension phalcon; then
+    phalcon_version=$(php -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
+    if [ "$phalcon_version" != "$extension_major_version" ]; then
+      add_phalcon_helper
+    else
+      enable_extension phalcon extension
+    fi
+  else
+    add_phalcon_helper
+  fi
+}
+
 # Function to add phalcon.
 add_phalcon() {
   extension=$1
   status='Enabled'
   extension_major_version=${extension: -1}
-  if [ "$extension_major_version" = "4" ]; then
-    add_phalcon4 >/dev/null 2>&1
-  elif [ "$extension_major_version" = "3" ]; then
-    add_phalcon3 >/dev/null 2>&1
+  if [[ "$extension_major_version" =~ [3-5] ]]; then
+    add_phalcon"$extension_major_version" >/dev/null 2>&1
   fi
   add_extension_log "phalcon" "$status"
 }

src/scripts/tools/add_tools.ps1

@@ -201,11 +201,15 @@ Function Add-ComposertoolHelper() {
     [string]
     $composer_args
   )
+  $tool_version = $release.split(':')[1]
+  if($NULL -eq $tool_version) {
+    $tool_version = '*'
+  }
   if($scope -eq 'global') {
     if(Test-Path $composer_lock) {
       Remove-Item -Path $composer_lock -Force
     }
-    if((composer global show $prefix$tool -a 2>&1 | findstr '^type *: *composer-plugin') -and ($composer_args -ne '')) {
+    if((composer global show $prefix$tool $tool_version -a 2>&1 | findstr '^type *: *composer-plugin') -and ($composer_args -ne '')) {
       composer global config --no-plugins allow-plugins."$prefix$tool" true >$null 2>&1
     }
     composer global require $prefix$release $composer_args >$null 2>&1
@@ -215,11 +219,12 @@ Function Add-ComposertoolHelper() {
     $scoped_dir_suffix = (Get-FileHash -InputStream $release_stream -Algorithm sha256).Hash
     $scoped_dir = "$composer_bin\_tools\$tool-$scoped_dir_suffix"
     $unix_scoped_dir = $scoped_dir.replace('\', '/')
-    if((composer show $prefix$tool -d $unix_scoped_dir -a 2>&1 | findstr '^type *: *composer-plugin') -and ($composer_args -ne '')) {
-      composer config -d $unix_scoped_dir --no-plugins allow-plugins."$prefix$release" true >$null 2>&1
-    }
     if(-not(Test-Path $scoped_dir)) {
       New-Item -ItemType Directory -Force -Path $scoped_dir > $null 2>&1
+      Set-Content -Path $scoped_dir\composer.json -Value "{}"
+      if((composer show $prefix$tool $tool_version -d $unix_scoped_dir -a 2>&1 | findstr '^type *: *composer-plugin') -and ($composer_args -ne '')) {
+        composer config -d $unix_scoped_dir --no-plugins allow-plugins."$prefix$tool" true >$null 2>&1
+      }
       composer require $prefix$release -d $unix_scoped_dir $composer_args >$null 2>&1
     }
     [System.Environment]::SetEnvironmentVariable(($tool.replace('-', '_') + '_bin'), "$scoped_dir\vendor\bin")

src/scripts/tools/add_tools.sh

@@ -160,9 +160,10 @@ add_composertool_helper() {
   scope=$4
   composer_args=$5
   enable_extensions curl mbstring openssl
+  tool_version=${release##*:}; [ "$tool_version" = "$tool" ] && tool_version="*"
   if [ "$scope" = "global" ]; then
     sudo rm -f "$composer_lock" >/dev/null 2>&1 || true
-    if composer global show "$prefix$tool" -a 2>&1 | grep -qE '^type *: *composer-plugin' && [ -n "$composer_args" ]; then
+    if composer global show "$prefix$tool" "$tool_version" -a 2>&1 | grep -qE '^type *: *composer-plugin' && [ -n "$composer_args" ]; then
       composer global config --no-plugins allow-plugins."$prefix$tool" true >/dev/null 2>&1
     fi
     composer global require "$prefix$release" "$composer_args" >/dev/null 2>&1
@@ -172,7 +173,7 @@ add_composertool_helper() {
     if ! [ -d "$scoped_dir" ]; then
       mkdir -p "$scoped_dir"
       echo '{}' | tee "$scoped_dir/composer.json" >/dev/null
-      if composer show "$prefix$tool" -d "$scoped_dir" -a 2>&1 | grep -qE '^type *: *composer-plugin' && [ -n "$composer_args" ]; then
+      if composer show "$prefix$tool" "$tool_version" -d "$scoped_dir" -a 2>&1 | grep -qE '^type *: *composer-plugin' && [ -n "$composer_args" ]; then
         composer config -d "$scoped_dir" --no-plugins allow-plugins."$prefix$tool" true >/dev/null 2>&1
       fi
       composer require "$prefix$release" -d "$scoped_dir" "$composer_args" >/dev/null 2>&1

src/scripts/tools/symfony.sh

@@ -1,12 +1,16 @@
-add_symfony() {
-  if [ "$(uname -s)" = "Linux" ]; then
-    echo 'deb [trusted=yes] https://repo.symfony.com/apt/ /' | sudo tee /etc/apt/sources.list.d/symfony-cli.list >/dev/null 2>&1
-    update_lists symfony repo.symfony.com
-    install_packages symfony-cli
-  elif [ "$(uname -s)" = "Darwin" ]; then
+add_symfony_helper() {
+  if command -v brew >/dev/null; then
     add_brew_tap symfony-cli/homebrew-tap
-    brew install symfony-cli/tap/symfony-cli >/dev/null 2>&1
+    brew install symfony-cli/tap/symfony-cli
+  else
+    arch=$(dpkg --print-architecture)
+    get -s -n "" "https://github.com/symfony-cli/symfony-cli/releases/latest/download/symfony-cli_linux_$arch.tar.gz" | sudo tar -xz -C "${tool_path_dir:?}"
+    sudo chmod a+x /usr/local/bin/symfony
   fi
+}
+
+add_symfony() {
+  add_symfony_helper >/dev/null 2>&1
   symfony_path="$(command -v symfony)"
   if [[ -n "$symfony_path" ]]; then
     sudo ln -s "$symfony_path" "${tool_path_dir:?}"/symfony-cli