date:20190516

com pftt2: Add {TMP} support on PFTT (closes #27): src/com/mostc/pftt/model/core/PhpBuild.java src/com/mostc/pftt/model/core/PhpIni.java src/com/mostc/pftt/model/core/PhptTestCase.java src/com/mostc/p

2019-05-16 Thread Christoph Michael Becker

Commit:7de71d947b1ba0c3b4326fbbc0781d91100fab0c
Author:Holly Li (WIPRO LIMITED)  Thu, 16 May 
2019 04:31:10 +0200
Committer: Christoph M. Becker   Thu, 16 May 2019 
09:36:35 +0200
Parents:   f110243fba1379413a205e3beb7e46623f496dc2
Branches:  master

Link:   
http://git.php.net/?p=pftt2.git;a=commitdiff;h=7de71d947b1ba0c3b4326fbbc0781d91100fab0c

Log:
Add {TMP} support on PFTT (closes #27)

also replace regex replace with string replace

Bugs:
https://bugs.php.net/27

Changed paths:
  M  src/com/mostc/pftt/model/core/PhpBuild.java
  M  src/com/mostc/pftt/model/core/PhpIni.java
  M  src/com/mostc/pftt/model/core/PhptTestCase.java
  M  src/com/mostc/pftt/scenario/FileSystemScenario.java


Diff:
diff --git a/src/com/mostc/pftt/model/core/PhpBuild.java 
b/src/com/mostc/pftt/model/core/PhpBuild.java
index 036999c..238b601 100644
--- a/src/com/mostc/pftt/model/core/PhpBuild.java
+++ b/src/com/mostc/pftt/model/core/PhpBuild.java
@@ -367,8 +367,9 @@ public class PhpBuild extends SAPIManager {
return ini;
}
String path = getDefaultPhpIniPath(fs, host, type);
+   String tmp = host.getTempDir();
if (host.mExists(path))
-   ini = new PhpIni(host.mGetContents(path), build_path);
+   ini = new PhpIni(host.mGetContents(path), build_path, 
tmp);
else
ini = 
RequiredExtensionsSmokeTest.createDefaultIniCopy(cm, fs, host, this);

diff --git a/src/com/mostc/pftt/model/core/PhpIni.java 
b/src/com/mostc/pftt/model/core/PhpIni.java
index 98297e4..7354eca 100644
--- a/src/com/mostc/pftt/model/core/PhpIni.java
+++ b/src/com/mostc/pftt/model/core/PhpIni.java
@@ -9,6 +9,8 @@ import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
 
+import org.apache.commons.lang.SystemUtils;
+
 import com.github.mattficken.io.ArrayUtil;
 import com.github.mattficken.io.StringUtil;
 import com.mostc.pftt.host.AHost;
@@ -121,7 +123,7 @@ public class PhpIni {
}

public PhpIni(String ini_str) {
-   this(ini_str, "");
+   this(ini_str, "", "");
// "" => replace {PWD} with "" 
}

@@ -140,15 +142,15 @@ public class PhpIni {
return o;
}

-   static final Pattern PAT_PWD = Pattern.compile("\\{PWD\\}");
-   static final Pattern PAT_BS = Pattern.compile("");
-   static final Pattern PAT_FS = Pattern.compile("/");
-   public PhpIni(String ini_str, String pwd) {
+   static final String PH_PWD = "{PWD}";
+   static final String PH_TMP = "{TMP}";
+   public PhpIni(String ini_str, String pwd, String tmp) {
this();
-   if (pwd!=null&&ini_str.contains("{PWD}")) {
-   ini_str = StringUtil.replaceAll(PAT_PWD, pwd, ini_str);
-   
-   // CRITICAL: ensure that correct \\s are used for paths 
on Windows
+   if (pwd!=null&&ini_str.contains(PH_PWD)) {
+   ini_str = ini_str.replace(PH_PWD, pwd);
+   }
+   if (tmp!=null&&ini_str.contains(PH_TMP)) {
+   ini_str = ini_str.replace(PH_TMP, tmp);
}
// read ini string, line by line
for (String line : StringUtil.splitLines(ini_str)) {
diff --git a/src/com/mostc/pftt/model/core/PhptTestCase.java 
b/src/com/mostc/pftt/model/core/PhptTestCase.java
index 2712846..9ebb82e 100644
--- a/src/com/mostc/pftt/model/core/PhptTestCase.java
+++ b/src/com/mostc/pftt/model/core/PhptTestCase.java
@@ -1,5 +1,6 @@
 package com.mostc.pftt.model.core;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -124,7 +125,7 @@ public class PhptTestCase extends TestCase {
private String bork_info, unsupported_info;
private PhptTestCase parent;
private WeakReference ini;
-   private WeakReference ini_pwd, contents;
+   private WeakReference ini_pwd, ini_tmp, contents;
private SoftReference expected_re;
private PhptSourceTestPack test_pack;
private CharsetICU common_charset;
@@ -394,21 +395,28 @@ public class PhptTestCase extends TestCase {
public PhpIni getINI(PhptActiveTestPack active_test_pack, AHost host) {
PhpIni this_ini;
String this_ini_pwd;
-   String ini_pwd = 
active_test_pack.getStorageDirectory()+"/"+FileSystemScenario.dirname(name);
-   if (this.ini_pwd!=null) {
+   String this_ini_tmp;
+   String dirName = FileSystemScenario.osDirName(name);
+   String ini_pwd = 
active_test_pack.getStorageDirectory()+File.separator+dirName;
+   String ini_tmp = host.getTempDir();
+   if (this.ini_pwd!=null && this.ini_tmp != null) {

com web/qa: Add PHP 7.3.6RC1: include/release-qa.php

2019-05-16 Thread Christoph Michael Becker

Commit:341cc4a46adb6bb3f9891caa197c09220486bb61
Author:Christoph M. Becker  Thu, 16 May 2019 
10:30:34 +0200
Parents:   1770568a7169bfa94167b77222462f1c161d6b74
Branches:  master

Link:   
http://git.php.net/?p=web/qa.git;a=commitdiff;h=341cc4a46adb6bb3f9891caa197c09220486bb61

Log:
Add PHP 7.3.6RC1

Changed paths:
  M  include/release-qa.php


Diff:
diff --git a/include/release-qa.php b/include/release-qa.php
index 90cbd35..0883f69 100644
--- a/include/release-qa.php
+++ b/include/release-qa.php
@@ -74,15 +74,15 @@ $QA_RELEASES = [
 ],
 ],
 
-'7.3.5' => [
+'7.3.6' => [
 'active'  => true,
 'release' => [
 'type'   => 'RC',
-'number' => 0,
-'sha256_bz2' => '',
-'sha256_gz'  => '',
-'sha256_xz'  => '',
-'date'   => '18 Apr 2019',
+'number' => 1,
+'sha256_bz2' => 
'1ccd76a21eace8a394a88769c58437584282c3849925c83e499740ea47e73e21',
+'sha256_gz'  => 
'e091298ff4b92f2dc6bd82743b65cb4461146e5697b2fa491235432d2fdea3d5',
+'sha256_xz'  => 
'0a74e081c05197fc595c1aa4614a155f66953f8fbcae50339f8d0c713e1de088',
+'date'   => '16 May 2019',
 'baseurl'=> 'https://downloads.php.net/~cmb/',
 ],
 ],

PHP 7.3.6RC1 is available for testing

2019-05-16 Thread Christoph M. Becker

PHP 7.3.6RC1 has just been released and can be downloaded from:



Or use the git tag: php-7.3.6RC1

Windows binaries are available at: 

Please test it carefully, and report any bugs in the bug system.
7.3.6 should be expected in 2 weeks, i.e. on May 30th, 2019.

Hash values and PGP signatures can be found below or at
.

Thank you, and happy testing!

Regards,
Stanislav Malyshev & Christoph M. Becker

--

php-7.3.6RC1.tar.bz2
SHA256 hash:
1ccd76a21eace8a394a88769c58437584282c3849925c83e499740ea47e73e21
PGP signature:
-BEGIN PGP SIGNATURE-

iQJABAABCAAqFiEEy69p8XOg/qS1N/Rw1myVkxGLzLYFAlzb3dgMHGNtYkBwaHAu
bmV0AAoJENZslZMRi8y2VDEP/RpWPvYZ3SIpkiuwiFEWkkMYL8pP4taKSGd7r7mh
LGHqqDaPVBS+ZXlhn+8XKaSPpiEC5eogJV5ITVXeTDsz6I6WQwNsEt2nW6VMZivS
UfRl1OmWqRzfszUi7DCGvd5zoqQM97RuF44I60SANDGRrQ4io5XImwwGsPTfsQiP
rAeQ+frTbQqeUR+SySiQV9ME/aYHVDzBp9Wp0fuia++5samOErylCE7le9HI1Idt
v2WTzllmeV9hmCAlqtRjYK3qYwhJ7Tg6kI5+jALt+EVPzUzbcniuhcZg/1/ht4u+
lW1VZ8cvcrMYq3tIglRyYn6150nagT31IMKDmnQJD/y9Jq9HIM41h3Y8V3U1lEp6
mxCwFf2eQKgOi2t2UWGl4V/tibEfs4OHyMpJ2u/u+32R8yBElHdi1tD+z95TJUfC
3lWo6P3HM54ZhDiEtKi3hojaRTWe8VEb2qx6ujFt8Fxc165AzrGJg9NLlZHVcZNR
axUgdAlQZmikyD9F9xOwbe3+QbIkre2e/mgCO1PVzonoAWsB/DUbxT+8Jkmx3neD
Z4UXTLCfTwsWrLJtj6Ioy/v+DooR0Y/Rb0mLk92f8rICzxyKld0FOB5OcqflozSM
oATay7rzude8HbtS7+JgXIbFdSfsDqlxntEyPamd5+2BnaJmjz3HrT3F55P/yShs
0XhG
=8fXI
-END PGP SIGNATURE-


php-7.3.6RC1.tar.gz
SHA256 hash:
e091298ff4b92f2dc6bd82743b65cb4461146e5697b2fa491235432d2fdea3d5
PGP signature:
-BEGIN PGP SIGNATURE-

iQJABAABCAAqFiEEy69p8XOg/qS1N/Rw1myVkxGLzLYFAlzb3dgMHGNtYkBwaHAu
bmV0AAoJENZslZMRi8y2fI8P/23s1xE+97FNnI+b+bT3ioUXbA5NiQA2nulgObCC
Xl/SJ61TMRz/SU7AgcsrF9qdOea9X1eLJ78gBXETALQRLA1mIrPdFTRFxH4tEKGb
NMD4PTdbFZsPrxF0KnfRnG2ndZcGn14aStitsBCiFeGIyZjv7Vl2Op2AFmhGSbTn
w1xbXjpSNBxIIctZNkd/j4gI8Q3h45w0Op5/9MjZBPojwyNdqAADKdDGxVcaCKYA
9EImS+cKabqG5zPhIjLSGF5Gjg06p+rr1Zg437vb0yne9aGRpA7XRqO0PqAn5WF2
SCGbr3SaFSh/7ZV8GfJgNhrDI0d3xndOXeTYPj8/vxOKxAp3SaXYyAjg+wGeozdf
cr4C0zs5nvMIIbn52H3M0/UDa6zZYgrByMBli7bnmiVZ1XAg1OLhlFDnDYbug4Tr
x5SefAfLzxjOUZmUrJWGDGZXezae01MPWalwKmdrIQ1N0VCVpnJB03YQ8KtTH71r
3EBMMTKOHBBGL4LytQ7lj2OjIDLg4pB8cWQPBjvWVZ2yPlOU+LEAW519CbO78xQ4
Ml/5VI2oV7TJLlkpSb9a7hJ8Lngqx3rdCuaLKXZbNtAdXyBzkxWc3J3em+q+q9RF
elzjfDyO7VVlx7B3izv0HBRw+2f53D5X2ifZ1I3aB+yswuVzwstpo4bOffNGber8
rSA/
=rcwd
-END PGP SIGNATURE-


php-7.3.6RC1.tar.xz
SHA256 hash:
0a74e081c05197fc595c1aa4614a155f66953f8fbcae50339f8d0c713e1de088
PGP signature:
-BEGIN PGP SIGNATURE-

iQJABAABCAAqFiEEy69p8XOg/qS1N/Rw1myVkxGLzLYFAlzb3dgMHGNtYkBwaHAu
bmV0AAoJENZslZMRi8y2it8P/ibKkFffT4kSbKOMAPHqZEEq9biEjGaOCIVjn/hk
44rTdfWkmPlnu8U24wi31XuG1OK2LDF35ZUuYVhkVFmaLzalExBmaWBNZrptL3dr
OstNHfdmNupidwBZhoLdKv+yXxbUVvW/Bxk2AzL33qcvlUL49UefonKwks7o1XvL
yNMekeanB+ELkFFrE6F+YK15laCejpUqXI80ca1HR2jt/GHFiivc2i4DdvY0eE/g
5alCt4AUBw+F1ztpmuqr3agF9+PX52KNldDm/vQSVXmCw7DXirhMeFu63P3VvkGi
L0I/qtyUntYVaaRpEX7qfnm5Xpa1zgdLFQwsCD+TZrPoClZCveFOO7fLFsQwlHU1
JwT8cAzohR+h6Kfibgq7U2SnodEOcmtfJbMgP6Un706NQtAwVzo0trR//Iiv/07P
HXQBtNbOJZS240kWrimY7CoDYs6pJOXvY34Q5opzBgD0sksVKdC48uhLpSRa9rXU
S1jE9iVjvYiJzdun1jXK0aYRSQx1J8f8JLy7Y+JKXTjkcHMMwPjMB0AZlLZ7UR4P
lyzid0gBddQyAhT4fqqwgaxolXk9ShpoYFkVCOKQIvpE/T8OjQj3/qCKthV2qjUX
xmgg6goAYxmzZIN60Gu4fTeruoADZc9rrQwU2MJpA+oLDjCZsg+90tn1iKEN9PPb
U/Jk
=lD2T
-END PGP SIGNATURE-

com web/qa: 7.2.19RC1: include/release-qa.php

2019-05-16 Thread Sara Golemon

Commit:e4b5936aef6fd1307f3ad0b6da85dd28c00cde07
Author:Sara Golemon  Thu, 16 May 2019 13:49:41 
-0400
Parents:   341cc4a46adb6bb3f9891caa197c09220486bb61
Branches:  master

Link:   
http://git.php.net/?p=web/qa.git;a=commitdiff;h=e4b5936aef6fd1307f3ad0b6da85dd28c00cde07

Log:
7.2.19RC1

Changed paths:
  M  include/release-qa.php


Diff:
diff --git a/include/release-qa.php b/include/release-qa.php
index 0883f69..5532f9e 100644
--- a/include/release-qa.php
+++ b/include/release-qa.php
@@ -61,16 +61,16 @@ $QA_RELEASES = [
 ],
 ],
 
-'7.2.18' => [
+'7.2.19' => [
 'active'  => true,
 'release' => [
 'type'   => 'RC',
-'number' => 0,
-'sha256_bz2' => '',
-'sha256_gz'  => '',
-'sha256_xz'  => '',
-'date'   => '18 Apr 2019',
-'baseurl'=> 'https://downloads.php.net/~remi/',
+'number' => 1,
+'sha256_bz2' => 
'504007b1a3d9712d2a175e8cd8ad19dfe0ecca63d5c4b3a1e35485f33e726f37',
+'sha256_gz'  => 
'db36b570b069ac61f17f01a4c25827fd261fc745560a6fe7b1af2ba03c4014b3',
+'sha256_xz'  => 
'a63199b5fa09e39c935d3dc23ce22c66a943b68966e8db1e1800950f51234e89',
+'date'   => '16 May 2019',
+'baseurl'=> 'https://downloads.php.net/~pollita/',
 ],
 ],

com web/qa: PHP 5.6 is no more and PHP_HEAD is now 8.0: write-test.php

2019-05-16 Thread Kalle Sommer Nielsen

Commit:91da7a5a947585626e791a117fc69094ccb4aeae
Author:Kalle Sommer Nielsen  Fri, 17 May 2019 
01:02:16 +0300
Parents:   e4b5936aef6fd1307f3ad0b6da85dd28c00cde07
Branches:  master

Link:   
http://git.php.net/?p=web/qa.git;a=commitdiff;h=91da7a5a947585626e791a117fc69094ccb4aeae

Log:
PHP 5.6 is no more and PHP_HEAD is now 8.0

Changed paths:
  M  write-test.php


Diff:
diff --git a/write-test.php b/write-test.php
index ec52850..1e987c6 100644
--- a/write-test.php
+++ b/write-test.php
@@ -7,11 +7,11 @@ $SITE_UPDATE = date("D M d H:i:s Y T", filectime(__FILE__));
 // This is used below for linking to GCOV (Format: GCOV version => Human 
readable version)
 function get_active_branches() {
   return [
-'PHP_5_6'   => '5.6',
 'PHP_7_1'   => '7.1',
 'PHP_7_2'   => '7.2',
 'PHP_7_3'   => '7.3',
-'PHP_HEAD'  => '7.4',
+'PHP_7_4'   => '7.4',
+'PHP_HEAD'  => '8.0'
   ];
 }

com pftt2: Add {TMP} support on PFTT (closes #27): src/com/mostc/pftt/model/core/PhpBuild.java src/com/mostc/pftt/model/core/PhpIni.java src/com/mostc/pftt/model/core/PhptTestCase.java src/com/mostc/p

com web/qa: Add PHP 7.3.6RC1: include/release-qa.php

PHP 7.3.6RC1 is available for testing

com web/qa: 7.2.19RC1: include/release-qa.php

com web/qa: PHP 5.6 is no more and PHP_HEAD is now 8.0: write-test.php

5 matches

Site Navigation

Mail list logo

Footer information