Skip to content

Commit

Permalink
Add support for PHP7.4
Browse files Browse the repository at this point in the history
  • Loading branch information
shivammathur committed Sep 13, 2019
1 parent 35b0788 commit 02867fa
Show file tree
Hide file tree
Showing 9 changed files with 85 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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']
php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
steps:
- name: Checkout
uses: actions/checkout@master
Expand All @@ -27,4 +27,4 @@ jobs:
php-version: ${{ matrix.php-versions }}
extension-csv: "mbstring, curl, mysqli, json, xml, xdebug, pcov, phpdbg"
- name: Testing
run: php -m
run: php -v && composer -V && php -m
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
- 7.1
- 7.2
- 7.3
- 7.4 `7.4.0beta4` on `ubuntu`, and `7.4.0RC1` on `windows` and `macOS`

**Note:** PHP 7.4 is currently in development, do not use in production.

## OS Support

Expand Down Expand Up @@ -97,6 +100,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

Expand Down
9 changes: 9 additions & 0 deletions lib/install.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -161,6 +167,9 @@ function run() {
version = core.getInput('php-version', { required: true });
}
console.log('Input: ' + 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');
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "setup-php",
"version": "1.1.2",
"version": "1.2.0",
"private": false,
"description": "Setup php action",
"main": "lib/setup-php.js",
Expand Down
48 changes: 48 additions & 0 deletions src/7.4.sh
Original file line number Diff line number Diff line change
@@ -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/[email protected]/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.0RC1 +default +bz2="$(brew --prefix bzip2)" +zlib="$(brew --prefix zlib)" -openssl -- --with-libxml
phpbrew switch php-7.4.0RC1 >> /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
brew install composer
2 changes: 0 additions & 2 deletions src/darwin.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
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
curl -sS https://getcomposer.org/installer | php
Expand Down
10 changes: 10 additions & 0 deletions src/install.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -142,6 +148,10 @@ async function run() {
}
console.log('Input: ' + 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');
Expand Down
13 changes: 10 additions & 3 deletions src/windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ param (
[Parameter(Mandatory=$true)][string]$version = "7.3"
)

if($version -eq '7.4') {
$version = '7.4RC1'
}

echo "Installing NuGet"
Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
if($version -lt '7.0') {
Expand All @@ -16,17 +20,20 @@ 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
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"
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
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
Expand Down

0 comments on commit 02867fa

Please sign in to comment.