Fix PECL extension installation on darwin

.github/workflows/workflow.yml

@@ -8,7 +8,7 @@ jobs:
       max-parallel: 6
       matrix:
         operating-system: [ubuntu-latest, windows-latest, macOS-latest]
-        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
+        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3']
     steps:
     - name: Checkout
       uses: actions/checkout@master
@@ -21,10 +21,21 @@ jobs:
     - name: Installing NPM
       run: npm install  
 
-    - name: Installing PHP
+    - name: Installing PHP with extensions and custom config
       run: node lib/install.js
       env:
         php-version: ${{ matrix.php-versions }}
-        extension-csv: "mbstring, curl, mysqli, json, xml, xdebug, pcov, phpdbg"
-    - name: Testing
-      run: php -v && composer -V && php -m
+        extension-csv: "mbstring, xdebug, pcov" #optional
+        ini-values-csv: "post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata" #optional
+
+    - name: Testing PHP version
+      run: php -v
+    - name: Testing Composer version
+      run: composer -V
+    - name: Testing Extensions
+      run: php -m
+    - name: Testing ini values
+      run: |
+        php -r "echo \"post_max_size: \" . ini_get('post_max_size') . \"\n\";"
+        php -r "echo \"short_open_tag: \" . ini_get('short_open_tag') . \"\n\";"
+        php -r "echo \"date.timezone: \" . ini_get('date.timezone') . \"\n\";"

README.md

@@ -5,7 +5,7 @@
   <a href="https://github.com/shivammathur/setup-php/blob/master/LICENSE"><img alt="LICENSE" src="https://img.shields.io/badge/license-MIT-428f7e.svg"></a>
 </p>
 
-[GitHub Action](https://github.com/features/actions) to install PHP with required extensions and composer. This action can be added as a step in your action workflow and it will setup the PHP environment you need to test your application. Refer to [Usage](#usage) section to see how to use this.
+[GitHub Action](https://github.com/features/actions) to install PHP with required extensions, php.ini configuration and composer. This action can be added as a step in your action workflow and it will setup the PHP environment you need to test your application. Refer to [Usage](#usage) section to see how to use this.
 
 ## PHP Versions Support
 - 5.6
@@ -13,7 +13,7 @@
 - 7.1
 - 7.2
 - 7.3
-- 7.4 `7.4.0beta4` on `ubuntu`, and `7.4.0RC1` on `windows` and `macOS`
+- 7.4 `7.4.0beta4` on `ubuntu`, and `7.4.0RC2` on `windows` and `macOS`
 
 **Note:** PHP 7.4 is currently in development, do not use in production.
 
@@ -36,9 +36,15 @@
 
 ## Usage
 
-See [action.yml](action.yml) for inputs this action supports.
+Inputs supported by this GitHub Action.
 
-### Basic
+- php-version
+- extension-csv (optional)
+- ini-values-csv (optional)
+
+See [action.yml](action.yml) for more info
+
+### Basic Usage
 
 ```yaml
 steps:
@@ -48,7 +54,8 @@ steps:
   uses: shivammathur/setup-php@master
   with:
     php-version: 7.3
-    extension-csv: mbstring, xdebug
+    extension-csv: mbstring, xdebug #optional
+    ini-values-csv: "post_max_size=256M, short_open_tag=On" #optional
 - name: Check PHP Version
   run: php -v
 - name: Check Composer Version
@@ -76,7 +83,8 @@ jobs:
       uses: shivammathur/setup-php@master
       with:
         php-version: ${{ matrix.php-versions }}
-        extension-csv: mbstring, xdebug
+        extension-csv: mbstring, xdebug #optional
+        ini-values-csv: "post_max_size=256M, short_open_tag=On" #optional
     - name: Check PHP Version
       run: php -v
     - name: Check Composer Version

action.yml

@@ -11,6 +11,9 @@ inputs:
   extension-csv:
     description: '(Optional) Comma seperated list of PHP extensions to be installed.'
     required: false
+  ini-values-csv: 
+    description: '(Optional) Custom values you want to set in php.ini'
+    required: false
 runs:
   using: 'node12'
   main: 'lib/install.js'

lib/install.js

@@ -42,26 +42,28 @@ function asyncForEach(array, callback) {
 Enable extensions which are installed but not enabled
 */
 function enableExtension(extension) {
-    return __awaiter(this, void 0, void 0, function* () {
-        windows += `try {
+    windows += `try {
+  $${extension}_found = 0
   $ext_dir = Get-PhpIniKey extension_dir
   $exist = Test-Path -Path $ext_dir\\php_${extension}.dll
   $enabled = php -r "if (in_array('${extension}', get_loaded_extensions())) {echo 'yes';} else {echo 'no';}"
   if($enabled -eq 'no' -and $exist) {
     Enable-PhpExtension ${extension} C:\\tools\\php$version
+    $${extension}_found = 1
   }
 } catch [Exception] {
   echo $_
 }\n`;
-        let shell_code = `ext_dir=$(php-config --extension-dir)
+    let shell_code = `ext_dir=$(php-config --extension-dir)
+${extension}_found=0
 enabled=$(php -r "if (in_array('${extension}', get_loaded_extensions())) {echo 'yes';} else {echo 'no';}")
 if [ "$enabled" = "no" ] && [ -e "$ext_dir/${extension}.so" ]; then
   echo "extension=${extension}.so" >> 'php -i | grep "Loaded Configuration" | sed -e "s|.*=>\s*||"'
   echo "${extension} enabled"
+  ${extension}_found=1
 fi\n`;
-        linux += shell_code;
-        darwin += shell_code;
-    });
+    linux += shell_code;
+    darwin += shell_code;
 }
 /*
 Install and enable extensions
@@ -86,7 +88,9 @@ function addExtension(extension_csv, version) {
                 // else add script to attempt to install the extension
                 if (os_version == 'linux') {
                     linux +=
-                        'sudo apt install -y php' +
+                        'if [ $' +
+                            extension +
+                            '_found -eq 0 ]; then sudo DEBIAN_FRONTEND=noninteractive apt install -y php' +
                             version +
                             '-' +
                             extension +
@@ -94,7 +98,7 @@ function addExtension(extension_csv, version) {
                             version +
                             '-' +
                             extension +
-                            '"\n';
+                            '"; fi\n';
                 }
                 else {
                     // check if pecl extension exists
@@ -109,19 +113,24 @@ function addExtension(extension_csv, version) {
                             extension_version = 'alpha';
                         }
                         windows +=
-                            'try { Install-PhpExtension ' +
+                            'if($' +
+                                extension +
+                                '_found -eq 0) { ' +
+                                'try { Install-PhpExtension ' +
                                 extension +
                                 ' -MinimumStability ' +
                                 extension_version +
                                 ' } catch [Exception] { echo $_; echo "Could not install extension: "' +
                                 extension +
-                                ' }\n';
+                                ' } }\n';
                         darwin +=
-                            'pecl install ' +
+                            'if [ $' +
+                                extension +
+                                '_found -eq 0 ]; then sudo pecl install ' +
                                 extension +
                                 ' || echo "Couldn\'t find extension: ' +
                                 extension +
-                                '"\n';
+                                '"; fi\n';
                     }
                     else {
                         console.log('Cannot find pecl extension: ' + extension);
@@ -129,7 +138,28 @@ function addExtension(extension_csv, version) {
                 }
             });
         });
-        linux += 'sudo apt autoremove -y';
+        linux += 'sudo DEBIAN_FRONTEND=noninteractive apt autoremove -y';
+    });
+}
+/*
+Add script to set custom ini values
+*/
+function addINIValues(ini_values_csv) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let ini_values = ini_values_csv
+            .split(',')
+            .map(function (ini_value) {
+            return ini_value.trim();
+        });
+        yield asyncForEach(ini_values, function (ini_value) {
+            return __awaiter(this, void 0, void 0, function* () {
+                // add script to set ini value
+                linux += '\necho "' + ini_value + '" >> $ini_file';
+                darwin += '\necho "' + ini_value + '" >> $ini_file';
+                windows +=
+                    '\nAdd-Content C:\\tools\\php$version\\php.ini "' + ini_value + '"';
+            });
+        });
     });
 }
 /*
@@ -166,7 +196,7 @@ function run() {
             if (!version) {
                 version = core.getInput('php-version', { required: true });
             }
-            console.log('Input: ' + version);
+            console.log('Version: ' + version);
             if (version == '7.4') {
                 darwin = fs.readFileSync(path.join(__dirname, '../src/7.4.sh'), 'utf8');
             }
@@ -175,9 +205,17 @@ function run() {
                 extension_csv = core.getInput('extension-csv');
             }
             if (extension_csv) {
-                console.log('Input: ' + extension_csv);
+                console.log('Extensions: ' + extension_csv);
                 yield addExtension(extension_csv, version);
             }
+            let ini_values_csv = process.env['ini-values-csv'];
+            if (!ini_values_csv) {
+                ini_values_csv = core.getInput('ini-values-csv');
+            }
+            if (ini_values_csv) {
+                console.log('INI Values: ' + ini_values_csv);
+                yield addINIValues(ini_values_csv);
+            }
             // check the os version and run the respective script
             if (os_version == 'darwin') {
                 yield createScript('darwin.sh', version);

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "private": false,
   "description": "Setup php action",
   "main": "lib/setup-php.js",

src/7.4.sh

@@ -41,8 +41,10 @@ sudo mkdir -p /opt/phpbrew
 phpbrew init --root=/opt/phpbrew
 echo "[[ -e ~/.phpbrew/bashrc ]] && source ~/.phpbrew/bashrc" >> ~/.bashrc
 source ~/.bashrc
-phpbrew install -j 10 7.4.0RC1 +default +bz2="$(brew --prefix bzip2)" +zlib="$(brew --prefix zlib)" -openssl --  --with-libxml
-phpbrew switch php-7.4.0RC1 >> /dev/null
+phpbrew install -j 10 7.4.0RC2 +default +bz2="$(brew --prefix bzip2)" +zlib="$(brew --prefix zlib)" -openssl --  --with-libxml
+phpbrew switch php-7.4.0RC2 >> /dev/null
 sudo mkdir -p /usr/local/bin
-sudo ln -sf /Users/runner/.phpbrew/php/php-7.4.0RC1/bin/php /usr/local/bin/php
+sudo ln -sf /Users/runner/.phpbrew/php/php-7.4.0RC2/bin/php /usr/local/bin/php
+ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
+sudo chmod 777 $ini_file
 brew install composer

src/darwin.sh

@@ -1,10 +1,18 @@
-echo $1
-brew unlink php
-brew tap exolnet/homebrew-deprecated
-brew install php@$1
-brew link --force --overwrite php@$1
+version=$(php-config --version | cut -c 1-3)
+if [ "$version" != "$1" ]; then
+	brew tap exolnet/homebrew-deprecated;
+	brew unlink php;
+	brew install php@$1;
+	brew link --force --overwrite php@$1;
+else
+	sudo cp /etc/php.ini.default /etc/php.ini	
+fi
+ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
+sudo chmod 777 $ini_file
+mkdir -p $(pecl config-get ext_dir)
 curl -sS https://getcomposer.org/installer | php
 chmod +x composer.phar
 mv composer.phar /usr/local/bin/composer
+composer global require hirak/prestissimo
 php -v
 composer -V

src/install.ts

@@ -27,23 +27,27 @@ async function asyncForEach(array: any, callback: any) {
 /*
 Enable extensions which are installed but not enabled
 */
-async function enableExtension(extension: string) {
+function enableExtension(extension: string) {
   windows += `try {
+  $${extension}_found = 0
   $ext_dir = Get-PhpIniKey extension_dir
   $exist = Test-Path -Path $ext_dir\\php_${extension}.dll
   $enabled = php -r "if (in_array('${extension}', get_loaded_extensions())) {echo 'yes';} else {echo 'no';}"
   if($enabled -eq 'no' -and $exist) {
     Enable-PhpExtension ${extension} C:\\tools\\php$version
+    $${extension}_found = 1
   }
 } catch [Exception] {
   echo $_
 }\n`;
 
   let shell_code = `ext_dir=$(php-config --extension-dir)
+${extension}_found=0
 enabled=$(php -r "if (in_array('${extension}', get_loaded_extensions())) {echo 'yes';} else {echo 'no';}")
 if [ "$enabled" = "no" ] && [ -e "$ext_dir/${extension}.so" ]; then
   echo "extension=${extension}.so" >> 'php -i | grep "Loaded Configuration" | sed -e "s|.*=>\s*||"'
   echo "${extension} enabled"
+  ${extension}_found=1
 fi\n`;
   linux += shell_code;
   darwin += shell_code;
@@ -71,7 +75,9 @@ async function addExtension(extension_csv: string, version: string) {
     // else add script to attempt to install the extension
     if (os_version == 'linux') {
       linux +=
-        'sudo apt install -y php' +
+        'if [ $' +
+        extension +
+        '_found -eq 0 ]; then sudo DEBIAN_FRONTEND=noninteractive apt install -y php' +
         version +
         '-' +
         extension +
@@ -79,7 +85,7 @@ async function addExtension(extension_csv: string, version: string) {
         version +
         '-' +
         extension +
-        '"\n';
+        '"; fi\n';
     } else {
       // check if pecl extension exists
       const http = new httpm.HttpClient('shivammathur/php-setup', [], {
@@ -95,25 +101,48 @@ async function addExtension(extension_csv: string, version: string) {
           extension_version = 'alpha';
         }
         windows +=
+          'if($' +
+          extension +
+          '_found -eq 0) { ' +
           'try { Install-PhpExtension ' +
           extension +
           ' -MinimumStability ' +
           extension_version +
           ' } catch [Exception] { echo $_; echo "Could not install extension: "' +
           extension +
-          ' }\n';
+          ' } }\n';
         darwin +=
-          'pecl install ' +
+          'if [ $' +
+          extension +
+          '_found -eq 0 ]; then sudo pecl install ' +
           extension +
           ' || echo "Couldn\'t find extension: ' +
           extension +
-          '"\n';
+          '"; fi\n';
       } else {
         console.log('Cannot find pecl extension: ' + extension);
       }
     }
   });
-  linux += 'sudo apt autoremove -y';
+  linux += 'sudo DEBIAN_FRONTEND=noninteractive apt autoremove -y';
+}
+
+/*
+Add script to set custom ini values
+*/
+async function addINIValues(ini_values_csv: string) {
+  let ini_values: any = ini_values_csv
+    .split(',')
+    .map(function(ini_value: string) {
+      return ini_value.trim();
+    });
+  await asyncForEach(ini_values, async function(ini_value: string) {
+    // add script to set ini value
+    linux += '\necho "' + ini_value + '" >> $ini_file';
+    darwin += '\necho "' + ini_value + '" >> $ini_file';
+    windows +=
+      '\nAdd-Content C:\\tools\\php$version\\php.ini "' + ini_value + '"';
+  });
 }
 
 /*
@@ -146,7 +175,7 @@ async function run() {
     if (!version) {
       version = core.getInput('php-version', {required: true});
     }
-    console.log('Input: ' + version);
+    console.log('Version: ' + version);
 
     if (version == '7.4') {
       darwin = fs.readFileSync(path.join(__dirname, '../src/7.4.sh'), 'utf8');
@@ -157,10 +186,19 @@ async function run() {
       extension_csv = core.getInput('extension-csv');
     }
     if (extension_csv) {
-      console.log('Input: ' + extension_csv);
+      console.log('Extensions: ' + extension_csv);
       await addExtension(extension_csv, version);
     }
 
+    let ini_values_csv = process.env['ini-values-csv'];
+    if (!ini_values_csv) {
+      ini_values_csv = core.getInput('ini-values-csv');
+    }
+    if (ini_values_csv) {
+      console.log('INI Values: ' + ini_values_csv);
+      await addINIValues(ini_values_csv);
+    }
+
     // check the os version and run the respective script
     if (os_version == 'darwin') {
       await createScript('darwin.sh', version);

src/linux.sh

@@ -1,10 +1,25 @@
-sudo add-apt-repository ppa:ondrej/php -y
-sudo apt update -y
+version=$(php-config --version | cut -c 1-3)
+if [ "$version" != "$1" ]; then
+	if [ ! -e "/usr/bin/php$1" ]; then
+		sudo DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:ondrej/php -y
+		sudo DEBIAN_FRONTEND=noninteractive apt update -y		
+		sudo DEBIAN_FRONTEND=noninteractive apt install -y php$1 curl;
+		sudo DEBIAN_FRONTEND=noninteractive apt autoremove -y;		
+	fi
+	for tool in php phar phar.phar php-cgi php-config phpize; do
+		if [ -e "/usr/bin/$tool$1" ]; then
+			sudo update-alternatives --set $tool /usr/bin/$tool$1;
+		fi
+	done
+fi	
+
+if [ ! -e "/usr/bin/composer" ]; then
+	sudo curl -s https://getcomposer.org/installer | php;
+	sudo mv composer.phar /usr/local/bin/composer;
+fi
+composer global require hirak/prestissimo
+ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
+sudo chmod 777 $ini_file
 sudo mkdir -p /run/php
-sudo apt install -y php$1 curl
-sudo apt autoremove -y
-sudo update-alternatives --set php /usr/bin/php$1
-sudo curl -s https://getcomposer.org/installer | php
-sudo mv composer.phar /usr/local/bin/composer
 php -v
 composer -V

src/windows.ps1

@@ -3,37 +3,44 @@ param (
 )
 
 if($version -eq '7.4') {
-	$version = '7.4RC1'
+	$version = '7.4RC'
 }
-
 echo "Installing NuGet"
 Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
-if($version -lt '7.0') {
-  echo "Installing Visual C++"
-  Install-Module -Name VcRedist -Force
-  New-Item -Path C:\Temp\VcRedist -ItemType Directory
-  Get-VcList | Save-VcRedist -Path C:\Temp\VcRedist
-  $VcList = Get-VcList
-  Install-VcRedist -Path C:\Temp\VcRedist -VcList $VcList -Silent
-}
 echo "Installing PhpManager"
 Install-Module -Name PhpManager -Force -Scope CurrentUser
-echo "Installing PHP"
-Uninstall-Php C:\tools\php
-Install-Php -Version $version -Architecture x86 -ThreadSafe $true -Path C:\tools\php$version -TimeZone UTC -InitialPhpIni Production
-echo "Switch PHP"
-(Get-PhpSwitcher).targets
-Initialize-PhpSwitcher -Alias C:\tools\php -Scope CurrentUser -Force
-Add-PhpToSwitcher -Name $version -Path C:\tools\php$version -Force
-Switch-Php $version -Force
-echo "Housekeeping in PHP.ini, enabling openssl"
-Add-Content C:\tools\php$version\php.ini "date.timezone = 'UTC'"
-Set-PhpIniKey extension_dir C:\tools\php$version\ext
-if($version -lt '7.4') {
-	Enable-PhpExtension openssl
-} else {
-	Add-Content C:\tools\php$version\php.ini "extension=php_openssl.dll"
+
+$installed = php -v | grep ^PHP | cut -c 5-7
+echo $installed
+echo $version
+if($installed -ne $version) {
+  if($version -lt '7.0') {
+    echo "Installing Visual C++"
+    Install-Module -Name VcRedist -Force
+    New-Item -Path C:\Temp\VcRedist -ItemType Directory
+    Get-VcList | Save-VcRedist -Path C:\Temp\VcRedist
+    $VcList = Get-VcList
+    Install-VcRedist -Path C:\Temp\VcRedist -VcList $VcList -Silent
+  }
+
+  echo "Installing PHP"
+  Uninstall-Php C:\tools\php
+  Install-Php -Version $version -Architecture x86 -ThreadSafe $true -Path C:\tools\php$version -TimeZone UTC -InitialPhpIni Production
+  echo "Switch PHP"
+  (Get-PhpSwitcher).targets
+  Initialize-PhpSwitcher -Alias C:\tools\php -Scope CurrentUser -Force
+  Add-PhpToSwitcher -Name $version -Path C:\tools\php$version -Force
+  Switch-Php $version -Force
+  echo "Housekeeping in PHP.ini, enabling openssl"
+  Add-Content C:\tools\php$version\php.ini "date.timezone = 'UTC'"
+  Set-PhpIniKey extension_dir C:\tools\php$version\ext
+  if($version -lt '7.4') {
+  	Enable-PhpExtension openssl
+  } else {
+  	Add-Content C:\tools\php$version\php.ini "extension=php_openssl.dll"
+  }
 }
+
 echo "Installing Composer"
 Install-Composer -Scope System -Path C:\tools\php
 php -v