joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-25 23:02:55 +00:00
Code Packages Releases Activity

Bump to PHP 7 minimum (#17548)

Browse Source
This commit is contained in:
Michael Babker 2017-08-18 12:12:34 -05:00 committed by George Wilson
parent aa29dee214
commit 4e88408761
8 changed files with 24 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
.appveyor.yml
View File

@ -5,7 +5,6 @@ clone_folder: C:\projects\joomla-cms
## Build matrix for lowest and highest possible targets
environment:
matrix:
- php_ver_target: 5.6
- php_ver_target: 7.0
- php_ver_target: 7.1
@ -24,35 +23,23 @@ services:
install:
- IF EXIST C:\tools\php (SET PHP=0)
- ps: >-
If ($env:php_ver_target -eq "5.6") {
appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y --forcex86 php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
$VC = "vc11"
$PHPBuild = "x86"
} Else {
appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
$VC = "vc14"
$PHPBuild = "x64"
}
appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
$VC = "vc14"
$PHPBuild = "x64"
- appveyor-retry cinst -y sqlite
- cd C:\tools\php
# Get the MSSQL DLL's
- ps: >-
If ($env:PHP -eq "1") {
If ($env:php_ver_target -eq "5.6") {
appveyor-retry appveyor DownloadFile https://cdn.joomla.org/ci/php-sqlsrv.zip
7z x -y php-sqlsrv.zip > $null
copy SQLSRV\php_sqlsrv_56_nts.dll ext\php_sqlsrv_nts.dll
copy SQLSRV\php_pdo_sqlsrv_56_nts.dll ext\php_pdo_sqlsrv_nts.dll
Remove-Item C:\tools\php\* -include .zip
} Else {
$DLLVersion = "4.1.6.1"
cd c:\tools\php\ext
appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/sqlsrv/$($DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip
7z x -y php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip > $null
appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip
7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip > $null
Remove-Item c:\tools\php\ext* -include .zip
cd c:\tools\php}}
$DLLVersion = "4.1.6.1"
cd c:\tools\php\ext
appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/sqlsrv/$($DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip
7z x -y php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip > $null
appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip
7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip > $null
Remove-Item c:\tools\php\ext* -include .zip
cd c:\tools\php
}
- IF %PHP%==1 copy php.ini-production php.ini /Y
- IF %PHP%==1 echo date.timezone="UTC" >> php.ini
- IF %PHP%==1 echo extension_dir=ext >> php.ini
@ -60,16 +47,8 @@ install:
- IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
- IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
- IF %PHP%==1 echo extension=php_gd2.dll >> php.ini
- ps: >-
If ($env:php_ver_target -eq "5.6") {
Add-Content php.ini "`nextension=php_sqlsrv_nts.dll"
Add-Content php.ini "`nextension=php_pdo_sqlsrv_nts.dll"
Add-Content php.ini "`n"
} Else {
Add-Content php.ini "`nextension=php_sqlsrv.dll"
Add-Content php.ini "`nextension=php_pdo_sqlsrv.dll"
Add-Content php.ini "`n"
}
- IF %PHP%==1 echo extension=php_sqlsrv.dll >> php.ini
- IF %PHP%==1 echo extension=php_pdo_sqlsrv.dll >> php.ini
- IF %PHP%==1 echo extension=php_pgsql.dll >> php.ini
- IF %PHP%==1 echo extension=php_pdo_pgsql.dll >> php.ini
- IF %PHP%==1 echo extension=php_pdo_sqlite.dll >> php.ini
@ -80,7 +59,7 @@ install:
# Get the Wincache DLLs
- ps: >-
If ($env:PHP -eq "1") {
If ($env:php_ver_target -eq "5.6") {$wincache = "1.3.7.12"} Else {$wincache = "2.0.0.8"}
$wincache = "2.0.0.8"
cd c:\tools\php\ext
appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/wincache/$($wincache)/php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($VC)-$($PHPBuild).zip
7z x -y php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($VC)-$($PHPBuild).zip > $null

4
.travis.yml
View File

@ -13,10 +13,6 @@ env:
matrix:
fast_finish: true
include:
- php: 5.5
env: INSTALL_APCU="yes"
- php: 5.6
env: INSTALL_APCU="yes"
- php: 7.0
env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
- php: 7.1

2
administrator/index.php
View File

@ -13,7 +13,7 @@
/**
* Define the application's minimum supported PHP version as a constant so it can be referenced within the application.
*/
define('JOOMLA_MINIMUM_PHP', '5.5.9');
define('JOOMLA_MINIMUM_PHP', '7.0');
if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<'))
{

4
composer.json
View File

@ -7,7 +7,7 @@
"license": "GPL-2.0+",
"config": {
"platform": {
"php": "5.5.9"
"php": "7.0"
},
"preferred-install": {
"joomla/application": "dist",
@ -42,7 +42,7 @@
}
},
"require": {
"php": ">=5.5.9",
"php": ">=7.0",
"joomla/application": "~2.0@dev",
"joomla/archive": "~1.1.5",
"joomla/controller": "~2.0@dev",

6
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "82921e36ee94f78d52a10ffed5b130f6",
"content-hash": "cc817fc880a3e942752fbe1b824fd576",
"packages": [
{
"name": "composer/ca-bundle",
@ -3777,10 +3777,10 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
"php": ">=5.5.9"
"php": ">=7.0"
},
"platform-dev": [],
"platform-overrides": {
"php": "5.5.9"
"php": "7.0"
}
}

2
index.php
View File

@ -13,7 +13,7 @@
/**
* Define the application's minimum supported PHP version as a constant so it can be referenced within the application.
*/
define('JOOMLA_MINIMUM_PHP', '5.5.9');
define('JOOMLA_MINIMUM_PHP', '7.0');
if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<'))
{

2
installation/index.php
View File

@ -13,7 +13,7 @@
/**
* Define the application's minimum supported PHP version as a constant so it can be referenced within the application.
*/
define('JOOMLA_MINIMUM_PHP', '5.5.9');
define('JOOMLA_MINIMUM_PHP', '7.0');
if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<'))
{

2
installation/template/js/error.js
View File

@ -5,7 +5,7 @@
text1 = document.getElementById('descText1');
// Get the minimum PHP version
window.phpVersion = document.body.getAttribute('data-php-version') || '5.5.9';
window.phpVersion = document.body.getAttribute('data-php-version') || '7.0';
// Create links for all the languages
Object.keys(errorLocale).forEach(function(key) {