Commit: d8a53726eb0c4fdfd44f2c6a4668f40cfe6c4f29 Author: Anatol Belski <a...@php.net> Mon, 10 Sep 2018 19:30:51 +0200 Parents: faedb76b57d6b6c3df83b5bdb2c95398b189c385 Branches: revamp_3
Link: http://git.php.net/?p=pftt2.git;a=commitdiff;h=d8a53726eb0c4fdfd44f2c6a4668f40cfe6c4f29 Log: Further sync with version handling and remove track_errrs for 7.2+ Changed paths: M src/com/mostc/pftt/model/core/PhpBuild.java M src/com/mostc/pftt/model/smoke/RequiredExtensionsSmokeTest.java Diff: diff --git a/src/com/mostc/pftt/model/core/PhpBuild.java b/src/com/mostc/pftt/model/core/PhpBuild.java index 865af95..32d53a0 100644 --- a/src/com/mostc/pftt/model/core/PhpBuild.java +++ b/src/com/mostc/pftt/model/core/PhpBuild.java @@ -198,6 +198,18 @@ public class PhpBuild extends SAPIManager { case PHP_5_6: debug_path = "php-debug-pack-5.6-"+build_type+"-windows-"+compiler+"-"+cpu_arch+"-"+revision; break; + case PHP_7_0: + debug_path = "php-debug-pack-7.0-"+build_type+"-windows-"+compiler+"-"+cpu_arch+"-"+revision; + break; + case PHP_7_1: + debug_path = "php-debug-pack-7.1-"+build_type+"-windows-"+compiler+"-"+cpu_arch+"-"+revision; + break; + case PHP_7_2: + debug_path = "php-debug-pack-7.2-"+build_type+"-windows-"+compiler+"-"+cpu_arch+"-"+revision; + break; + case PHP_7_3: + debug_path = "php-debug-pack-7.3-"+build_type+"-windows-"+compiler+"-"+cpu_arch+"-"+revision; + break; case PHP_Master: debug_path = "php-debug-pack-master-"+build_type+"-windows-"+compiler+"-"+cpu_arch+"-"+revision; break; @@ -237,6 +249,18 @@ public class PhpBuild extends SAPIManager { case PHP_5_6: source_path = "php-5.6-src-"+revision; break; + case PHP_7_0: + source_path = "php-7.0-src-"+revision; + break; + case PHP_7_1: + source_path = "php-7.1-src-"+revision; + break; + case PHP_7_2: + source_path = "php-7.2-src-"+revision; + break; + case PHP_7_3: + source_path = "php-7.3-src-"+revision; + break; case PHP_Master: source_path = "php-master-src-"+revision; break; @@ -585,7 +609,7 @@ public class PhpBuild extends SAPIManager { } public boolean is5(ConsoleManager cm, Host host) { - return is53(cm, host)||is54(cm, host)||is55(cm, host)||is56(cm, host)||is70(cm, host); + return is53(cm, host)||is54(cm, host)||is55(cm, host)||is56(cm, host); } public boolean is70(ConsoleManager cm, Host host) { @@ -596,8 +620,32 @@ public class PhpBuild extends SAPIManager { } } + public boolean is71(ConsoleManager cm, Host host) { + try { + return getVersionBranch(cm, host) == EBuildBranch.PHP_7_1; + } catch ( Exception ex ) { + return false; + } + } + + public boolean is72(ConsoleManager cm, Host host) { + try { + return getVersionBranch(cm, host) == EBuildBranch.PHP_7_2; + } catch ( Exception ex ) { + return false; + } + } + + public boolean is73(ConsoleManager cm, Host host) { + try { + return getVersionBranch(cm, host) == EBuildBranch.PHP_7_3; + } catch ( Exception ex ) { + return false; + } + } + public boolean is7(ConsoleManager cm, Host host) { - return is70(cm, host); + return is70(cm, host) || is73(cm, host) || is73(cm, host) || is73(cm, host); } public boolean isMaster(ConsoleManager cm, Host host) { diff --git a/src/com/mostc/pftt/model/smoke/RequiredExtensionsSmokeTest.java b/src/com/mostc/pftt/model/smoke/RequiredExtensionsSmokeTest.java index cfbb4a1..8fa34c8 100644 --- a/src/com/mostc/pftt/model/smoke/RequiredExtensionsSmokeTest.java +++ b/src/com/mostc/pftt/model/smoke/RequiredExtensionsSmokeTest.java @@ -226,8 +226,16 @@ public class RequiredExtensionsSmokeTest extends SmokeTest { ini.putMulti(PhpIni.LOG_ERRORS, PhpIni.ON); // TODO temp // CRITICAL ini.putMulti(PhpIni.HTML_ERRORS, PhpIni.OFF); - // CRITICAL - ini.putMulti(PhpIni.TRACK_ERRORS, PhpIni.ON); + + try { + if (build.getVersionMajor(cm, host) < 7 || build.getVersionMajor(cm, host) == 7 && build.getVersionMinor(cm, host) < 2) { + // CRITICAL + // As of 7.2 deprecated, so has to be turned off. + ini.putMulti(PhpIni.TRACK_ERRORS, PhpIni.ON); + } + } catch (Exception e) { + cm.println(EPrintType.WARNING, "Tests", "Failed to get PHP version, track_errors is not enabled"); + } // ini.putMulti(PhpIni.REPORT_MEMLEAKS, PhpIni.ON); ini.putMulti(PhpIni.REPORT_ZEND_DEBUG, PhpIni.OFF);
