Commit: c8bf1cfbb470d022bce67a697266c758278e9df9
Author: Christoph M. Becker <[email protected]> Fri, 28 Jun 2019
13:17:52 +0200
Parents: d92ea3219b7ef9057610a86498c76ff368da5cef
Branches: master
Link:
http://git.php.net/?p=pftt2.git;a=commitdiff;h=c8bf1cfbb470d022bce67a697266c758278e9df9
Log:
Close #1: Wipe PHP version support < 5.6
Bugs:
https://bugs.php.net/1
Changed paths:
M src/com/mostc/pftt/main/CmpReport.java
M src/com/mostc/pftt/main/CmpReport2.java
M src/com/mostc/pftt/main/PfttAuto.java
M src/com/mostc/pftt/model/core/EBuildBranch.java
M src/com/mostc/pftt/model/core/PhpBuild.java
M src/com/mostc/pftt/model/core/PhptSourceTestPack.java
M src/com/mostc/pftt/model/sapi/EApacheVersion.java
M src/com/mostc/pftt/model/smoke/RequiredExtensionsSmokeTest.java
M src/com/mostc/pftt/scenario/AzureWebsitesScenario.java
M src/com/mostc/pftt/scenario/BuiltinWebServerScenario.java
M src/com/mostc/pftt/scenario/MSSQLScenario.java
M src/com/mostc/pftt/scenario/OpcacheScenario.java
M src/com/mostc/pftt/scenario/SAPIScenario.java
M src/com/mostc/pftt/scenario/WinCacheUScenario.java
M src/com/mostc/pftt/util/HostEnvUtil.java
M src/com/mostc/pftt/util/WindowsSnapshotDownloadUtil.groovy
diff --git a/src/com/mostc/pftt/main/CmpReport.java
b/src/com/mostc/pftt/main/CmpReport.java
index 072a847..54dd351 100644
--- a/src/com/mostc/pftt/main/CmpReport.java
+++ b/src/com/mostc/pftt/main/CmpReport.java
@@ -497,6 +497,8 @@ public class CmpReport {
}
}
}
+
+ // TODO: check whether this method makes any sense, and remove or
convert to regular PFTT2 option
public static void main(String[] args) throws Exception {
IRecvr recvr = new Verify();
//
@@ -528,54 +530,10 @@ public class CmpReport {
LocalConsoleManager cm = new LocalConsoleManager();
// TODO check if a smoke test failed!
- //File base_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_3-Result-Pack-5.3.27-TS-X86-VC9"));
- //File test_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_3-Result-Pack-5.3.28-TS-X86-VC9"));
- //File base_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_3-Result-Pack-re2e002d-nTS-X86-VC9"));
- //File test_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_3-Result-Pack-r7c9bb87-nTS-X86-VC9"));
- //File base_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_3-Result-Pack-re2e002d-TS-X86-VC9"));
- //File test_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_3-Result-Pack-r7c9bb87-TS-X86-VC9"));
- //File base_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_4-Result-Pack-5.4.23-NTS-X86-VC9"));
- //File test_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_4-Result-Pack-5.4.24rc1-NTS-X86-VC9"));
-
- //File base_dir = new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_4-Result-Pack-rd487f5e-TS-X86-VC9");
- //File test_dir = new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_4-Result-Pack-r6c48c6b-TS-X86-VC9");
- //File base_dir = new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_4-Result-Pack-ra03f094-nTS-X86-VC9");
- //File test_dir = new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_4-Result-Pack-r72aacbf-nTS-X86-VC9");
- //File base_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_5-Result-Pack-rc8b0da6-TS-X64-VC11"));
- //File test_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_5-Result-Pack-rc8b0da6-TS-x64-VC11"));
- //File base_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_5-Result-Pack-r82dd6b9-NTS-X64-VC11"));
- //File test_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_5-Result-Pack-rc8b0da6-NTS-X64-VC11"));
- //File base_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_5-Result-Pack-rb2ee1b6-NTS-X86-VC11"));
- //File test_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_5-Result-Pack-rfc9d886-NTS-X86-VC11"));
- //File base_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_5-Result-Pack-rc8b0da6-TS-X86-VC11"));
- //File test_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_5-Result-Pack-rfc9d886-TS-X86-VC11"));
-
- //File base_dir = new
File("C:\\php-sdk\\PFTT-Auto\\PHP_Master-Result-Pack--TS-X86-VC11");
- //File base_dir = new
File("C:\\php-sdk\\PFTT-Auto\\PHP_Master-Result-Pack-r43289d6-TS-X86-VC11");
- //File test_dir = new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_6-Result-Pack-5.6.0-dev-TS-X86-VC11-keyword916");
- //File base_dir = new
File("C:\\php-sdk\\PFTT-Auto\\PHP_Master-Result-Pack-r89c4aba-NTS-X64-VC11");
- //File base_dir = new
File("C:\\php-sdk\\PFTT-Auto\\PHP_Master-Result-Pack-r82bb2a2-NTS-X86-VC11");
- //File test_dir = new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_6-Result-Pack-5.6.0-dev-NTS-X86-VC11-keyword916");
- //File base_dir = new
File("C:\\php-sdk\\PFTT-Auto\\PHP_Master-Result-Pack-r5e1ac55-NTS-X86-VC11");
- //File test_dir = new
File("C:\\php-sdk\\PFTT-Auto\\PHP_Master-Result-Pack-r82bb2a2-NTS-X86-VC11");
- //File base_dir = new
File("C:\\php-sdk\\PFTT-Auto\\PHP_Master-Result-Pack-rd515455-TS-X64-VC11");
- //File test_dir = new
File("C:\\php-sdk\\PFTT-Auto\\PHP_Master-Result-Pack-r04fcf6a-TS-X64-VC11");
-
- File base_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_5-Result-Pack-5.5.10RC1-TS-X86-VC11"));
- File test_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_5-Result-Pack-5.5.10-TS-X86-VC11"));
- //File base_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_4-Result-Pack-5.4.26RC1-TS-X86-VC9"));
- //File test_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_4-Result-Pack-5.4.26-TS-X86-VC9"));
-
- //File test_dir = (new
File("C:\\php-sdk\\PHP_5_5-Result-Pack-5.5.8-dev-NTS-X64-VC11-SELF"));
- //File base_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_4-Result-Pack-5.4.22rc1-NTS-X86-VC9-SQLSVR"));
- //File test_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_4-Result-Pack-5.4.22-NTS-X86-VC9-SQLSVR"));
- //File base_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_4-Result-Pack-5.4.22-NTS-X86-VC9"));
- //File test_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_4-Result-Pack-5.4.23rc1-NTS-X86-VC9"));
- //File base_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_Master-Result-Pack-ra0244a6-NTS-X86-VC11"));
- //File test_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_6-Result-Pack-5.6.0-50333-NTS-X86-VC11"));
+ File base_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_Master-Result-Pack-ra0244a6-NTS-X86-VC11"));
+ File test_dir = (new
File("C:\\php-sdk\\PFTT-Auto\\PHP_5_6-Result-Pack-5.6.0-50333-NTS-X86-VC11"));
-
// clean_hosts
clean_hosts(host, base_dir);
clean_hosts(host, test_dir);
diff --git a/src/com/mostc/pftt/main/CmpReport2.java
b/src/com/mostc/pftt/main/CmpReport2.java
index 77dd085..c0dcabf 100644
--- a/src/com/mostc/pftt/main/CmpReport2.java
+++ b/src/com/mostc/pftt/main/CmpReport2.java
@@ -280,17 +280,6 @@ public class CmpReport2 {
LocalConsoleManager cm = new LocalConsoleManager();
CmpReport2 cmp = new CmpReport2();
LocalHost localhost = LocalHost.getInstance();
- //
- /*cmp.add(PhpResultPackReader.open(cm, localhost, new
File("C:\\php-sdk\\WinCacheU\\PHP_5_5-Result-Pack-5.5.2RC1-NTS-X86-VC11-2")));
- cmp.add(PhpResultPackReader.open(cm, localhost, new
File("C:\\php-sdk\\WinCacheU\\PHP_5_5-Result-Pack-5.5.3-NTS-X86-VC11")));
- cmp.add(PhpResultPackReader.open(cm, localhost, new
File("C:\\php-sdk\\WinCacheU\\PHP_5_4-Result-Pack-5.4.18RC2-NTS-X86-VC9-2")));*/
-
- cmp.add(PhpResultPackReader.open(cm, localhost, new
File("C:\\php-sdk\\PHP_5_5-Result-Pack-5.5.3-NTS-X86-VC11")));
- cmp.add(PhpResultPackReader.open(cm, localhost, new
File("C:\\php-sdk\\PHP_5_5-Result-Pack-5.5.3-TS-X86-VC11")));
- cmp.add(PhpResultPackReader.open(cm, localhost, new
File("C:\\php-sdk\\PHP_5_4-Result-Pack-5.4.19-NTS-X86-VC9")));
- cmp.add(PhpResultPackReader.open(cm, localhost, new
File("C:\\php-sdk\\PHP_5_4-Result-Pack-5.4.19-TS-X86-VC9")));
- cmp.add(PhpResultPackReader.open(cm, localhost, new
File("C:\\php-sdk\\PHP_5_3-Result-Pack-5.3.27-NTS-X86-VC9")));
- cmp.add(PhpResultPackReader.open(cm, localhost, new
File("C:\\php-sdk\\PHP_5_3-Result-Pack-5.3.27-TS-X86-VC9")));
File html_file = new File("c:\\php-sdk\\temp.html");
FileWriter fw = new FileWriter(html_file);
diff --git a/src/com/mostc/pftt/main/PfttAuto.java
b/src/com/mostc/pftt/main/PfttAuto.java
index 6c64583..d8170e6 100644
--- a/src/com/mostc/pftt/main/PfttAuto.java
+++ b/src/com/mostc/pftt/main/PfttAuto.java
@@ -59,16 +59,8 @@ public class PfttAuto {
new BuildSpec(EBuildBranch.PHP_Master, EBuildType.NTS,
ECPUArch.X86),
new BuildSpec(EBuildBranch.PHP_5_6, EBuildType.TS,
ECPUArch.X86),
new BuildSpec(EBuildBranch.PHP_5_6, EBuildType.NTS,
ECPUArch.X86),
- new BuildSpec(EBuildBranch.PHP_5_5, EBuildType.TS,
ECPUArch.X86),
- new BuildSpec(EBuildBranch.PHP_5_5, EBuildType.NTS,
ECPUArch.X86),
new BuildSpec(EBuildBranch.PHP_5_6, EBuildType.TS,
ECPUArch.X64),
new BuildSpec(EBuildBranch.PHP_5_6, EBuildType.NTS,
ECPUArch.X64),
- new BuildSpec(EBuildBranch.PHP_5_5, EBuildType.TS,
ECPUArch.X64),
- new BuildSpec(EBuildBranch.PHP_5_5, EBuildType.NTS,
ECPUArch.X64),
- new BuildSpec(EBuildBranch.PHP_5_4, EBuildType.TS,
ECPUArch.X86),
- new BuildSpec(EBuildBranch.PHP_5_4, EBuildType.NTS,
ECPUArch.X86),
- //new BuildSpec(EBuildBranch.PHP_5_3, EBuildType.TS,
ECPUArch.X86),
- //new BuildSpec(EBuildBranch.PHP_5_3, EBuildType.NTS,
ECPUArch.X86)
};
static class BuildSpec {
diff --git a/src/com/mostc/pftt/model/core/EBuildBranch.java
b/src/com/mostc/pftt/model/core/EBuildBranch.java
index f6ccf64..2c2369b 100644
--- a/src/com/mostc/pftt/model/core/EBuildBranch.java
+++ b/src/com/mostc/pftt/model/core/EBuildBranch.java
@@ -1,18 +1,6 @@
package com.mostc.pftt.model.core;
public enum EBuildBranch {
- PHP_5_3 {
- @Override
- public ECPUArch getCPUArch() {
- return ECPUArch.X86;
- }
- },
- PHP_5_4 {
- @Override
- public ECPUArch getCPUArch() {
- return ECPUArch.X86;
- }
- },
NATIVE_TLS {
@Override
public String toString() {
@@ -33,12 +21,6 @@ public enum EBuildBranch {
return null; // could be X86 or X64
}
},
- PHP_5_5 {
- @Override
- public ECPUArch getCPUArch() {
- return null; // could be X86 or X64
- }
- },
PHP_5_6 {
@Override
public ECPUArch getCPUArch() {
@@ -103,13 +85,7 @@ public enum EBuildBranch {
*/
public static EBuildBranch guessValueOf(String str) {
str = str.toLowerCase();
- if
(str.equals("php_5_3")||str.equals("5_3")||str.equals("5.3")||str.equals("53")||str.equals("php5_3")||str.equals("php53")||str.equals("php5.3")||str.equals("php_5.3"))
- return PHP_5_3;
- else if
(str.equals("php_5_4")||str.equals("5_4")||str.equals("5.4")||str.equals("54")||str.equals("php5_4")||str.equals("php54")||str.equals("php5.4")||str.equals("php_5.4"))
- return PHP_5_4;
- else if
(str.equals("php_5_5")||str.equals("5_5")||str.equals("5.5")||str.equals("55")||str.equals("php5_5")||str.equals("php55")||str.equals("php5.5")||str.equals("php_5.5"))
- return PHP_5_5;
- else if
(str.equals("php_5_6")||str.equals("5_6")||str.equals("5.6")||str.equals("56")||str.equals("php5_6")||str.equals("php56")||str.equals("php5.6")||str.equals("php_5.6"))
+ if
(str.equals("php_5_6")||str.equals("5_6")||str.equals("5.6")||str.equals("56")||str.equals("php5_6")||str.equals("php56")||str.equals("php5.6")||str.equals("php_5.6"))
return PHP_5_6;
else if
(str.equals("php_7_0")||str.equals("7_0")||str.equals("7.0")||str.equals("70")||str.equals("php7_0")||str.equals("php70")||str.equals("php7.0")||str.equals("php_7.0"))
return PHP_7_0;
@@ -129,13 +105,7 @@ public enum EBuildBranch {
public static EBuildBranch guessValueOfContains(String str) {
str = str.toLowerCase();
- if
(str.contains("php_5_3")||str.contains("php5_3")||str.contains("php53")||str.contains("php5.3")||str.contains("php_5.3"))
- return PHP_5_3;
- else if
(str.contains("php_5_4")||str.contains("php5_4")||str.contains("php54")||str.contains("php5.4")||str.contains("php_5.4"))
- return PHP_5_4;
- else if
(str.contains("php_5_5")||str.contains("php5_5")||str.contains("php55")||str.contains("php5.5")||str.contains("php_5.5"))
- return PHP_5_5;
- else if
(str.contains("php_5_6")||str.contains("php5_6")||str.contains("php56")||str.contains("php5.6")||str.contains("php_5.6"))
+ if
(str.contains("php_5_6")||str.contains("php5_6")||str.contains("php56")||str.contains("php5.6")||str.contains("php_5.6"))
return PHP_5_6;
else if
(str.contains("php_7_0")||str.contains("php7_0")||str.contains("php70")||str.contains("php7.0")||str.contains("php_7.0"))
return PHP_7_0;
diff --git a/src/com/mostc/pftt/model/core/PhpBuild.java
b/src/com/mostc/pftt/model/core/PhpBuild.java
index 238b601..a906080 100644
--- a/src/com/mostc/pftt/model/core/PhpBuild.java
+++ b/src/com/mostc/pftt/model/core/PhpBuild.java
@@ -58,7 +58,7 @@ public class PhpBuild extends SAPIManager {
* @return
*/
public boolean checkOpenSSLVersion(ConsoleManager cm, Host host, String
str) {
- return is53(cm, host)||is54(cm,
host)?str.contains("0.9.8"):str.contains("1.0.1");
+ return str.contains("1.0.1");
}
@Override
@@ -186,15 +186,6 @@ public class PhpBuild extends SAPIManager {
String debug_path = null;
switch(build_branch) {
- case PHP_5_3:
- debug_path =
"php-debug-pack-5.3-"+build_type+"-windows-"+compiler+"-"+cpu_arch+"-"+revision;
- break;
- case PHP_5_4:
- debug_path =
"php-debug-pack-5.4-"+build_type+"-windows-"+compiler+"-"+cpu_arch+"-"+revision;
- break;
- case PHP_5_5:
- debug_path =
"php-debug-pack-5.5-"+build_type+"-windows-"+compiler+"-"+cpu_arch+"-"+revision;
- break;
case PHP_5_6:
debug_path =
"php-debug-pack-5.6-"+build_type+"-windows-"+compiler+"-"+cpu_arch+"-"+revision;
break;
@@ -237,15 +228,6 @@ public class PhpBuild extends SAPIManager {
String source_path = null;
switch(build_branch) {
- case PHP_5_3:
- source_path = "php-5.3-src-"+revision;
- break;
- case PHP_5_4:
- source_path = "php-5.4-src-"+revision;
- break;
- case PHP_5_5:
- source_path = "php-5.5-src-"+revision;
- break;
case PHP_5_6:
source_path = "php-5.6-src-"+revision;
break;
@@ -420,19 +402,7 @@ public class PhpBuild extends SAPIManager {
String b =
FileSystemScenario.basename(build_path).toLowerCase();
// naming convention php-5.3-[optionally
ts|nts]-[compiler]-[optionally rNNNNNNN]
- if (b.contains("php-5.3")) {
- branch = EBuildBranch.PHP_5_3;
- major = 5;
- minor = 3;
- } else if (b.contains("php-5.4")) {
- branch = EBuildBranch.PHP_5_4;
- major = 5;
- minor = 4;
- } else if (b.contains("php-5.5")) {
- branch = EBuildBranch.PHP_5_5;
- major = 5;
- minor = 5;
- } else if (b.contains("php-5.6")) {
+ if (b.contains("php-5.6")) {
branch = EBuildBranch.PHP_5_6;
major = 5;
minor = 6;
@@ -491,15 +461,6 @@ public class PhpBuild extends SAPIManager {
//
if (major==5) {
switch(minor) {
- case 3:
- branch =
EBuildBranch.PHP_5_3;
- break;
- case 4:
- branch =
EBuildBranch.PHP_5_4;
- break;
- case 5:
- branch =
EBuildBranch.PHP_5_5;
- break;
case 6:
branch =
EBuildBranch.PHP_5_6;
break;
@@ -610,16 +571,8 @@ public class PhpBuild extends SAPIManager {
return branch==null?EBuildBranch.getNewest():branch;
}
- public boolean is53(ConsoleManager cm, Host host) {
- try {
- return getVersionBranch(cm, host) ==
EBuildBranch.PHP_5_3;
- } catch ( Exception ex ) {
- return false;
- }
- }
-
public boolean is5(ConsoleManager cm, Host host) {
- return is53(cm, host)||is54(cm, host)||is55(cm, host)||is56(cm,
host);
+ return is56(cm, host);
}
public boolean is70(ConsoleManager cm, Host host) {
@@ -666,22 +619,6 @@ public class PhpBuild extends SAPIManager {
}
}
- public boolean is54(ConsoleManager cm, Host host) {
- try {
- return getVersionBranch(cm, host) ==
EBuildBranch.PHP_5_4;
- } catch ( Exception ex ) {
- return false;
- }
- }
-
- public boolean is55(ConsoleManager cm, Host host) {
- try {
- return getVersionBranch(cm, host) ==
EBuildBranch.PHP_5_5;
- } catch ( Exception ex ) {
- return false;
- }
- }
-
public boolean is56(ConsoleManager cm, Host host) {
try {
return getVersionBranch(cm, host) ==
EBuildBranch.PHP_5_6;
diff --git a/src/com/mostc/pftt/model/core/PhptSourceTestPack.java
b/src/com/mostc/pftt/model/core/PhptSourceTestPack.java
index aeca356..d167962 100644
--- a/src/com/mostc/pftt/model/core/PhptSourceTestPack.java
+++ b/src/com/mostc/pftt/model/core/PhptSourceTestPack.java
@@ -584,13 +584,7 @@ public class PhptSourceTestPack extends
SourceTestPack<PhptActiveTestPack, PhptT
*/
public EBuildBranch getVersionBranch() {
String dir = FileSystemScenario.basename(test_pack);
- if
(dir.contains("5.4")||dir.contains("5-4")||dir.contains("5_4")||dir.contains("54"))
- return EBuildBranch.PHP_5_4;
- else if
(dir.contains("5.3")||dir.contains("5-3")||dir.contains("5_3")||dir.contains("53"))
- return EBuildBranch.PHP_5_3;
- else if
(dir.contains("5.5")||dir.contains("5-5")||dir.contains("5_5")||dir.contains("55"))
- return EBuildBranch.PHP_5_5;
- else if
(dir.contains("5.6")||dir.contains("5-6")||dir.contains("5_6")||dir.contains("56"))
+ if
(dir.contains("5.6")||dir.contains("5-6")||dir.contains("5_6")||dir.contains("56"))
return EBuildBranch.PHP_5_6;
else if (dir.toLowerCase().contains("native-tls"))
return EBuildBranch.NATIVE_TLS;
diff --git a/src/com/mostc/pftt/model/sapi/EApacheVersion.java
b/src/com/mostc/pftt/model/sapi/EApacheVersion.java
index 3f7bb3a..1bcdcaa 100644
--- a/src/com/mostc/pftt/model/sapi/EApacheVersion.java
+++ b/src/com/mostc/pftt/model/sapi/EApacheVersion.java
@@ -47,20 +47,7 @@ public enum EApacheVersion {
} else if (build.getVersionMajor(cm, host) == 7) {
return true;
} else if (build.getVersionMajor(cm, host) == 5) {
- int minor = build.getVersionMinor(cm, host);
-
- if (minor==3)
- // Apache 2.4 support was added in:
~5.3.20
- return build.getVersionRelease(cm,
host) >= 20;
- else if (minor==4)
- // Apache 2.4 support was added in:
5.4.10
- return build.getVersionRelease(cm,
host) >= 10;
- else if (minor>4)
- // Apache 2.4 support always in 5.5
(5.6, etc...)
- return true;
- else
- // 5.0 5.1 5.2 5.3 5.4.0-5.4.9 (not
supported)
- return false;
+ return true;
} else {
// old or future php?
return false;
@@ -78,8 +65,6 @@ public enum EApacheVersion {
return new
ApacheHttpdAndVersion("Apache2416-VC14-OpenSSL1.0.1e-x64",
host.getSystemDrive() + "\\Apache2416-VC14-OpenSSL1.0.1e-x64\\bin\\httpd.exe");
else
return new
ApacheHttpdAndVersion("Apache2416-VC14-OpenSSL1.0.1e-x86",
host.getSystemDrive() + "\\Apache2416-VC14-OpenSSL1.0.1e-x86\\bin\\httpd.exe");
- } else if (build.is53(cm, host)||build.is54(cm,
host)) {
- return new
ApacheHttpdAndVersion("ApacheLounge-2.4.4-VC9-OpenSSL0.9.8y-x86",
host.getSystemDrive() + "\\Apache244-VC9-OpenSSL0.9.8y-x86\\bin\\httpd.exe");
} else if (build.isX64()) {
return new
ApacheHttpdAndVersion("ApacheLounge-2.4.4-VC11-OpenSSL1.0.1e-x64",
host.getSystemDrive() + "\\Apache244-VC11-OpenSSL1.0.1e-x64\\bin\\httpd.exe");
} else {
@@ -97,8 +82,6 @@ public enum EApacheVersion {
return host.getSystemDrive() +
"\\Apache2416-VC14-OpenSSL1.0.1e-x64";
else
return host.getSystemDrive() +
"\\Apache2416-VC14-OpenSSL1.0.1e-x86";
- } else if (build.is53(cm, host)||build.is54(cm,
host)) {
- return host.getSystemDrive() +
"\\Apache244-VC9-OpenSSL0.9.8y-x86";
} else if (build.isX64()) {
return host.getSystemDrive() +
"\\Apache244-VC11-OpenSSL1.0.1e-x64";
} else {
diff --git a/src/com/mostc/pftt/model/smoke/RequiredExtensionsSmokeTest.java
b/src/com/mostc/pftt/model/smoke/RequiredExtensionsSmokeTest.java
index c734882..0a02b33 100644
--- a/src/com/mostc/pftt/model/smoke/RequiredExtensionsSmokeTest.java
+++ b/src/com/mostc/pftt/model/smoke/RequiredExtensionsSmokeTest.java
@@ -226,7 +226,7 @@ public class RequiredExtensionsSmokeTest extends SmokeTest {
// testing 5.3 is especially important
//
// NOTE: 5.3 php builds do not include E_STRICT with E_ALL. you
must explicitly include both here!
- ini.putMulti(PhpIni.ERROR_REPORTING, "E_ALL ^
E_WARNING");//NONE");//build.is53(cm,
host)?PhpIni.E_ALL_STRICT_DEPRECATED:PhpIni.E_ALL_NOTICE_WARNING);
+ ini.putMulti(PhpIni.ERROR_REPORTING, "E_ALL ^
E_WARNING");//NONE");
// CRITICAL
ini.putMulti(PhpIni.DISPLAY_ERRORS, PhpIni.ON);
// TODO temp ?
diff --git a/src/com/mostc/pftt/scenario/AzureWebsitesScenario.java
b/src/com/mostc/pftt/scenario/AzureWebsitesScenario.java
index 70c7a65..0c29563 100644
--- a/src/com/mostc/pftt/scenario/AzureWebsitesScenario.java
+++ b/src/com/mostc/pftt/scenario/AzureWebsitesScenario.java
@@ -330,10 +330,6 @@ public class AzureWebsitesScenario extends
ProductionWebServerScenario {
// TODO
return ibuild;
- } else if (StringUtil.equalsICAny(build_str, "5.4", "54",
"5_4")) {
- return installBuildBranch(cm, web,
EBuildBranch.PHP_5_4, "D:\\Program Files (x86)\\PHP\\v5.4\\php-cgi.exe");
- } else if (StringUtil.equalsICAny(build_str, "5.5", "55",
"5_5")) {
- return installBuildBranch(cm, web,
EBuildBranch.PHP_5_5, "D:\\Program Files (x86)\\PHP\\v5.5\\php-cgi.exe");
} else if (StringUtil.equalsICAny(build_str, "5.6", "56",
"5_6")) {
return installBuildBranch(cm, web,
EBuildBranch.PHP_5_6, "D:\\Program Files (x86)\\PHP\\v5.6\\php-cgi.exe");
} else if (StringUtil.equalsICAny(build_str, "7.0", "70",
"7_0")) {
diff --git a/src/com/mostc/pftt/scenario/BuiltinWebServerScenario.java
b/src/com/mostc/pftt/scenario/BuiltinWebServerScenario.java
index c0567c2..05ab824 100644
--- a/src/com/mostc/pftt/scenario/BuiltinWebServerScenario.java
+++ b/src/com/mostc/pftt/scenario/BuiltinWebServerScenario.java
@@ -34,7 +34,7 @@ import
com.mostc.pftt.runner.PhptTestPreparer.PreparedPhptTestCase;
*
* This is the web server that's run when a user runs: php -S
*
- * This feature is only available (this scenario can only be run against) PHP
5.4+ (not PHP 5.3)
+ * This feature is only available (this scenario can only be run against) PHP
5.4+
*
* @author Matt Ficken
*
@@ -46,20 +46,6 @@ public class BuiltinWebServerScenario extends
WebServerScenario {
super(new BuiltinWebServerManager());
}
- /** don't run this scenario on PHP 5.3
- *
- */
- @Override
- public boolean isSupported(ConsoleManager cm, Host host, PhpBuild
build, ScenarioSet scenario_set, EScenarioSetPermutationLayer layer) {
- if (build.is53(cm, host)) {
- if (cm!=null) {
- cm.println(EPrintType.CLUE, getClass(),
"Builtin Web is not supported by PHP 5.3");
- }
- return false;
- }
- return super.isSupported(cm, host, build, scenario_set, layer);
- }
-
@Override
public String getName() {
return "Builtin-Web";
diff --git a/src/com/mostc/pftt/scenario/MSSQLScenario.java
b/src/com/mostc/pftt/scenario/MSSQLScenario.java
index 441300e..305e6ca 100644
--- a/src/com/mostc/pftt/scenario/MSSQLScenario.java
+++ b/src/com/mostc/pftt/scenario/MSSQLScenario.java
@@ -82,22 +82,12 @@ public class MSSQLScenario extends DatabaseScenario {
public String getPhpPdoDllName(EBuildBranch branch, EBuildType
type, String base_dir) {
switch(branch) {
- case PHP_5_3:
- return type == EBuildType.NTS ?
"php_pdo_sqlsrv_53_nts.dll" : "php_pdo_sqlsrv_53_ts.dll";
- case PHP_5_4:
- return type == EBuildType.NTS ?
"php_pdo_sqlsrv_54_nts.dll" : "php_pdo_sqlsrv_54_ts.dll";
- case PHP_5_5:
default:
return type == EBuildType.NTS ?
"php_pdo_sqlsrv_55_nts.dll" : "php_pdo_sqlsrv_55_ts.dll";
}
}
public String getPhpDllName(EBuildBranch branch, EBuildType
type, String base_dir) {
switch(branch) {
- case PHP_5_3:
- return type == EBuildType.NTS ?
"php_sqlsrv_53_nts.dll" : "php_sqlsrv_53_ts.dll";
- case PHP_5_4:
- return type == EBuildType.NTS ?
"php_sqlsrv_54_nts.dll" : "php_sqlsrv_54_ts.dll";
- case PHP_5_5:
default:
return type == EBuildType.NTS ?
"php_sqlsrv_55_nts.dll" : "php_sqlsrv_55_ts.dll";
}
diff --git a/src/com/mostc/pftt/scenario/OpcacheScenario.java
b/src/com/mostc/pftt/scenario/OpcacheScenario.java
index a466879..aef2317 100644
--- a/src/com/mostc/pftt/scenario/OpcacheScenario.java
+++ b/src/com/mostc/pftt/scenario/OpcacheScenario.java
@@ -22,7 +22,7 @@ import com.mostc.pftt.util.DllVersion;
* eliminates the stages of reading code from the disk and compiling it on
future access. In
* addition, it applies a few bytecode optimization patterns that make code
execution faster.
*
- * 5.5+ PHP builds include Opcache. This Scenario installs Opcache on 5.3 and
5.4 builds.
+ * 5.5+ PHP builds include Opcache.
*
* Formerly known as Optimizer+, Zend Optimizer+, often abbreviated as o+ or
zo+ or Optimizer Plus.
*
@@ -48,22 +48,6 @@ public class OpcacheScenario extends CodeCacheScenario {
public void addToDebugPath(ConsoleManager cm, AHost host, PhpBuild
build, Collection<String> debug_path) {
if (this.set_dll!=null) {
debug_path.add(set_dll.getDebugPath());
- } else {
- try {
- switch(build.getVersionBranch(cm, host)) {
- case PHP_5_3:
- debug_path.add( build.isNTS(host) ?
getDllPath53NTS(host).getDebugPath() : getDllPath53TS(host).getDebugPath() );
- break;
- case PHP_5_4:
- debug_path.add( build.isNTS(host) ?
getDllPath54NTS(host).getDebugPath() : getDllPath54TS(host).getDebugPath() );
- break;
- default:
- // OpCache is included with core 5.5+,
so the core debug-pack will be enough (don't need to do anything here)
- break;
- }
- } catch ( Exception ex ) {
-
ConsoleManagerUtil.printStackTrace(MySQLScenario.class, cm, ex);
- }
}
}
@@ -145,26 +129,6 @@ public class OpcacheScenario extends CodeCacheScenario {
return null;
}
- @Overridable
- protected DllVersion getDllPath53TS(Host host) {
- return new
DllVersion(host.getPfttCacheDir()+"/dep/opcache/php_opcache-7.0.2-5.3-ts-vc9-x86",
"php_opcache.dll", "7.0.2");
- }
-
- @Overridable
- protected DllVersion getDllPath53NTS(Host host) {
- return new
DllVersion(host.getPfttCacheDir()+"/dep/opcache/php_opcache-7.0.2-5.3-nts-vc9-x86",
"php_opcache.dll", "7.0.2");
- }
-
- @Overridable
- protected DllVersion getDllPath54TS(Host host) {
- return new
DllVersion(host.getPfttCacheDir()+"/dep/opcache/php_opcache-7.0.2-5.4-ts-vc9-x86",
"php_opcache.dll", "7.0.2");
- }
-
- @Overridable
- protected DllVersion getDllPath54NTS(Host host) {
- return new
DllVersion(host.getPfttCacheDir()+"/dep/opcache/php_opcache-7.0.2-5.4-nts-vc9-x86",
"php_opcache.dll", "7.0.2");
- }
-
public DllVersion getDllPath(ConsoleManager cm, FileSystemScenario fs,
Host host, PhpBuild build) {
return getDllPath(cm, fs, host, build, false);
}
@@ -176,22 +140,6 @@ public class OpcacheScenario extends CodeCacheScenario {
DllVersion version = null;
try {
switch(build.getVersionBranch(cm, host)) {
- case PHP_5_3:
- if (host.isWindows()) {
- if (build.isNTS(host))
- version = getDllPath53NTS(host);
- else
- version = getDllPath53TS(host);
- }
- break;
- case PHP_5_4:
- if (host.isWindows()) {
- if (build.isNTS(host))
- version = getDllPath54NTS(host);
- else
- version = getDllPath54TS(host);
- }
- break;
default:
if (host.isWindows())
version = getDllPath55Plus(cm, fs,
host, build, rename);
diff --git a/src/com/mostc/pftt/scenario/SAPIScenario.java
b/src/com/mostc/pftt/scenario/SAPIScenario.java
index d81bb12..305ed64 100644
--- a/src/com/mostc/pftt/scenario/SAPIScenario.java
+++ b/src/com/mostc/pftt/scenario/SAPIScenario.java
@@ -703,13 +703,6 @@ public abstract class SAPIScenario extends
AbstractSerialScenario {
return true;
}
- if (build.is53(cm, host)) {
- if (test_case.isNamed(TESTS53)) {
- twriter.addResult(host, setup, src_test_pack,
new PhptTestResult(host, EPhptTestStatus.XSKIP, test_case, "test sometimes
randomly fails, ignore it", null, null, null, null, null, null, null, null,
null, null, null));
-
- return true;
- }
- }
// TODO || ?
if
((test_case.getExtensionName()!=null&&(test_case.getExtensionName().equals("intl")||test_case.getExtensionName().equals("oci8")))||test_case.containsSection(EPhptSection.REQUEST)||test_case.isNamed(RANDOMLY_FAIL))
{
twriter.addResult(host, setup, src_test_pack, new
PhptTestResult(host, EPhptTestStatus.XSKIP, test_case, "test sometimes randomly
fails, ignore it", null, null, null, null, null, null, null, null, null, null,
null));
diff --git a/src/com/mostc/pftt/scenario/WinCacheUScenario.java
b/src/com/mostc/pftt/scenario/WinCacheUScenario.java
index 39364b6..9f59034 100644
--- a/src/com/mostc/pftt/scenario/WinCacheUScenario.java
+++ b/src/com/mostc/pftt/scenario/WinCacheUScenario.java
@@ -64,15 +64,6 @@ public abstract class WinCacheUScenario extends
UserCacheScenario {
} else {
try {
switch(build.getVersionBranch(cm, host)) {
- case PHP_5_3:
- debug_path.add(
host.getPfttCacheDir()+"/dep/wincache/wincache-1.3.4-5.3-nts-vc11-x86/php_wincache.pdb"
);
- break;
- case PHP_5_4:
- debug_path.add(
host.getPfttCacheDir()+"/dep/wincache/wincache-1.3.4-5.4-nts-vc11-x86/php_wincache.pdb"
);
- break;
- case PHP_5_5:
- debug_path.add(
host.getPfttCacheDir()+"/dep/wincache/wincache-1.3.5-5.5-nts-vc11-x86/php_wincache.pdb"
);
- break;
case PHP_5_6:
default:
if (build.isX64())
@@ -103,19 +94,6 @@ public abstract class WinCacheUScenario extends
UserCacheScenario {
host.getPfttCacheDir()+"/dep/wincache/wincache-1.3.5-5.6-nts-vc11-x64/php_wincache.dll"
:
host.getPfttCacheDir()+"/dep/wincache/wincache-1.3.5-5.6-nts-vc11-x86/php_wincache.dll";
}
- @Overridable
- protected String getDllPath55(Host host) {
- return
host.getPfttCacheDir()+"/dep/wincache/wincache-1.3.5-5.5-nts-vc11-x86/php_wincache.dll";
- }
- @Overridable
- protected String getDllPath54(Host host) {
- return
host.getPfttCacheDir()+"/dep/wincache/wincache-1.3.4-5.4-nts-vc9-x86/php_wincache.dll";
- }
- @Overridable
- protected String getDllPath53(Host host) {
- return
host.getPfttCacheDir()+"/dep/wincache/wincache-1.3.4-5.3-nts-vc9-x86/php_wincache.dll";
- }
-
@Override
public IScenarioSetup setup(ConsoleManager cm, FileSystemScenario fs,
Host host, PhpBuild build, ScenarioSet scenario_set,
EScenarioSetPermutationLayer layer) {
if (!host.isWindows() || !build.isNTS(host))
@@ -133,15 +111,6 @@ public abstract class WinCacheUScenario extends
UserCacheScenario {
dll_path = set_dll.getPath();
} else {
switch(branch) {
- case PHP_5_3:
- dll_path = getDllPath53(host);
- break;
- case PHP_5_4:
- dll_path = getDllPath54(host);
- break;
- case PHP_5_5:
- dll_path = getDllPath55(host);
- break;
case PHP_5_6:
default:
dll_path = getDllPath56(host, build.isX64());
diff --git a/src/com/mostc/pftt/util/HostEnvUtil.java
b/src/com/mostc/pftt/util/HostEnvUtil.java
index 5ae1209..99985ff 100644
--- a/src/com/mostc/pftt/util/HostEnvUtil.java
+++ b/src/com/mostc/pftt/util/HostEnvUtil.java
@@ -282,7 +282,6 @@ public final class HostEnvUtil {
/** PHP on Windows requires Microsoft's VC Runtime to be installed.
This method ensures that the correct version is installed.
*
- * PHP 5.3 and 5.4 require the VC9 x86 Runtime
* PHP 5.5+ require the VC11 x86 Runtime
* PHP 7.0+ require the VC14 x86 Runtime
*
@@ -324,15 +323,6 @@ public final class HostEnvUtil {
}
- protected static void installVCRT9(ConsoleManager cm,
FileSystemScenario fs, AHost host) throws IllegalStateException, IOException,
Exception {
-
- if (installedVCRT9(host)) {
- cm.println(EPrintType.CLUE, HostEnvUtil.class, "VC9
Runtime already installed");
- } else {
- doInstallVCRT(cm, fs, host, "VC9",
"vc9_redist_x86.exe");
- }
- }
-
protected static void installVCRT(ConsoleManager cm, FileSystemScenario
fs, AHost host, String name, String installerFile, String sysDllFile)
throws IllegalStateException, IOException, Exception {
// starting with VCRT10, checking the registry is the only way
to tell
@@ -607,17 +597,6 @@ public final class HostEnvUtil {
}
}
- private static void downloadVCRuntime9(FileSystemScenario fs, LocalHost
host, LocalConsoleManager cm)
- {
- if (installedVCRT9(host)) {
- cm.println(EPrintType.CLUE, HostEnvUtil.class, "VC9
Runtime already installed, skip downloading.");
- }
- else
- {
- downloadFile(fs, cm, "VC9 Runtime",
Link_VC9_Redist_X86, File_VC9_Redist_X86);
- }
- }
-
private static void downloadVC14Runtime(FileSystemScenario fs,
LocalConsoleManager cm,
String name, String remote_url, String installer_file,
String dll_file)
{
diff --git a/src/com/mostc/pftt/util/WindowsSnapshotDownloadUtil.groovy
b/src/com/mostc/pftt/util/WindowsSnapshotDownloadUtil.groovy
index 5dcb5fc..83811e8 100644
--- a/src/com/mostc/pftt/util/WindowsSnapshotDownloadUtil.groovy
+++ b/src/com/mostc/pftt/util/WindowsSnapshotDownloadUtil.groovy
@@ -30,9 +30,6 @@ import com.mostc.pftt.scenario.FileSystemScenario;
final class WindowsSnapshotDownloadUtil {
// TODO temp move these to EBuildBranch
- static final URL PHP_5_3_DOWNLOAD = new
URL("http://windows.php.net/downloads/snaps/php-5.3/";)
- static final URL PHP_5_4_DOWNLOAD = new
URL("http://windows.php.net/downloads/snaps/php-5.4/";)
- static final URL PHP_5_5_DOWNLOAD = new
URL("http://windows.php.net/downloads/snaps/php-5.5/";)
static final URL PHP_5_6_DOWNLOAD = new
URL("http://windows.php.net/downloads/snaps/php-5.6/";)
static final URL PHP_7_0_DOWNLOAD = new
URL("http://windows.php.net/downloads/snaps/php-7.0/";)
static final URL PHP_7_1_DOWNLOAD = new
URL("http://windows.php.net/downloads/snaps/php-7.1/";)
@@ -69,12 +66,6 @@ final class WindowsSnapshotDownloadUtil {
return PHP_7_1_DOWNLOAD;
case EBuildBranch.PHP_7_0:
return PHP_7_0_DOWNLOAD;
- case EBuildBranch.PHP_5_3:
- return PHP_5_3_DOWNLOAD;
- case EBuildBranch.PHP_5_4:
- return PHP_5_4_DOWNLOAD;
- case EBuildBranch.PHP_5_5:
- return PHP_5_5_DOWNLOAD;
case EBuildBranch.PHP_5_6:
return PHP_5_6_DOWNLOAD;
case EBuildBranch.PHP_Master:
