Add support for php.ini customization and fix bugs

.github/workflows/workflow.yml

@@ -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
+        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,6 +13,9 @@
 - 7.1
 - 7.2
 - 7.3
+- 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.
 
 ## OS Support
 
@@ -33,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:
@@ -45,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
@@ -73,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
@@ -97,6 +108,7 @@ Contributions are welcome!  See [Contributor's Guide](docs/contributors.md)
 - [Homebrew](https://brew.sh/)
 - [ppa:ondrej/php](https://launchpad.net/~ondrej/+archive/ubuntu/php)
 - [exolnet/homebrew-deprecated](https://github.com/eXolnet/homebrew-deprecated)
+- [phpbrew](https://github.com/phpbrew/phpbrew)
 
 ## Further Reading
 

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

@@ -86,7 +86,7 @@ function addExtension(extension_csv, version) {
                 // else add script to attempt to install the extension
                 if (os_version == 'linux') {
                     linux +=
-                        'sudo apt install -y php' +
+                        'sudo DEBIAN_FRONTEND=noninteractive apt install -y php' +
                             version +
                             '-' +
                             extension +
@@ -104,9 +104,15 @@ function addExtension(extension_csv, version) {
                     });
                     const response = yield http.get('https://pecl.php.net/package/' + extension);
                     if (response.message.statusCode == 200) {
+                        let extension_version = 'stable';
+                        if (version == '7.4') {
+                            extension_version = 'alpha';
+                        }
                         windows +=
                             'try { Install-PhpExtension ' +
                                 extension +
+                                ' -MinimumStability ' +
+                                extension_version +
                                 ' } catch [Exception] { echo $_; echo "Could not install extension: "' +
                                 extension +
                                 ' }\n';
@@ -123,7 +129,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 + '"';
+            });
+        });
     });
 }
 /*
@@ -160,15 +187,26 @@ 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');
+            }
             let extension_csv = process.env['extension-csv'];
             if (!extension_csv) {
                 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.1.2",
+  "version": "1.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

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

src/7.4.sh

@@ -0,0 +1,48 @@
+brew fetch autoconf& brew fetch automake& brew fetch pcre& brew fetch libtool& brew fetch libpng& brew fetch webp& brew fetch jpeg& brew fetch freetype& brew fetch libxml2& brew fetch pkg-config& brew fetch krb5& brew fetch icu4c& brew fetch re2c& brew fetch bison& brew fetch libzip& brew fetch mcrypt& brew fetch zlib& brew fetch bzip2& brew fetch enchant
+brew install autoconf automake pcre libtool libpng webp jpeg freetype libxml2 pkg-config krb5 icu4c re2c bison libzip mcrypt zlib bzip2 enchant >> /dev/null
+brew link --force gettext
+brew link --force bison
+brew link --force openssl
+brew link --force libxml2
+brew link --force bzip2
+echo 'export PATH="/usr/local/opt/bzip2/bin:$PATH"' >> ~/.bash_profile
+echo 'export PATH="/usr/local/opt/openssl/bin:$PATH"' >> ~/.bash_profile
+echo 'export PATH="/usr/local/opt/krb5/bin:$PATH"' >> ~/.bash_profile
+echo 'export PATH="/usr/local/opt/krb5/sbin:$PATH"' >> ~/.bash_profile
+echo 'export PATH="/usr/local/opt/icu4c/bin:$PATH"' >> ~/.bash_profile
+echo 'export PATH="/usr/local/opt/icu4c/sbin:$PATH"' >> ~/.bash_profile
+echo 'export PATH="/usr/local/opt/bzip2/bin:$PATH"' >> ~/.bash_profile
+echo 'export PATH="/usr/local/opt/bison/bin:$PATH"' >> ~/.bash_profile
+echo 'export PATH="/usr/local/opt/libxml2/bin:$PATH"' >> ~/.bash_profile
+echo 'export PATH="/Users/runner/.phpbrew/php/php-7.4.0RC1/bin:$PATH"' >> ~/.bash_profile
+source ~/.bash_profile >> /dev/null
+export LIBXML_LIBS="-L/usr/local/opt/libxml2/lib"
+export LIBXML_CFLAGS="-I/usr/local/opt/libxml2/include"
+export ENCHANT_LIBS="-L/usr/local/opt/enchant/lib"
+export ENCHANT_CFLAGS="-I/usr/local/opt/enchant/include"
+export FFI_LIBS="-L/usr/local/opt/libffi/lib"
+export FFI_CFLAGS="-I/usr/local/opt/libffi/include"
+export ICU_LIBS="-L/usr/local/opt/icu4c/lib"
+export ICU_CFLAGS="-I/usr/local/opt/icu4c/include"
+export KERBEROS_LIBS="-L/usr/local/opt/krb5/lib"
+export KERBEROS_CFLAGS="-I/usr/local/opt/krb5/include"
+export OPENSSL_LIBS="-L/usr/local/opt/openssl/lib"
+export OPENSSL_CFLAGS="-I/usr/local/opt/openssl/include"
+export READLINE_LIBS="-L/usr/local/opt/readline/lib"
+export READLINE_CFLAGS="-I/usr/local/opt/readline/include"
+export BZIP2_LIBS="-L/usr/local/opt/bzip2/lib"
+export BZIP2_CFLAGS="-I/usr/local/opt/bzip2/include"
+export PKG_CONFIG_PATH="/usr/local/opt/krb5/lib/pkgconfig:/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/obzip2pt/libffi/lib/pkgconfig:/usr/local/opt/openssl@1.1/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/krb5/lib/pkgconfig:/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig"
+cd ~
+curl -L -O https://github.com/phpbrew/phpbrew/raw/master/phpbrew
+chmod +x ./phpbrew
+sudo mv phpbrew /usr/local/bin/phpbrew
+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.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.0RC2/bin/php /usr/local/bin/php
+brew install composer

src/darwin.sh

@@ -1,10 +1,14 @@
-echo $1
-ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-brew unlink php
-brew tap exolnet/homebrew-deprecated
-brew tap homebrew/homebrew-php
-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
 curl -sS https://getcomposer.org/installer | php
 chmod +x composer.phar
 mv composer.phar /usr/local/bin/composer

src/install.ts

@@ -71,7 +71,7 @@ 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' +
+        'sudo DEBIAN_FRONTEND=noninteractive apt install -y php' +
         version +
         '-' +
         extension +
@@ -90,9 +90,15 @@ async function addExtension(extension_csv: string, version: string) {
         'https://pecl.php.net/package/' + extension
       );
       if (response.message.statusCode == 200) {
+        let extension_version = 'stable';
+        if (version == '7.4') {
+          extension_version = 'alpha';
+        }
         windows +=
           'try { Install-PhpExtension ' +
           extension +
+          ' -MinimumStability ' +
+          extension_version +
           ' } catch [Exception] { echo $_; echo "Could not install extension: "' +
           extension +
           ' }\n';
@@ -107,7 +113,25 @@ async function addExtension(extension_csv: string, version: string) {
       }
     }
   });
-  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 + '"';
+  });
 }
 
 /*
@@ -140,17 +164,30 @@ 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');
+    }
 
     let extension_csv = process.env['extension-csv'];
     if (!extension_csv) {
       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,23 @@
-sudo add-apt-repository ppa:ondrej/php -y
-sudo apt update -y
-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
+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
+ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
+sudo chmod 777 $ini_file
 php -v
 composer -V

src/windows.ps1

@@ -2,31 +2,45 @@ param (
     [Parameter(Mandatory=$true)][string]$version = "7.3"  
 )
 
+if($version -eq '7.4') {
+	$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
-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"
-Move-item -Path C:\tools\php$version\php.ini-production -Destination C:\tools\php$version\php.ini -Force
-Add-Content C:\tools\php$version\php.ini "date.timezone = 'UTC'"
-Set-PhpIniKey extension_dir C:\tools\php$version\ext
-Enable-PhpExtension openssl
+
+$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