Prepare 2.3.0

* Migrate sdk files to http://downloads.php.net/~windows/php-sdk

* Add some debugging

* Allow multiline package match

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2017-2018 Anatol Belski
+Copyright 2017-2019 Anatol Belski
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

README.md

@@ -8,14 +8,23 @@ The PHP SDK itself and the SDK own tools and code are licensed under the BSD 2-C
 
 # Overview
 
-The PHP SDK 2.0+ is compatible with PHP 7.0 and above. The compatibility with [older versions](http://windows.php.net/downloads/php-sdk/php-sdk-binary-tools-20110915.zip "php-sdk-binary-tools-20110915.zip") is kept, also available from the [legacy branch](https://github.com/Microsoft/php-sdk-binary-tools/tree/legacy). The toolset was significantly revamped. Newer tools are now available, better workflows are now possible. The toolset consists on a mix of the hand written scripts, selected MSYS2 parts and standalone programs. 
+The toolset consists on a mix of the hand written scripts, selected MSYS2 parts and standalone programs. It supports any workflows, be it a custom, local or a CI build whatsoever.
+
+The PHP SDK 2.2+ is compatible with PHP 7.2 and above.
+
+The PHP SDK 2.1 is required to build PHP 7.1 or 7.0.
+
+The legacy binary tools SDK is available from the [legacy branch](https://github.com/php/php-sdk-binary-tools/tree/legacy) and is suitable to build PHP 5.
 
 # Requirements
 
 - A 64-bit build host
-- `Visual C++ 2015` or `Visual C++ 2017` must be installed prior SDK usage (be sure to install the C++ dev, .NET dev and the Windows SDK components)
+- Windows 7 or later
+- `Visual C++ 2017` or `Visual C++ 2019` must be installed prior SDK usage. Required components
+  - C++ dev
+  - Windows SDK
+  - .NET dev
 - if `Cygwin`, `MingW` or any other cross solution is installed, please read notes in the pitfalls section
-- The PHP SDK was successfully tested on Windows 7 or later, earlier versions might work but are not recommended
 
 # Tools
 
@@ -31,8 +40,8 @@ The PHP SDK 2.0+ is compatible with PHP 7.0 and above. The compatibility with [o
 
 ## Other tools
 
-- `bison` 3.2.4, `re2c` 1.1.1, `lemon`
-- `awk`, `gawk`, `sed`, `grep`
+- `bison` 3.3.2, `re2c` 1.1.1, `lemon`
+- `awk`, `gawk`, `sed`, `grep`, `jq`
 - `diff`, `diff3`, `patch`
 - `md5sum`, `sha1sum`, `sha224sum`, `sha256sum`, `sha384sum`, `sha512sum`
 - `7za`, `zip`, `unzip`, `unzipsfx`
@@ -50,7 +59,7 @@ These are not included with the PHP SDK, but might be useful. While Visual C++ i
 
 # Usage
 
-The PHP SDK should be unzipped into the shortest possible path, preferrably somewhere near the drive root.
+The PHP SDK should be unzipped into the shortest possible path, preferably somewhere near the drive root.
 
 Usually, the first step to start the PHP SDK is by invoking one of the suitable starter scripts. This automatically puts the console on the correct environment relevant for the desired PHP build configuration.
 
@@ -58,7 +67,7 @@ It is not required to hold the source in the PHP SDK directory. It could be usef
 
 ## Basic usage example
 
-- `git clone https://github.com/Microsoft/php-sdk-binary-tools.git c:\php-sdk`
+- `git clone https://github.com/php/php-sdk-binary-tools.git c:\php-sdk`
 - `cd c:\php-sdk`
 - `git checkout php-sdk-2.1.9` or later
 - invoke `phpsdk-vc15-x64.bat`
@@ -71,7 +80,7 @@ More extensive documentation can be found on the [wiki](https://wiki.php.net/int
 
 ## The old way
 
-- `git clone https://github.com/Microsoft/php-sdk-binary-tools.git c:\php-sdk`
+- `git clone https://github.com/php/php-sdk-binary-tools.git c:\php-sdk`
 - follow the instructions on the PHP [wiki page](https://wiki.php.net/internals/windows/stepbystepbuild "PHP wiki page")
 
 # Customizing
@@ -113,7 +122,9 @@ As of the version 2.1.0, the SDK includes a tool for the [PGO](https://docs.micr
 ## Preparing PGO training environment
 - the pgo folder in the SDK root dir contains templates and scenarios for PGO training
 - adjust and execute [doc/phpsdk_pgo_prep_elevated.bat.example](doc/phpsdk_pgo_prep_elevated.bat.example) to open ports required for PHP SDK training servers
-- run `phpsdk_pgo --init`
+- run `phpsdk_pgo --init`. Note that composer requires huge amounts of memory, so
+  it may be necessary to set the environment variable `COMPOSER_MEMORY_LIMIT=-1`.
+  The PGO initialization may not succeed in x86 enviroments.
 
 ## Creating PGO build
 - compile PHP configured using `--enable-pgi`
@@ -190,9 +201,30 @@ previously.
 - When fetching the binary SDK from git, git `core.autocrlf` configuration directive set to `false` is recommended.
 - Tools, based on MSYS2, only accept paths with forward slashes.
 - Both Visual C++ toolset and the Windows SDK components have to be installed for the PHP SDK to work properly. 
-- The VC++ toolset is still requried, even if another compiler, fe. clang, is intended to be used.
+- The VC++ toolset is still required, even if another compiler, fe. clang, is intended to be used.
 - `task.exe` is not a console application, some systems might not propagate exit code except the batch is explicitly run from `cmd /c`, etc.
-- `7za` should be prefered over `unzip` and `zip` for compatibility reasons.
-- If you experince some strange crashes on MSYS2 tools, try the phpsdk_rebase_msys2 tool. MSYS2 tools might be have unstable
+- `7za` should be preferred over `unzip` and `zip` for compatibility reasons.
+- If you experience some strange crashes on MSYS2 tools, try the phpsdk_rebase_msys2 tool. MSYS2 tools might be have unstable
   on ASLR enabled systems.
 
+# Internal notes
+
+## Releases
+
+Users of the PHP SDK are supposed to use tagged versions for stability and
+reproducability.  This requires the maintainers of the PHP SDK to create such
+tags for *all* *relevant* *changes*.  The tag format should be `php-sdk-X.Y.Z`,
+with the common major, minor and revision numbers.
+
+Comprehensive changes, which would be hard to test extensively, such as updates
+to the bundled PHP or the MinGW tools, should walk through a QA (aka. pre-release)
+process, typically with beta versions (e.g. `php-sdk-X.Y.Zbeta1`).  Only after
+these have been thoroughly tested, and all relevant issues have been resolved,
+a GA release should be tagged.
+
+After each tag, a couple of other repositories should be informed about the
+available update, ideally in form of a pull request.  These repositories are:
+
+* https://github.com/php/php-src (for Windows CI)
+* https://github.com/php/php-windows-builder
+* https://github.com/php/setup-php-sdk

VERSION

@@ -1 +1 @@
-2.2.0beta4
+2.3.0

bin/php/php.ini

@@ -5,7 +5,7 @@ extension=php_sqlite3.dll
 extension=php_openssl.dll
 extension=php_mbstring.dll
 extension=php_mysqli.dll
-memory_limit=1G
+memory_limit=4G
 
 error_reporting=-1
 display_errors=1

bin/phpsdk_buildtree.bat

@@ -20,12 +20,17 @@ if "%PHP_SDK_ARCH%" NEQ "" (
 	goto create_all
 ) else (
 :create_all
-	MD %_%\vc14\x86\deps\bin
-	MD %_%\vc14\x86\deps\lib
-	MD %_%\vc14\x86\deps\include
-	MD %_%\vc14\x64\deps\bin
-	MD %_%\vc14\x64\deps\lib
-	MD %_%\vc14\x64\deps\include
+	for %%i in (vc14 vc15 vs16 vs17) do (
+		MD %_%\%%i\x86\deps\bin
+		MD %_%\%%i\x86\deps\lib
+		MD %_%\%%i\x86\deps\include
+		MD %_%\%%i\x64\deps\bin
+		MD %_%\%%i\x64\deps\lib
+		MD %_%\%%i\x64\deps\include
+		MD %_%\%%i\arm64\deps\bin
+		MD %_%\%%i\arm64\deps\lib
+		MD %_%\%%i\arm64\deps\include
+	)
 )
 
 set _=

bin/phpsdk_deps.php

@@ -128,7 +128,7 @@ try {
 	/* The current CRT needs to match the config one. */
 	$active_crt = getenv("PHP_SDK_VS");
 	if (Config::getCurrentCrtName() != $active_crt && !$force) {
-		throw new Exception("Active CRT '$active_crt' differs from the branch CRT '" . Config::getCurrentCrtName() . "'.");
+		throw new Exception("Active CRT name '$active_crt' differs from the branch CRT name '" . Config::getCurrentCrtName() . "'.");
 	}
 
 	$branch_data = Config::getCurrentBranchData();
@@ -180,7 +180,7 @@ function usage(int $code = -1)
 	echo "Usage: ", PHP_EOL, PHP_EOL;
 	echo "Configuration:", PHP_EOL;
 	echo "  -b --branch    Branch name, eg. 7.0, 7.1, etc. If omited, several guess methods apply.", PHP_EOL;
-	echo "  -a --arch      Architecture, x86 or x64. If omited, cl.exe is used to guess.", PHP_EOL;
+	echo "  -a --arch      Architecture, x86 or x64 or arm64. If omited, cl.exe is used to guess.", PHP_EOL;
 	echo "  -t --crt       CRT, marked by the corresponding VC++ version, eg. vc11, vc14, etc.", PHP_EOL;
 	echo "  -s --stability One of stable or staging.", PHP_EOL, PHP_EOL;
 	echo "Commands:", PHP_EOL;

bin/phpsdk_dumpenv.bat

@@ -12,18 +12,8 @@ echo.
 call %PHP_SDK_BIN_PATH%\phpsdk_version.bat
 echo.
 
-if "%PHP_SDK_OS_ARCH%"=="x64" (
-	echo OS architecture:    64-bit 
-) else (
-	echo OS architecture:    32-bit 
-)
-
-if "%PHP_SDK_ARCH%"=="x64" (
-	echo Build architecture: 64-bit 
-) else (
-	echo Build architecture: 32-bit 
-)
-
+echo OS architecture:    %PHP_SDK_OS_ARCH% 
+echo Build architecture: %PHP_SDK_ARCH% 
 echo Visual C++:         %PHP_SDK_VC_TOOLSET_VER%
 echo PHP-SDK path:       %PHP_SDK_ROOT_PATH%
 

bin/phpsdk_setshell.bat

@@ -44,32 +44,65 @@ if 14 gtr %TMP_CHK% (
 set PHP_SDK_VS_NUM=%TMP_CHK%
 set TMP_CHK=
 
-if /i not "%2"=="x64" (
-	if /i not "%2"=="x86" (
-		echo Unsupported arch "%2"
-		goto out_error
-	)
+rem check target arch
+if "%2"=="x86" set PHP_SDK_ARCH=%2
+if "%2"=="x64" set PHP_SDK_ARCH=%2
+if "%2"=="x86_64" set PHP_SDK_ARCH=x64
+if "%2"=="amd64" set PHP_SDK_ARCH=x64
+if "%2"=="arm64" set PHP_SDK_ARCH=%2
+if "%PHP_SDK_ARCH%"=="" (
+	echo Unsupported target arch %2 >&2
+	goto out_error
 )
 
-set PHP_SDK_ARCH=%2
+set TOOLSET=
+if NOT "%3"=="" SET TOOLSET=%3 
 
 rem check OS arch
-set TMPKEY=HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion
-reg query "%TMPKEY%" /v "ProgramFilesDir (x86)" >nul 2>nul
-if not errorlevel 1 (
-	set PHP_SDK_OS_ARCH=x64
-) else (
-	if /i "%PHP_SDK_ARCH%"=="x64" (
-		echo 32-bit OS detected, native 64-bit toolchain is unavailable.
-		goto out_error
-	)
-	set PHP_SDK_OS_ARCH=x86
+rem todo: allow user choose host sdk arch (i.e. x64 target can be compiled at x64(native) or x86(cross))
+for /f "usebackq tokens=1*" %%i in (`wmic cpu get Architecture /value /format:table ^| findstr /r "[1234567890][1234567890]*"`) do (
+	set PHP_SDK_OS_ARCH_NUM=%%i
 )
-set TMPKEY=
+
+goto os_arch_cases
+:os_arch_error
+echo Unsupported OS arch %PHP_SDK_OS_ARCH% >&2
+goto out_error
+
+:os_arch_cases
+if "%PHP_SDK_OS_ARCH_NUM%"=="0" set PHP_SDK_OS_ARCH=x86
+if "%PHP_SDK_OS_ARCH_NUM%"=="1" (set PHP_SDK_OS_ARCH=mips && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="2" (set PHP_SDK_OS_ARCH=alpha && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="3" (set PHP_SDK_OS_ARCH=ppc && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="4" (set PHP_SDK_OS_ARCH=shx && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="5" (set PHP_SDK_OS_ARCH=arm32 && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="6" (set PHP_SDK_OS_ARCH=ia64 && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="7" (set PHP_SDK_OS_ARCH=alpha64 && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="8" (set PHP_SDK_OS_ARCH=msil && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="9" set PHP_SDK_OS_ARCH=x64
+rem wow64
+if "%PHP_SDK_OS_ARCH_NUM%"=="10" set PHP_SDK_OS_ARCH=x86
+if "%PHP_SDK_OS_ARCH_NUM%"=="11" (set PHP_SDK_OS_ARCH=neutral && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="12" set PHP_SDK_OS_ARCH=arm64
+if "%PHP_SDK_OS_ARCH_NUM%"=="13" (set PHP_SDK_OS_ARCH=arm32 && goto os_arch_error)
+rem woa64
+if "%PHP_SDK_OS_ARCH_NUM%"=="14" set PHP_SDK_OS_ARCH=x86
+if "%PHP_SDK_OS_ARCH%"=="" (
+	goto os_arch_error
+)
+
+set PHP_SDK_OS_ARCH_NUM=
+
+rem cross compile is ok, so we donot need this
+rem if not /i "%PHP_SDK_ARCH%"=="PHP_SDK_OS_ARCH" (
+rem 	echo 32-bit OS detected, native 64-bit toolchain is unavailable.
+rem 	goto out_error
+rem )
 
 rem get vc base dir
 if 15 gtr %PHP_SDK_VS_NUM% (
-	if /i "%PHP_SDK_OS_ARCH%"=="x64" (
+	rem for arch other than x86, use WOW6432
+	if /i not "%PHP_SDK_OS_ARCH%"=="x86" (
 		set TMPKEY=HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\%PHP_SDK_VS:~2%.0\Setup\VC
 	) else (
 		set TMPKEY=HKLM\SOFTWARE\Microsoft\VisualStudio\%PHP_SDK_VS:~2%.0\Setup\VC
@@ -85,16 +118,22 @@ if 15 gtr %PHP_SDK_VS_NUM% (
 	set /a PHP_SDK_VS_RANGE=PHP_SDK_VS_NUM + 1
 	set PHP_SDK_VS_RANGE="[%PHP_SDK_VS_NUM%,!PHP_SDK_VS_RANGE%!)"
 
-	for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version !PHP_SDK_VS_RANGE! -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do (
+	set APPEND=x86.x64
+	if /i "%PHP_SDK_OS_ARCH%"=="arm64" (
+		set APPEND=ARM64
+	)
+	set VS_VERSION_ARGS="-latest"
+	if "%TOOLSET%"=="" set VS_VERSION_ARGS=-version !PHP_SDK_VS_RANGE!
+	for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo !VS_VERSION_ARGS! -requires Microsoft.VisualStudio.Component.VC.Tools.!APPEND! -property installationPath -format text') do (
 		set PHP_SDK_VC_DIR=%%b\VC
 	)
 	if not exist "!PHP_SDK_VC_DIR!" (
-		for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version !PHP_SDK_VS_RANGE! -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do (
+		for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo !VS_VERSION_ARGS! -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.Tools.!APPEND! -property installationPath -format text') do (
 			set PHP_SDK_VC_DIR=%%b\VC
 		)
 		if not exist "!PHP_SDK_VC_DIR!" (
 			rem check for a preview release
-			for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version !PHP_SDK_VS_RANGE! -prerelease -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do (
+			for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo !VS_VERSION_ARGS! -prerelease -requires Microsoft.VisualStudio.Component.VC.Tools.!APPEND! -property installationPath -format text') do (
 				set PHP_SDK_VC_DIR=%%b\VC
 			)
 			if not exist "!PHP_SDK_VC_DIR!" (
@@ -105,13 +144,15 @@ if 15 gtr %PHP_SDK_VS_NUM% (
 	)
 	set VSCMD_ARG_no_logo=nologo
 )
+set APPEND=
 set TMPKEY=
 set PHP_SDK_VS_RANGE=
 
 if 15 gtr %PHP_SDK_VS_NUM% (
 	rem get sdk dir
 	rem if 10.0 is available, it's ok
-	if /i "%PHP_SDK_OS_ARCH%"=="x64" (
+	rem for arch other than x86, use WOW6432
+	if /i not "%PHP_SDK_OS_ARCH%"=="x86" (
 		set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0
 	) else (
 		set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0
@@ -125,7 +166,8 @@ if 15 gtr %PHP_SDK_VS_NUM% (
 	)
 
 	rem Otherwise 8.1 should be available anyway
-	if /i "%PHP_SDK_OS_ARCH%"=="x64" (
+	rem for arch other than x86, use WOW6432
+	if /i not "%PHP_SDK_OS_ARCH%"=="x86" (
 		set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v8.1
 	) else (
 		set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.1
@@ -143,19 +185,39 @@ if 15 gtr %PHP_SDK_VS_NUM% (
 )
 
 if /i "%PHP_SDK_ARCH%"=="x64" (
-	if 15 gtr %PHP_SDK_VS_NUM% (
-		set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\vcvarsall.bat" amd64
-	) else (
-		set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" amd64
-	)
+	set TARGET_ARCH_NAME=amd64
 ) else (
-	if 15 gtr %PHP_SDK_VS_NUM% (
-		set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\vcvarsall.bat" x86
-	) else (
-		set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" x86
-	)
+	set TARGET_ARCH_NAME=%PHP_SDK_ARCH%
 )
 
+if /i "%PHP_SDK_OS_ARCH%"=="x64" (
+	set HOST_ARCH_NAME=amd64
+) else (
+	set HOST_ARCH_NAME=%PHP_SDK_ARCH%
+)
+
+if "%HOST_ARCH_NAME%"=="%TARGET_ARCH_NAME%" (
+	set VCVARSALL_ARCH_NAME=%HOST_ARCH_NAME%
+) else if "%HOST_ARCH_NAME%_%TARGET_ARCH_NAME%"=="amd64_x86" (
+	set VCVARSALL_ARCH_NAME=%TARGET_ARCH_NAME%
+) else (
+	set VCVARSALL_ARCH_NAME=%HOST_ARCH_NAME%_%TARGET_ARCH_NAME%
+)
+if 15 gtr %PHP_SDK_VS_NUM% (
+    if NOT "%TOOLSET%"=="" (
+        set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\vcvarsall.bat" !VCVARSALL_ARCH_NAME! -vcvars_ver=%TOOLSET%
+    ) else (
+        set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\vcvarsall.bat" !VCVARSALL_ARCH_NAME!
+    )
+) else (
+    if NOT "%TOOLSET%"=="" (
+        set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" !VCVARSALL_ARCH_NAME! -vcvars_ver=%TOOLSET%
+    ) else (
+        set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" !VCVARSALL_ARCH_NAME!
+    )
+)
+set VCVARSALL_ARCH_NAME=
+
 rem echo Visual Studio VC path %PHP_SDK_VC_DIR%
 rem echo Windows SDK path %PHP_SDK_WIN_SDK_DIR%
 

doc/phpsdk_pgo_prep_elevated.bat.example

@@ -18,7 +18,7 @@ rem netsh advfirewall set allprofiles state off
 
 rem NGINX
 netsh advfirewall firewall add rule name="NGINX for PGO" dir=in action=allow program="C:\php-snap-build\php-sdk\pgo\work\server\nginx\nginx.exe" profile=private
-for \l %%p in (8081, 1, 8091) do (
+for /l %%p in (8081, 1, 8091) do (
 	netsh advfirewall firewall add rule name="Open Port %%p for PHP PGO" dir=in action=allow protocol=TCP localport=%%p profile=private
 	netsh advfirewall firewall add rule name="Open Port %%p for PHP PGO" dir=in action=allow protocol=UDP localport=%%p profile=private
 )

lib/php/libsdk/SDK/Build/PGO/Abstracts/PHP.php

@@ -130,19 +130,6 @@ abstract class PHP
 		return true;
 	}
 
-	public function is64bit() : bool
-	{
-		$cli = new CLI($this->conf, $this->scenario);
-
-		$out = shell_exec($cli->getExeFilename() . " -n -v");
-
-		if (preg_match(",x64,", $out, $m) > 0) {
-			return true;
-		}
-
-		return false;
-	}
-
 	/* Need to cleanup it somewhere. */
 	public function getIniFilename()
 	{
@@ -153,7 +140,7 @@ abstract class PHP
 			$this->conf->buildTplVarName("php", "error_log") => $this->getRootDir() . DIRECTORY_SEPARATOR . "pgo_run_error.log",
 		);
 
-		$k = $this->is64bit() ? "x64" : "x86";
+		$k = SDKConfig::getCurrentArchName();
 		$scenario_vars = (array)$this->conf->getSectionItem("php", "scenario", $this->scenario, "ini", $k);
 		if ($scenario_vars) {
 			foreach ($scenario_vars as $k => $v) {
@@ -240,7 +227,7 @@ abstract class PHP
 		return $this->getVersion() . "-"
 			. SDKConfig::getCurrentCrtName() . "-"
 			. ($this->isThreadSafe() ? "ts" : "nts") . "-"
-			. ($this->is64bit() ? "x64" : "x86")
+			. SDKConfig::getCurrentArchName()
 			. "-" . substr(md5(uniqid()), 0, 8);
 	}
 }

lib/php/libsdk/SDK/Build/PGO/Server/NGINX.php

@@ -76,7 +76,7 @@ class NGINX extends Abstracts\Server implements Interfaces\Server\HTTP
 		$h = popen("start /b .\\nginx.exe 2>&1", "r");
 		if (!is_resource($h)) {
 			chdir($cwd);
-			throw new Exception("Failed to start MariaDB.");
+			throw new Exception("Failed to start NGINX.");
 		}
 		sleep(3);
 

lib/php/libsdk/SDK/Config.php

@@ -7,10 +7,10 @@ use SDK\Build\Dependency\Fetcher;
 class Config
 {
 	/* Config variables. */
-	protected static $depsHost = 'windows.php.net';
+	protected static $depsHost = 'downloads.php.net';
 	protected static $depsPort = 443;
 	protected static $depsUriScheme = "https";
-	protected static $depsBaseUri = "/downloads/php-sdk/deps";
+	protected static $depsBaseUri = "/~windows/php-sdk/deps";
 
 	/* protected static $sdkNugetFeedUrl = "http://127.0.0.1/sdk/nuget"; */
 
@@ -47,8 +47,8 @@ class Config
 	{/*{{{*/
 		$arch = strtolower($arch);
 
-		if ("x64" != $arch && "x86" != $arch) {
-			throw new Exception("Unknown arch keyword, either x86 or x64 is accepted");
+		if ("x64" != $arch && "x86" != $arch && "arm64" != $arch) {
+			throw new Exception("Unknown arch keyword, x86 or x64 or arm64 is accepted");
 		}
 
 		self::$currentArchName = $arch;
@@ -57,20 +57,26 @@ class Config
 	public static function getCurrentArchName() : string
 	{/*{{{*/
 		if (NULL === self::$currentArchName) {
-			/* XXX this might be not true for other compilers! */
-			passthru("where cl.exe >nul", $status);
-			if ($status) {
-				throw new Exception("Couldn't execute cl.exe.");
-			}
-
-			exec("cl.exe /? 2>&1", $out);
-
-			if (preg_match(",x64,", $out[0])) {
-				self::setCurrentArchName("x64");
-			} elseif (preg_match(",x86,", $out[0])) {
-				self::setCurrentArchName("x86");
+			if (FALSE !== ($env = getenv('PHP_SDK_ARCH'))) {
+				self::setCurrentArchName($env);
 			} else {
-				throw new Exception("Couldn't determine Arch.");
+				/* XXX this might be not true for other compilers! */
+				passthru("where cl.exe >nul", $status);
+				if ($status) {
+					throw new Exception("Couldn't execute cl.exe.");
+				}
+
+				exec("cl.exe /? 2>&1", $out);
+
+				if (preg_match(",x64,", $out[0])) {
+					self::setCurrentArchName("x64");
+				} elseif (preg_match(",x86,", $out[0])) {
+					self::setCurrentArchName("x86");
+				} elseif (preg_match(",arm64,", $out[0])) {
+					self::setCurrentArchName("arm64");
+				} else {
+					throw new Exception("Couldn't determine Arch.");
+				}
 			}
 		}
 
@@ -85,18 +91,22 @@ class Config
 	public static function getCurrentCrtName() : ?string
 	{/*{{{*/
 		if (NULL === self::$currentCrtName) {
-			$all_branches = Config::getKnownBranches();
+			if (FALSE !== ($env = getenv('PHP_SDK_VS'))) {
+				self::setCurrentCrtName($env);
+			} else {
+				$all_branches = Config::getKnownBranches();
 
-			if (!isset($all_branches[Config::getCurrentBranchName()])) {
-				throw new Exception("Couldn't find any configuration for branch '" . Config::getCurrentBranchName() . "'");
+				if (!isset($all_branches[Config::getCurrentBranchName()])) {
+					throw new Exception("Couldn't find any configuration for branch '" . Config::getCurrentBranchName() . "'");
+				}
+
+				$branch = $all_branches[Config::getCurrentBranchName()];
+				if (count($branch) > 1) {
+					throw new Exception("Multiple CRTs are available for this branch, please choose one from " . implode(",", array_keys($branch)));
+				}
+
+				self::setCurrentCrtName(array_keys($branch)[0]);
 			}
-
-			$branch = $all_branches[Config::getCurrentBranchName()];
-			if (count($branch) > 1) {
-				throw new Exception("Multiple CRTs are available for this branch, please choose one from " . implode(",", array_keys($branch)));
-			}
-
-			self::setCurrentCrtName(array_keys($branch)[0]);
 		}
 
 		return self::$currentCrtName;
@@ -138,8 +148,7 @@ class Config
 			$tmp = $fetcher->getByUri(self::$depsBaseUri . "/series/");
 			if (false !== $tmp) {
 				$data = array();
-				if (preg_match_all(",/packages-(.+)-(vc\d+)-(x86|x64)-(stable|staging)\.txt,U", $tmp, $m, PREG_SET_ORDER)
-					|| preg_match_all(",/packages-(.+)-(vs\d+)-(x86|x64)-(stable|staging)\.txt,U", $tmp, $m, PREG_SET_ORDER)) {
+				if (preg_match_all(",packages-(.+)-(v[cs]\d+)-(x86|x64|arm64)-(stable|staging)\.txt,Us", $tmp, $m, PREG_SET_ORDER)) {
 					foreach ($m as $b) {
 						if (!isset($data[$b[1]])) {
 							$data[$b[1]] = array();
@@ -269,7 +278,7 @@ class Config
 				}
 			}
 			if (!$cur_crt_usable) {
-				throw new Exception("The passed CRT '$cur_crt' doesn't match any availbale for branch '$current_branch_name'");
+				throw new Exception("The passed CRT '$cur_crt' doesn't match any available for branch '$current_branch_name'");
 			}
 			$data = $branches[$current_branch_name][$cur_crt];
 		} else {
@@ -277,7 +286,7 @@ class Config
 			$crt = key($branches[$current_branch_name]);
 			$data = $branches[$current_branch_name][$crt];
 			if ($crt != $cur_crt) {
-				throw new Exception("The passed CRT '$cur_crt' doesn't match any availbale for branch '$current_branch_name'");
+				throw new Exception("The passed CRT '$cur_crt' doesn't match any available for branch '$current_branch_name'");
 			}
 		}
 

lib/php/libsdk/SDK/FileOps.php

@@ -137,6 +137,9 @@ retry:
 		curl_setopt($ch, CURLOPT_USERAGENT, Config::getSdkUserAgentName());
 		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
 
+		// workaround for <https://github.com/microsoft/php-sdk-binary-tools/issues/69>
+		curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+
 		$ret = curl_exec($ch);
 
 		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);

pgo/cases/joomla/phpsdk_pgo.json

@@ -1,5 +1,5 @@
 {
-	"joomla_zip_url": "https://github.com/joomla/joomla-cms/releases/download/3.8.11/Joomla_3.8.11-Stable-Full_Package.zip",
+	"joomla_zip_url": "https://github.com/joomla/joomla-cms/releases/download/3.9.13/Joomla_3.9.13-Stable-Full_Package.zip",
 	"type": "web",
 	"srv_http": "nginx",
 	"srv_db": "mariadb"

pgo/cases/pgo01org/TrainingCaseHandler.php

@@ -97,6 +97,18 @@ class TrainingCaseHandler extends Abstracts\TrainingCase implements Interfaces\T
 		$class = preg_replace(",function Faculty,", "function __construct", $class);
 		file_put_contents($fl, $class);
 
+		// patch <https://github.com/intel/php_pgo_training_scripts/pull/4>
+		$fl = $htdocs . DIRECTORY_SEPARATOR . "standard_calls.php";
+		$standard_calls = file_get_contents($fl);
+		$standard_calls = preg_replace(",parse_str\(\\\$var1\),", "parse_str(\$var1, \$dummy)", $standard_calls);
+		file_put_contents($fl, $standard_calls);
+
+		// patch <https://github.com/intel/php_pgo_training_scripts/pull/5>
+		$fl = $htdocs . DIRECTORY_SEPARATOR . "init.php";
+		$standard_calls = file_get_contents($fl);
+		$standard_calls = preg_replace(",^initDB\(\);$,m", "mysqli_report(MYSQLI_REPORT_OFF);\n$0", $standard_calls);
+		file_put_contents($fl, $standard_calls);
+
 		//$php->exec($cmd, NULL, $env);
 		/* TODO check status or switch to cli. */
 		$out = file_get_contents("http://$http_host:$http_port/init.php");

pgo/cases/pgo01org/phpsdk_pgo.json

@@ -1,5 +1,5 @@
 {
-	"pgo01org_zip_url": "https://github.com/01org/php_pgo_training_scripts/archive/master.zip",
+	"pgo01org_zip_url": "https://github.com/intel/php_pgo_training_scripts/archive/master.zip",
 	"type": "web",
 	"srv_http": "nginx",
 	"srv_db": "mariadb"

pgo/cases/symfony_demo/phpsdk_pgo.json

@@ -1,5 +1,5 @@
 {
-	"symfony_phar_url": "https://symfony.com/installer",
+	"symfony_phar_url": "https://get.symfony.com/symfony.phar",
 	"type": "web",
 	"srv_http": "nginx",
 	"srv_db": null

pgo/cases/symfony_demo_pdo_mysql/doctrine.yaml

@@ -21,7 +21,7 @@ doctrine:
         url: '%env(resolve:DATABASE_URL)%'
     orm:
         auto_generate_proxy_classes: '%kernel.debug%'
-        naming_strategy: doctrine.orm.naming_strategy.underscore
+        naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
         auto_mapping: true
         mappings:
             App:

pgo/cases/symfony_demo_pdo_mysql/phpsdk_pgo.json

@@ -1,5 +1,5 @@
 {
-	"symfony_demo_version": "v1.2.5",
+	"symfony_demo_version": "v1.5.1",
 	"type": "web",
 	"srv_http": "nginx",
 	"srv_db": "mariadb"

pgo/cases/wordpress/phpsdk_pgo.json

@@ -1,6 +1,6 @@
 {
-	"wp_cli_phar_url": "https://github.com/wp-cli/wp-cli/releases/download/v2.0.0/wp-cli-2.0.0.phar",
-	"wptest_zip_url": "https://github.com/manovotny/wptest/archive/master.zip",
+	"wp_cli_phar_url": "https://github.com/wp-cli/wp-cli/releases/download/v2.4.0/wp-cli-2.4.0.phar",
+	"wptest_zip_url": "https://github.com/poststatus/wptest/archive/master.zip",
 	"type": "web",
 	"srv_http": "nginx",
 	"srv_db": "mariadb"

pgo/tpl/mariadb/phpsdk_pgo.json

@@ -1,5 +1,5 @@
 {
-	"pkg_url": "https://downloads.mariadb.com/MariaDB/mariadb-5.5.61/win32-packages/mariadb-5.5.61-win32.zip",
+	"pkg_url": "https://downloads.mariadb.com/MariaDB/mariadb-10.3.22/win32-packages/mariadb-10.3.22-win32.zip",
 	"host": "localhost",
 	"port": 3307,
 	"user": "root",

pgo/tpl/nginx/phpsdk_pgo.json

@@ -1,5 +1,5 @@
 {
-	"pkg_url": "http://nginx.org/download/nginx-1.15.2.zip",
+	"pkg_url": "https://nginx.org/download/nginx-1.17.6.zip",
 	"host": "127.0.0.1",
 	"port": 8081
 }

pgo/tpl/php/php-8.0-pgo-nts-cache.ini

@@ -948,7 +948,7 @@ default_socket_timeout = 60
 ;extension=php_bz2.dll
 extension=php_curl.dll
 extension=php_fileinfo.dll
-extension=php_gd2.dll
+extension=php_gd.dll
 extension=php_gettext.dll
 ;extension=php_gmp.dll
 extension=php_intl.dll
@@ -987,7 +987,7 @@ zend_extension=php_opcache.dll
 opcache.memory_consumption=PHP_SDK_PGO_PHP_OPCACHE_MEMORY_CONSUMPTION
 opcache.interned_strings_buffer=PHP_SDK_PGO_PHP_OPCACHE_INTERNED_STRINGS_BUFFER
 opcache.max_accelerated_files=PHP_SDK_PGO_PHP_OPCACHE_MAX_ACCELERATED_FILES
-opcache.jit_buffer_size=PHP_SDK_PGO_PHP_OPCACHE_JIT_BUFFER_SIZE
+;opcache.jit_buffer_size=PHP_SDK_PGO_PHP_OPCACHE_JIT_BUFFER_SIZE
 opcache.revalidate_freq=60
 opcache.fast_shutdown=1
 opcache.enable=1

pgo/tpl/php/php-8.0-pgo-nts.ini

@@ -948,7 +948,7 @@ default_socket_timeout = 60
 ;extension=php_bz2.dll
 extension=php_curl.dll
 extension=php_fileinfo.dll
-extension=php_gd2.dll
+extension=php_gd.dll
 extension=php_gettext.dll
 ;extension=php_gmp.dll
 extension=php_intl.dll

pgo/tpl/php/php-8.0-pgo-ts-cache.ini

@@ -948,7 +948,7 @@ default_socket_timeout = 60
 ;extension=php_bz2.dll
 extension=php_curl.dll
 extension=php_fileinfo.dll
-extension=php_gd2.dll
+extension=php_gd.dll
 extension=php_gettext.dll
 ;extension=php_gmp.dll
 extension=php_intl.dll
@@ -987,7 +987,7 @@ zend_extension=php_opcache.dll
 opcache.memory_consumption=PHP_SDK_PGO_PHP_OPCACHE_MEMORY_CONSUMPTION
 opcache.interned_strings_buffer=PHP_SDK_PGO_PHP_OPCACHE_INTERNED_STRINGS_BUFFER
 opcache.max_accelerated_files=PHP_SDK_PGO_PHP_OPCACHE_MAX_ACCELERATED_FILES
-opcache.jit_buffer_size=PHP_SDK_PGO_PHP_OPCACHE_JIT_BUFFER_SIZE
+;opcache.jit_buffer_size=PHP_SDK_PGO_PHP_OPCACHE_JIT_BUFFER_SIZE
 opcache.revalidate_freq=60
 opcache.fast_shutdown=1
 opcache.enable=1

pgo/tpl/php/php-8.0-pgo-ts.ini

@@ -948,7 +948,7 @@ default_socket_timeout = 60
 ;extension=php_bz2.dll
 extension=php_curl.dll
 extension=php_fileinfo.dll
-extension=php_gd2.dll
+extension=php_gd.dll
 extension=php_gettext.dll
 ;extension=php_gmp.dll
 extension=php_intl.dll

pgo/tpl/php/phpsdk_pgo.json

@@ -14,6 +14,12 @@
 	{
 		"cache": {
 			"ini": {
+				"arm64": {
+					"opcache.memory_consumption": 256,
+					"opcache.interned_strings_buffer": 16,
+					"opcache.max_accelerated_files": 8000,
+					"opcache.jit_buffer_size": "32M"
+				},
 				"x64": {
 					"opcache.memory_consumption": 256,
 					"opcache.interned_strings_buffer": 16,

phpsdk-starter.bat

@@ -14,6 +14,7 @@ set PHP_SDK_ROOT_PATH=%PHP_SDK_ROOT_PATH:~0,-1%
 if /i "%1" equ "-h" goto help
 if /i "%1" equ "-c" set CRT=%2 & shift
 if /i "%1" equ "-a" set ARCH=%2 & shift
+if /i "%1" equ "-s" set TOOLSET=%2 & shift
 if /i "%1" equ "-t" set TASK=%2 & shift
 if /i "%1" equ "--task-args" set TASK_ARGS=%2 & shift
 shift
@@ -37,7 +38,7 @@ set PHP_SDK_RUN_FROM_ROOT=1
 
 title PHP SDK %CRT% %ARCH%
 
-call %PHP_SDK_ROOT_PATH%\bin\phpsdk_setshell.bat %CRT% %ARCH%
+call %PHP_SDK_ROOT_PATH%\bin\phpsdk_setshell.bat %CRT% %ARCH% %TOOLSET%
 
 set PHP_SDK_RUN_FROM_ROOT=
 set CRT=

phpsdk-vs17-x64.bat

@@ -0,0 +1,6 @@
+@echo off
+
+call %~dp0phpsdk-starter.bat -c vs17 -a x64 %*
+
+exit /b %ERRORLEVEL%
+

phpsdk-vs17-x86.bat

@@ -0,0 +1,6 @@
+@echo off
+
+call %~dp0phpsdk-starter.bat -c vs17 -a x86 %*
+
+exit /b %ERRORLEVEL%
+