Add PHP 8.4 configs for PGO

* 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,19 +8,26 @@ 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
 
-- `Visual C++ 2015` or `Visual C++ 2017` must be installed prior SDK usage
-- if `Cygwin` is installed, please read notes in the pitfalls section
-- if a 64-bit build is intended, a 64-bit system is required. Cross compilation of 64-bit on 32-bit system is not supported at the moment
-- The PHP SDK was successfully tested on Windows 7 or later, earlier versions might work but are not recommended
+- A 64-bit build host
+- 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
 
 # Tools
 
-All the tools included are either scripts or 32-bit binaries. They are therefore runable on any of x86 or x64 supported Windows system.
-
 ## SDK
 
 - starter scripts, named phpsdk-<crt>-<arch>.bat
@@ -33,8 +40,8 @@ All the tools included are either scripts or 32-bit binaries. They are therefore
 
 ## Other tools
 
-- `bison` 3.0.5, `re2c` 1.0.3, `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`
@@ -52,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.
 
@@ -60,9 +67,9 @@ 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.0.12` or later
+- `git checkout php-sdk-2.1.9` or later
 - invoke `phpsdk-vc15-x64.bat`
 - `phpsdk_buildtree phpmaster`
 - `git clone https://github.com/php/php-src.git && cd php-src`, or fetch a zipball
@@ -73,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
@@ -115,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`
@@ -138,6 +147,51 @@ After a training case is implemented and put under `pgo/cases`, the work environ
 
 To skip a training case, add a file named `inactive` into the case folder.
 
+# Debugging PHP
+
+This part covers debugging possibilities for the builds produced by the native VS compilers.
+For the cross compiled builds produced with toolsets other than VC++, please check the
+documentation for the corresponding toolsets. In any case, general principles on debugging
+native programs apply.
+
+Either a debug build of PHP or enabled debug symbols are required to be able to debug PHP.
+A debug build is usually more suitable for the development process and can be produced by
+adding `--enable-debug` to the configure options. A release build with debug symbols can
+be produced by adding `--enable-debug-pack`. These options are mutually exclusive.
+
+## Debugging with Visual Studio
+
+- Configure with either `--enable-debug` or `--enable-debug-pack`.
+- A debug build might bring better experience for dev, but sometimes you want to debug a release build.
+- `nmake run ARGS=yourscript.php DEBUGGER=1`, that will open a Visual Studio window.
+- Any additional runtime options for PHP or the script executed go to ARGS, too.
+- Select `Debug -> New Breakpoint -> Function Breakpoint` and add a function where the debugger should break.
+- Click `Start`.
+
+Adding a breakpoint before starting debugging might be not necessary, if a crash is debugged. When such a script runs
+under the debugger, the debugger will stop at the crashing point. In that case, a breakpoint can be added
+around the crashed code directly.
+
+## Debugging test suite with Visual Studio
+
+The [Microsoft Child Process Debugging Power Tool](https://marketplace.visualstudio.com/items?itemName=vsdbgplat.MicrosoftChildProcessDebuggingPowerTool)
+plugin for Visual Studio is required. After installing it, following these steps
+
+- `nmake test TESTS=ext/myext/tests/sometest.phpt DEBUGGER=1`
+- Select `Debug -> Other Debug Targets -> Child Process Debugging Settings` and enable child process debugging.
+- If necessary, add a breakpoint and start debugging as described in the previous section.
+
+## Debugging with WinDbg
+
+PHP can also be debugged with the tools from the WinDbg package. There is currently no way
+implemented in the Makefile to start the WinDbg integrated, so it needs to de done manually.
+Either a debug build or a release build with debug symbols is still required, as described
+previously.
+
+# Support
+
+- Join `#winphp-dev` on Freenode to discuss any ideas or questions
+- File an issue on GitHub
 
 # Pitfalls
 
@@ -147,8 +201,8 @@ To skip a training case, add a file named `inactive` into the case folder.
 - 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.
-
-
+- `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.

VERSION

@@ -1 +1 @@
-2.1.7beta1
+2.2.1-dev

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

@@ -10,22 +10,27 @@ rem otherwise - retain the old behavior, create structs for all the known build
 cmd /c "exit /b 0"
 
 if "%PHP_SDK_ARCH%" NEQ "" (
-	if "%PHP_SDK_VC%" NEQ "" (
-		MD %_%\%PHP_SDK_VC%\%PHP_SDK_ARCH%\deps\bin
-		MD %_%\%PHP_SDK_VC%\%PHP_SDK_ARCH%\deps\lib
-		MD %_%\%PHP_SDK_VC%\%PHP_SDK_ARCH%\deps\include
-		cd %_%\%PHP_SDK_VC%\%PHP_SDK_ARCH%
+	if "%PHP_SDK_VS%" NEQ "" (
+		MD %_%\%PHP_SDK_VS%\%PHP_SDK_ARCH%\deps\bin
+		MD %_%\%PHP_SDK_VS%\%PHP_SDK_ARCH%\deps\lib
+		MD %_%\%PHP_SDK_VS%\%PHP_SDK_ARCH%\deps\include
+		cd %_%\%PHP_SDK_VS%\%PHP_SDK_ARCH%
 		goto exit
 	)
 	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

@@ -1,6 +1,6 @@
 <?php
 
-include dirname(__FILE__) . "/../lib/php/autoload.php";
+include __DIR__ . "/../lib/php/autoload.php";
 
 use SDK\{Config, Exception};
 
@@ -36,7 +36,7 @@ try {
 		switch ($name) {
 			default:
 				throw new Exception("Unknown switch '$name'");
-			break;
+				break;
 
 			case "h":
 			case "help":
@@ -126,17 +126,9 @@ try {
 		usage(3);
 	}
 	/* The current CRT needs to match the config one. */
-	$active_crt = getenv("PHP_SDK_VC");
+	$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() . "'.");
-	}
-
-	if (NULL === Config::getCurrentStabilityName()) {
-		if ("master" == Config::getCurrentBranchName()) {
-			Config::setCurrentStabilityName("staging");
-		} else {
-			Config::setCurrentStabilityName("stable");
-		}
+		throw new Exception("Active CRT name '$active_crt' differs from the branch CRT name '" . Config::getCurrentCrtName() . "'.");
 	}
 
 	$branch_data = Config::getCurrentBranchData();
@@ -188,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_dllmap.php

@@ -29,10 +29,10 @@ $flags = 0;
 $opt = getopt($sopt, $lopt);
 foreach ($opt as $name => $val) {
 	switch ($name) {
-			case "p":
-			case "pretty":
-				$flags = JSON_PRETTY_PRINT;
-				break;
+		case "p":
+		case "pretty":
+			$flags = JSON_PRETTY_PRINT;
+			break;
 	}
 }
 
@@ -85,16 +85,16 @@ foreach ($dirs as $path) {
 
 		$dlls = array();
 
-		for( $i = 0; $i < $zip->numFiles; $i++ ){
-			$stat = $zip->statIndex( $i );
-			
+		for ($i = 0; $i < $zip->numFiles; $i++) {
+			$stat = $zip->statIndex($i);
+
 			if (substr($stat['name'], -3) != "dll") {
 				continue;
 			}
 
 			$dlls[] = basename($stat['name']);
 		} 
-		
+
 		$zip->close();
 		unset($zip);
 

bin/phpsdk_dumpenv.bat

@@ -12,19 +12,9 @@ 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 Visual C++:         %PHP_SDK_VC_NUM%
+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_pgo.bat

@@ -1,14 +1,14 @@
-@echo off
-
-if "%PHP_SDK_PHP_CMD%"=="" (
-	call %~dp0phpsdk_setvars.bat
-	if "!PHP_SDK_PHP_CMD!"=="" (
-		echo PHP SDK is not setup
-		exit /b 3
-	)
-)
-
-cmd /c %PHP_SDK_PHP_CMD% %PHP_SDK_BIN_PATH%\phpsdk_pgo.php %*
-
-exit /b %errorlevel%
-
+@echo off
+
+if "%PHP_SDK_PHP_CMD%"=="" (
+	call %~dp0phpsdk_setvars.bat
+	if "!PHP_SDK_PHP_CMD!"=="" (
+		echo PHP SDK is not setup
+		exit /b 3
+	)
+)
+
+cmd /c %PHP_SDK_PHP_CMD% %PHP_SDK_BIN_PATH%\phpsdk_pgo.php %*
+
+exit /b %errorlevel%
+

bin/phpsdk_pgo.php

@@ -1,6 +1,6 @@
 <?php
 
-include dirname(__FILE__) . "/../lib/php/autoload.php";
+include __DIR__ . "/../lib/php/autoload.php";
 
 use SDK\Config;
 use SDK\Exception;
@@ -21,43 +21,42 @@ try {
 	$opt = getopt($sopt, $lopt);
 	foreach ($opt as $name => $val) {
 		switch ($name) {
-		case "i":
-		case "init":
-			$cmd = "init";
-			break;
-		case "ready":
-			$cmd = "check_init";
-			break;
-		case "t":
-		case "train":
-			$cmd = "train";
-			break;
-		case "u":
-		case "up":
-			$cmd = "up";
-			break;
-		case "d":
-		case "down":
-			$cmd = "down";
-			break;
-		case "s":
-		case "scenario":
-			$scenario = $val;
-			break;
-		case "f":
-		case "force":
-			$force = true;
-			break;
-			/* XXX This option is for now only integrated for training. It
-				would make sense to integrate it also with init. */
-		case "c":
-		case "cases":
-			$cases = explode(",", $val);
-			break;
-		case "h": case "help":
-			usage(0);
-			break;
-
+			case "i":
+			case "init":
+				$cmd = "init";
+				break;
+			case "ready":
+				$cmd = "check_init";
+				break;
+			case "t":
+			case "train":
+				$cmd = "train";
+				break;
+			case "u":
+			case "up":
+				$cmd = "up";
+				break;
+			case "d":
+			case "down":
+				$cmd = "down";
+				break;
+			case "s":
+			case "scenario":
+				$scenario = $val;
+				break;
+			case "f":
+			case "force":
+				$force = true;
+				break;
+				/* XXX This option is for now only integrated for training. It
+					would make sense to integrate it also with init. */
+			case "c":
+			case "cases":
+				$cases = explode(",", $val);
+				break;
+			case "h": case "help":
+				usage(0);
+				break;
 		}
 	}
 

bin/phpsdk_rebase_msys2.cmd

@@ -0,0 +1,40 @@
+@echo off
+
+setlocal enableextensions enabledelayedexpansion
+
+set PHPSDK_MSYS2_BASE_ADDR=0x100400000
+set PHPSDK_MSYS2_BASE_DYNAMIC=0
+
+:getopt
+if /i "%1" equ "--help" goto help
+if /i "%1" equ "--addr" (
+	set PHPSDK_MSYS2_BASE_ADDR=%2 & shift
+	for /l %%a in (1,1,100) do if "!PHPSDK_MSYS2_BASE_ADDR:~-1!"==" " set PHPSDK_MSYS2_BASE_ADDR=!PHPSDK_MSYS2_BASE_ADDR:~0,-1!
+)
+shift
+if /i "%1" equ "--dynamic" (
+	set PHPSDK_MSYS2_BASE_DYNAMIC=1
+	shift
+)
+if not (%1)==() goto getopt
+
+IF "1" EQU "%PHPSDK_MSYS2_BASE_DYNAMIC%" (
+	echo Rebasing MSYS2 DLLs to load at a dynamic address
+	editbin /NOLOGO /DYNAMICBASE %PHP_SDK_ROOT_PATH%\msys2\usr\bin\*.dll
+) else (
+	echo Rebasing MSYS2 DLLs to load at %PHPSDK_MSYS2_BASE_ADDR%
+	editbin /NOLOGO /REBASE:BASE=%PHPSDK_MSYS2_BASE_ADDR%,DOWN %PHP_SDK_ROOT_PATH%\msys2\usr\bin\*.dll
+)
+
+set PHPSDK_MSYS2_BASE_ADDR=
+set PHPSDK_MSYS2_BASE_DYNAMIC=
+
+GOTO EXIT
+
+:help
+echo phpsdk_rebase_msys2 ^<address^>
+echo Rebase MSYS2 DLLs to the given address. If ommited, default is 0x100400000.
+
+:EXIT
+exit /b %errorlevel%
+

bin/phpsdk_setshell.bat

@@ -15,91 +15,144 @@ if "%2"=="" goto :help
 
 cmd /c "exit /b 0"
 
-set PHP_SDK_VC=%1
-if /i not "%PHP_SDK_VC:~0,2%"=="vc" (
+set PHP_SDK_VS=%1
+if /i not "%PHP_SDK_VS:~0,2%"=="vc" (
+	if /i not "%PHP_SDK_VS:~0,2%"=="vs" (
 :malformed_vc_string
-	echo Malformed CRT string "%1"
-	set PHP_SDK_VC=
-	goto out_error
+		echo Malformed CRT string "%1"
+		set PHP_SDK_VS=
+		goto out_error
+	)
 )
-if ""=="%PHP_SDK_VC:~2%" (
+if ""=="%PHP_SDK_VS:~2%" (
 	goto malformed_vc_string
 )
-set /a TMP_CHK=%PHP_SDK_VC:~2%
+set /a TMP_CHK=%PHP_SDK_VS:~2%
 if 14 gtr %TMP_CHK% (
 	if "0"=="%TMP_CHK%" (
-		if not "0"=="%PHP_SDK_VC:~2%" (
+		if not "0"=="%PHP_SDK_VS:~2%" (
 			set TMP_CHK=
 			goto malformed_vc_string
 		)
 	)
 
 	echo At least vc14 is required
-	set PHP_SDK_VC=
+	set PHP_SDK_VS=
 	set TMP_CHK=
 	goto out_error
 )
-set PHP_SDK_VC_NUM=%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_VC_NUM% (
-	if /i "%PHP_SDK_OS_ARCH%"=="x64" (
-		set TMPKEY=HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\%PHP_SDK_VC:~2%.0\Setup\VC
+if 15 gtr %PHP_SDK_VS_NUM% (
+	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_VC:~2%.0\Setup\VC
+		set TMPKEY=HKLM\SOFTWARE\Microsoft\VisualStudio\%PHP_SDK_VS:~2%.0\Setup\VC
 	)
 	reg query !TMPKEY! /v ProductDir >nul 2>&1
 	if errorlevel 1 (
-		echo Couldn't determine VC%PHP_SDK_VC:~2% directory
+		echo Couldn't determine VC%PHP_SDK_VS:~2% directory
 		goto out_error;
 	)
 	for /f "tokens=2*" %%a in ('reg query !TMPKEY! /v ProductDir') do set PHP_SDK_VC_DIR=%%b
 ) else (
-	rem vc15 support only for now, could parse out and pass on later
-	for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version %PHP_SDK_VC_NUM% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC
+	rem build the version range, e.g. "[15,16)"
+	set /a PHP_SDK_VS_RANGE=PHP_SDK_VS_NUM + 1
+	set PHP_SDK_VS_RANGE="[%PHP_SDK_VS_NUM%,!PHP_SDK_VS_RANGE%!)"
+
+	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_VC_NUM% -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC
+		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_VC_NUM% -prerelease -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC
+			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!" (
-				echo Could not determine '%PHP_SDK_VC%' directory
+				echo Could not determine '%PHP_SDK_VS%' directory
 				goto out_error;
 			)
 		)
 	)
 	set VSCMD_ARG_no_logo=nologo
 )
+set APPEND=
 set TMPKEY=
+set PHP_SDK_VS_RANGE=
 
-if 15 gtr %PHP_SDK_VC_NUM% (
+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
@@ -113,7 +166,8 @@ if 15 gtr %PHP_SDK_VC_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
@@ -131,20 +185,40 @@ if 15 gtr %PHP_SDK_VC_NUM% (
 )
 
 if /i "%PHP_SDK_ARCH%"=="x64" (
-	if 15 gtr %PHP_SDK_VC_NUM% (
-		set PHP_SDK_VC_SHELL_CMD="!PHP_SDK_VC_DIR!\vcvarsall.bat" amd64
-	) else (
-		set PHP_SDK_VC_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" amd64
-	)
+	set TARGET_ARCH_NAME=amd64
 ) else (
-	if 15 gtr %PHP_SDK_VC_NUM% (
-		set PHP_SDK_VC_SHELL_CMD="!PHP_SDK_VC_DIR!\vcvarsall.bat" x86
-	) else (
-		set PHP_SDK_VC_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" x86
-	)
+	set TARGET_ARCH_NAME=%PHP_SDK_ARCH%
 )
 
-rem echo Visual Studio path %PHP_SDK_VC_DIR%
+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%
 
 

bin/phpsdk_setvars.bat

@@ -17,5 +17,12 @@ set PHP_SDK_PHP_CMD=%PHP_SDK_BIN_PATH%\php\do_php.bat
 
 set PATH=%PHP_SDK_BIN_PATH%;%PHP_SDK_MSYS2_PATH%;%PATH%
 
+for /f "tokens=1* delims=: " %%a in ('link /?') do ( 
+	set PHP_SDK_VC_TOOLSET_VER=%%b
+	goto break0
+)
+:break0
+set PHP_SDK_VC_TOOLSET_VER=%PHP_SDK_VC_TOOLSET_VER:~-13%
+
 exit /b %errorlevel%
 

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
 )

doc/task.c

@@ -1,72 +1,72 @@
-/**
- * Run the passed command line hidden, suitable for a scheduled task.
- * Author: Anatol Belski <ab@php.net>
- * License: BSD 2-Clause
- */
-
-#include <windows.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#define CMD_PRE "cmd.exe /c "
-#define CMD_PRE_LEN (sizeof(CMD_PRE)-1)
-
-#ifdef DEBUG
-int
-main(int argc, char **argv)
-#else
-int
-APIENTRY WinMain(HINSTANCE inst, HINSTANCE prev_inst, LPTSTR in_cmd, int show)
-#endif
-{
-	STARTUPINFO si;
-	PROCESS_INFORMATION pi;
-	DWORD exit_code;
-
-	char *cmd = NULL;
-	size_t cmd_len = 0, arg_len = 0;
-	char *arg = strchr(GetCommandLine(), ' ');
-
-	if (!arg) {
-		return 3;
-	}
-#ifdef DEBUG
-	printf("passed cmd: '%s'\n", arg);
-#endif
-
-	arg_len = strlen(arg);
-	cmd_len = CMD_PRE_LEN + arg_len + 1;
-
-	cmd = malloc(cmd_len * sizeof(char));
-	memmove(cmd, CMD_PRE, CMD_PRE_LEN);
-	memmove(cmd + CMD_PRE_LEN, arg, arg_len);
-	cmd[cmd_len-1] = '\0';
-#ifdef DEBUG
-	printf("constructed cmd: '%s'\n", cmd);
-#endif
-
-	ZeroMemory( &si, sizeof(si) );
-	si.cb = sizeof(si);
-	si.dwFlags = STARTF_USESHOWWINDOW;
-	si.wShowWindow = SW_HIDE;
-	ZeroMemory( &pi, sizeof(pi) );
-
-	if (CreateProcess(NULL, cmd, NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi)) {
-		CloseHandle( pi.hThread );
-	} else {
-		free(cmd);
-		printf( "Error: CreatePracess 0x%08lx \n", GetLastError() );
-		return 3;
-	}
-
-	WaitForSingleObject( pi.hProcess, INFINITE );
-
-	GetExitCodeProcess(pi.hProcess, &exit_code);
-
-	CloseHandle( pi.hProcess );
-
-	free(cmd);
-
-	return exit_code;
-}
-
+/**
+ * Run the passed command line hidden, suitable for a scheduled task.
+ * Author: Anatol Belski <ab@php.net>
+ * License: BSD 2-Clause
+ */
+
+#include <windows.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define CMD_PRE "cmd.exe /c "
+#define CMD_PRE_LEN (sizeof(CMD_PRE)-1)
+
+#ifdef DEBUG
+int
+main(int argc, char **argv)
+#else
+int
+APIENTRY WinMain(HINSTANCE inst, HINSTANCE prev_inst, LPTSTR in_cmd, int show)
+#endif
+{
+	STARTUPINFO si;
+	PROCESS_INFORMATION pi;
+	DWORD exit_code;
+
+	char *cmd = NULL;
+	size_t cmd_len = 0, arg_len = 0;
+	char *arg = strchr(GetCommandLine(), ' ');
+
+	if (!arg) {
+		return 3;
+	}
+#ifdef DEBUG
+	printf("passed cmd: '%s'\n", arg);
+#endif
+
+	arg_len = strlen(arg);
+	cmd_len = CMD_PRE_LEN + arg_len + 1;
+
+	cmd = malloc(cmd_len * sizeof(char));
+	memmove(cmd, CMD_PRE, CMD_PRE_LEN);
+	memmove(cmd + CMD_PRE_LEN, arg, arg_len);
+	cmd[cmd_len-1] = '\0';
+#ifdef DEBUG
+	printf("constructed cmd: '%s'\n", cmd);
+#endif
+
+	ZeroMemory( &si, sizeof(si) );
+	si.cb = sizeof(si);
+	si.dwFlags = STARTF_USESHOWWINDOW;
+	si.wShowWindow = SW_HIDE;
+	ZeroMemory( &pi, sizeof(pi) );
+
+	if (CreateProcess(NULL, cmd, NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi)) {
+		CloseHandle( pi.hThread );
+	} else {
+		free(cmd);
+		printf( "Error: CreatePracess 0x%08lx \n", GetLastError() );
+		return 3;
+	}
+
+	WaitForSingleObject( pi.hProcess, INFINITE );
+
+	GetExitCodeProcess(pi.hProcess, &exit_code);
+
+	CloseHandle( pi.hProcess );
+
+	free(cmd);
+
+	return exit_code;
+}
+

lib/php/autoload.php

@@ -1,7 +1,7 @@
 <?php
 
 spl_autoload_register(function($name) {
-	$fl = dirname(__FILE__) . DIRECTORY_SEPARATOR . "libsdk" . DIRECTORY_SEPARATOR . $name . ".php";
+	$fl = __DIR__ . DIRECTORY_SEPARATOR . "libsdk" . DIRECTORY_SEPARATOR . $name . ".php";
 
 	if (file_exists($fl)) {
 		require_once $fl;

lib/php/libsdk/SDK/Build/Dependency/Fetcher.php

@@ -2,7 +2,7 @@
 
 namespace SDK\Build\Dependency;
 
-use SDK\{Config, Exception, FileOps};
+use SDK\{Exception, FileOps};
 
 class Fetcher
 {
@@ -13,6 +13,7 @@ class Fetcher
 	protected $stability;
 	protected $arch;
 	protected $series;
+	protected $scheme;
 
 
 	public function __construct(string $host, int $port, string $scheme = "https", string $arch = NULL, string $stability = NULL, Series $series = NULL)
@@ -22,6 +23,7 @@ class Fetcher
 		$this->host = $host;
 		$this->port = $port;
 		$this->scheme = $scheme;
+		$this->series = $series;
 	}/*}}}*/
 
 	public function getSeries() : Series

lib/php/libsdk/SDK/Build/Dependency/Manager.php

@@ -11,6 +11,7 @@ class Manager
 	protected $stability;
 	protected $arch;
 	protected $path;
+	protected $cache;
 	protected $series;
 	protected $fetcher;
 	protected $updatesFlag = NULL;
@@ -41,7 +42,7 @@ class Manager
 
 	public function updatesAvailable() : bool
 	{/*{{{*/
-		if (!is_null($this->updatesFlag)) {
+		if (NULL !== $this->updatesFlag) {
 			return $this->updatesFlag;
 		}
 

lib/php/libsdk/SDK/Build/Dependency/Series.php

@@ -44,7 +44,6 @@ class Series
 
 	public function getName() : string
 	{/*{{{*/
-		$base = Config::getDepsBaseUri();
 		$branch_data = Config::getCurrentBranchData();
 
 		$file = "packages-" . Config::getCurrentBranchName() . "-{$branch_data['crt']}-{$this->arch}-{$this->stability}.txt";

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

@@ -2,15 +2,17 @@
 
 namespace SDK\Build\PGO\Abstracts;
 
-use SDK\Build\PGO\Interfaces\Server;
 use SDK\Build\PGO\PHP\CLI;
-use SDK\Build\PGO\Config as PGOConfig;
-use SDK\{Config as SDKConfig, Exception, FileOps};
+use SDK\{Config as SDKConfig, Exception};
 
 abstract class PHP
 {
 	protected $php_root;
 	protected $php_ext_root;
+	protected $opcache_file_cache;
+	protected $id;
+	protected $scenario;
+	protected $conf;
 
 	protected function setupPaths()
 	{
@@ -23,6 +25,9 @@ abstract class PHP
 		} else {
 			$this->php_ext_root = $this->php_root;
 		}
+		if ("cache" == $this->scenario) {
+			$this->opcache_file_cache = SDKConfig::getTmpDir() . DIRECTORY_SEPARATOR . $this->id;
+		}
 	}
 
 	/* TODO Might be improved. */
@@ -39,12 +44,22 @@ abstract class PHP
 			$deps_root = SDKConfig::getDepsLocalPath();
 			foreach ($env as $k => $v) {
 				if (strtoupper($k) == "PATH") {
-					$env[$k] = "$deps_root" . DIRECTORY_SEPARATOR . "bin;" . $env[$k];
+					$env[$k] = $deps_root . DIRECTORY_SEPARATOR . "bin;" . $env[$k];
 					break;
 				}
 			}
 		}
 
+		$drive = getenv("HOMEDRIVE");
+		$path = getenv("HOMEPATH");
+		if (!$drive || !$path) {
+			$p = SDKConfig::getTmpDir();
+			$drive = substr($p, 0, 2);
+			$path = substr($p, 2);
+			putenv("HOMEDRIVE=$drive");
+			putenv("HOMEPATH=$path");
+		}
+
 		return $env;
 	}
 
@@ -95,7 +110,7 @@ abstract class PHP
 			}
 		}
 
-		if (is_null($ret)) {
+		if (NULL === $ret) {
 			throw new Exception("Failed to determine the test PHP version.");
 		}
 
@@ -115,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()
 	{
@@ -138,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) {
@@ -147,6 +149,11 @@ abstract class PHP
 			}
 		}
 
+		/* Special handling, otherwise it'll need functionality to extrapolate ini values. */
+		if ("cache" == $this->scenario) {
+			$tpl_vars[$this->conf->buildTplVarName("php", "opcache", "file_cache")] = $this->opcache_file_cache;
+		}
+
 		$this->conf->processTplFile(
 			$this->getIniTplFilename(),
 			$ret,
@@ -174,8 +181,8 @@ abstract class PHP
 	public function exec(string $php_cmd, string $args = NULL, array $extra_env = array()) : int
 	{
 		$env = $this->createEnv();
-		$exe  = $this->getExeFilename();
-		$ini  = $this->getIniFilename();
+		$exe = $this->getExeFilename();
+		$ini = $this->getIniFilename();
 
 		$cert_path = getenv("PHP_SDK_ROOT_PATH") . "\\msys2\\usr\\ssl\\cert.pem";
 		$ini .= " -d curl.cainfo=$cert_path";
@@ -203,7 +210,7 @@ abstract class PHP
 			$env[$k] = $v;
 		}
 
-		$cmd = "$exe -n -c $ini " . ($args ? "$args " : "") . "$php_cmd";
+		$cmd = "$exe -n -c $ini " . ($args ? "$args " : "") . $php_cmd;
 
 		$desc = array(
 			0 => array("file", "php://stdin", "r"),
@@ -214,5 +221,13 @@ abstract class PHP
 
 		return proc_close($p);
 	}
-}
 
+	public function getIdString(): string
+	{
+		return $this->getVersion() . "-"
+			. SDKConfig::getCurrentCrtName() . "-"
+			. ($this->isThreadSafe() ? "ts" : "nts") . "-"
+			. SDKConfig::getCurrentArchName()
+			. "-" . substr(md5(uniqid()), 0, 8);
+	}
+}

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

@@ -4,7 +4,7 @@ namespace SDK\Build\PGO\Abstracts;
 
 use SDK\Build\PGO\Interfaces;
 
-class Server
+abstract class Server
 {
 	public function getName() : string
 	{
@@ -17,6 +17,3 @@ class Server
 	}
 
 }
-
-
-

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

@@ -2,11 +2,10 @@
 
 namespace SDK\Build\PGO\Abstracts;
 
-use SDK\Build\PGO\Config as PGOConfig;
-use SDK\{Config as SDKConfig, Exception, FileOps};
+use SDK\FileOps;
 use SDK\Build\PGO\Tool;
 
-class TrainingCase
+abstract class TrainingCase
 {
 	use FileOps;
 
@@ -14,6 +13,8 @@ class TrainingCase
 	const TYPE_CLI = "cli";
 
 	protected $stat = array();
+	/** @var \SDK\Build\PGO\Config */
+	protected $conf;
 
 	public function getType() : string
 	{
@@ -148,4 +149,3 @@ class TrainingCase
 		return $ret;
 	}
 }
-

lib/php/libsdk/SDK/Build/PGO/Config.php

@@ -2,7 +2,7 @@
 
 namespace SDK\Build\PGO;
 
-use SDK\{Config as SDKConfig, Exception};
+use SDK\Exception;
 
 class Config
 {
@@ -18,7 +18,7 @@ class Config
 	protected $tpl_vars = array();
 	protected $srv = array();
 
-	public function __construct(int $mode = MODE_RUN)
+	public function __construct(int $mode = self::MODE_RUN)
 	{
 		if (self::MODE_CHECK_INIT == $mode) {
 			// XXX The check is simple right now, so this is sufficient. 
@@ -40,7 +40,6 @@ class Config
 		$this->mode = $mode;
 
 
-		$base = getenv("PHP_SDK_ROOT_PATH");
 		if (self::MODE_INIT == $mode) {
 			foreach (array("nginx", "mariadb", "postgresql", "php") as $i) {
 				$this->importSectionFromDir($i, $this->getTplDir() . DIRECTORY_SEPARATOR . $i);
@@ -279,7 +278,7 @@ class Config
 	public function processTplFile(string $tpl_fn, string $dst_fn, array $additional_vars = array()) : void
 	{
 		if (!file_exists($tpl_fn)) {
-			throw new Exception("Template file '$fn' doesn't exist.");
+			throw new Exception("Template file '$tpl_fn' doesn't exist.");
 		}
 
 		$s = file_get_contents($tpl_fn);	
@@ -368,4 +367,3 @@ class Config
 		return $ret;
 	}
 }
-

lib/php/libsdk/SDK/Build/PGO/Controller.php

@@ -2,13 +2,12 @@
 
 namespace SDK\Build\PGO;
 
-use SDK\{Config as SDKConfig, Exception, Lock};
+use SDK\{Exception, Lock};
 use SDK\Build\PGO\Config as PGOConfig;
 use SDK\Build\PGO\Server\{MariaDB, NGINX, PostgreSQL};
 use SDK\Build\PGO\PHP;
 use SDK\Build\PGO\Tool\{PGO, PackageWorkman};
-use SDK\Build\PGO\Interfaces\TrainingCase;
-use SDK\Build\PGO\TrainingCaseIterator;
+
 
 /* TODO add bench action */
 
@@ -79,38 +78,38 @@ class Controller
 		$this->conf = $this->setupConfig($this->cmd);
 
 		switch ($this->cmd) {
-		default:
-			throw new Exception("Unknown action '{$this->cmd}'.");
-			break;
-		case "init":
-			$lk = new Lock("pgo_init");
-			if (!$lk->locked()) {
-				echo "Another process runs initialization right now, waiting.", PHP_EOL;
-				$lk->exclusive(true);
-				echo "Another process finished running initialization, I quit as well.", PHP_EOL;
-				return;
-			}
-			$this->init($force);
-			break;
-		case "train":
-			$lk = new Lock("pgo_train");
-			if (!$lk->locked()) {
-				echo "Another process runs training right now, I have to wait.", PHP_EOL;
-				$lk->exclusive(true);
-				echo "Another process finished training, I may continue.", PHP_EOL;
-			}
-			$this->train();
-			break;
-		case "up":
-			$this->up();
-			break;
+			default:
+				throw new Exception("Unknown action '{$this->cmd}'.");
+				break;
+			case "init":
+				$lk = new Lock("pgo_init");
+				if (!$lk->locked()) {
+					echo "Another process runs initialization right now, waiting.", PHP_EOL;
+					$lk->exclusive(true);
+					echo "Another process finished running initialization, I quit as well.", PHP_EOL;
+					return;
+				}
+				$this->init($force);
+				break;
+			case "train":
+				$lk = new Lock("pgo_train");
+				if (!$lk->locked()) {
+					echo "Another process runs training right now, I have to wait.", PHP_EOL;
+					$lk->exclusive(true);
+					echo "Another process finished training, I may continue.", PHP_EOL;
+				}
+				$this->train();
+				break;
+			case "up":
+				$this->up();
+				break;
 
-		case "down":
-			$this->down($force);
-			break;
-		case "check_init":
-			// pass
-			break;
+			case "down":
+				$this->down($force);
+				break;
+			case "check_init":
+				// pass
+				break;
 		}
 	}
 
@@ -141,6 +140,7 @@ class Controller
 		if (!file_exists($composer) || $force) {
 			/* XXX this needs to go into the config, specifically for composer maybe even separate class. */
 			$url = "https://getcomposer.org/installer";
+			/* XXX remove the explicit version option when symfony demo is fixed. */
 			$tool = $this->conf->getToolsDir() . DIRECTORY_SEPARATOR . "composer-setup.php";
 			$pw->fetch($url, $tool, $force);
 			$php->exec("$tool --install-dir=" . $this->conf->getToolsDir());

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

@@ -2,7 +2,6 @@
 
 namespace SDK\Build\PGO\Interfaces;
 
-use SDK\Build\PGO\Config;
 use SDK\Build\PGO\Tool\PackageWorkman;
 
 interface PHP
@@ -15,4 +14,3 @@ interface PHP
 	public function getVersion(bool $short = false) : string;
 	public function getExeFilename() : string;
 }
-

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

@@ -2,7 +2,6 @@
 
 namespace SDK\Build\PGO\Interfaces;
 
-use SDK\Build\PGO\Config;
 use SDK\Build\PGO\Tool\PackageWorkman;
 
 interface Server
@@ -14,4 +13,3 @@ interface Server
 	public function down(bool $force = false) : void;
 	public function getName() : string;
 }
-

lib/php/libsdk/SDK/Build/PGO/Interfaces/Server/DB.php

@@ -10,4 +10,3 @@ interface DB extends Interfaces\Server
 	public function __construct(Config $conf);
 	public function query(string $s, string $db = NULL) : void;
 }
-

lib/php/libsdk/SDK/Build/PGO/Interfaces/Server/HTTP.php

@@ -11,4 +11,3 @@ interface HTTP extends Interfaces\Server
 	public function getPhp() : Interfaces\PHP;
 	public function addServer(string $part_tpl_fn, array $tpl_vars = array());
 }
-

lib/php/libsdk/SDK/Build/PGO/Interfaces/TrainingCase.php

@@ -25,4 +25,3 @@ interface TrainingCase
 	/* Get training type, it's like "web", "cli", etc.*/
 	public function getType() : string;
 }
-

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

@@ -5,17 +5,19 @@ namespace SDK\Build\PGO\PHP;
 use SDK\Build\PGO\Interfaces;
 use SDK\Build\PGO\Abstracts;
 use SDK\Build\PGO\Config as PGOConfig;
-use SDK\{Config as SDKConfig, Exception, FileOps};
+use SDK\{Exception};
 use SDK\Build\PGO\Tool\PackageWorkman;
 
 class CLI extends Abstracts\PHP implements Interfaces\PHP
 {
-	protected $conf;
-
 	public function __construct(PGOConfig $conf)
 	{
 		$this->conf = $conf;
 		$this->scenario = $conf->getScenario();
+		// Don't do that, it'll be a recursive dependency. 
+		// Once we need to train CLI, we'll need to split
+		// a new class, this one is a utility class.
+		//$this->id = $this->getIdString();
 
 		$this->setupPaths();
 	}
@@ -50,7 +52,4 @@ class CLI extends Abstracts\PHP implements Interfaces\PHP
 
 		return $exe;
 	}
-
-
 }
-

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

@@ -5,12 +5,13 @@ namespace SDK\Build\PGO\PHP;
 use SDK\Build\PGO\Interfaces;
 use SDK\Build\PGO\Abstracts;
 use SDK\Build\PGO\Config as PGOConfig;
-use SDK\{Config as SDKConfig, Exception, FileOps};
+use SDK\{Exception, FileOps};
 use SDK\Build\PGO\Tool\PackageWorkman;
 
 class FCGI extends Abstracts\PHP implements Interfaces\PHP
 {
-	protected $conf;
+	use FileOps;
+
 	protected $is_tcp;
 
 	public function __construct(PGOConfig $conf, bool $is_tcp)
@@ -22,6 +23,7 @@ class FCGI extends Abstracts\PHP implements Interfaces\PHP
 		$this->conf = $conf;
 		$this->is_tcp = $is_tcp;
 		$this->scenario = $conf->getScenario();
+		$this->id = $this->getIdString();
 
 		$this->setupPaths();
 	}
@@ -64,6 +66,15 @@ echo "PHP FCGI initialization done.\n";*/
 	{
 		echo "Starting PHP FCGI.\n";
 
+		if ("cache" == $this->scenario) {
+			if (file_exists($this->opcache_file_cache)) {
+				$this->rm($this->opcache_file_cache);
+			}
+			if (!mkdir($this->opcache_file_cache)) {
+				throw new Exception("Failed to create '{$this->opcache_file_cache}'");
+			}
+		}
+
 		$exe  = $this->getExeFilename();
 		$ini  = $this->getIniFilename();
 		$host = $this->conf->getSectionItem("php", "fcgi", "host");
@@ -82,6 +93,10 @@ echo "PHP FCGI initialization done.\n";*/
 		/* Give some time, it might be slow on PGI enabled proc. */
 		sleep(3);
 
+		/*while(false !== ($s = fread($pipes[2], 1024))) {
+			echo "$s";
+		}*/
+
 		$c = proc_close($p);
 
 		if ($c) {
@@ -99,7 +114,15 @@ echo "PHP FCGI initialization done.\n";*/
 
 		exec("taskkill /f /im php-cgi.exe >nul 2>&1");
 
+		/* XXX Add cleanup interface. */
+		if ("cache" == $this->scenario) {
+			try {
+				$this->rm($this->opcache_file_cache);
+			} catch (\UnexpectedValueException $e) {
+				echo $e->getMessage(), "\n";
+			}
+		}
+
 		echo "PHP FCGI stopped.\n";
 	}
 }
-

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

@@ -5,7 +5,7 @@ namespace SDK\Build\PGO\Server;
 use SDK\Build\PGO\Interfaces\Server\DB;
 use SDK\Build\PGO\Abstracts\Server;
 use SDK\Build\PGO\Config as PGOConfig;
-use SDK\{Config as SDKConfig, Exception, FileOps};
+use SDK\{Exception, FileOps};
 use SDK\Build\PGO\Tool\PackageWorkman;
 
 class MariaDB extends Server implements DB
@@ -115,7 +115,7 @@ class MariaDB extends Server implements DB
 
 		$pass_arg = $pass ? "-p$pass " : "";
 		$db_arg = $db ? "-D $db" : "";
-		$ret = shell_exec(".\\bin\\mysql.exe -u $user $pass_arg -h $host -P $port $db_arg -e \"$s\"");
+		shell_exec(".\\bin\\mysql.exe -u $user $pass_arg -h $host -P $port $db_arg -e \"$s\"");
 		//var_dump($this->base, getcwd(), ".\\bin\\mysql.exe -u $user $pass_arg -h $host -P $port -e \"$s\"");
 
 		chdir($cwd);
@@ -136,9 +136,8 @@ class MariaDB extends Server implements DB
 
 		$pass_arg = $pass ? "-p$pass " : "";
 		$db_arg = $db ? "-D $db" : "";
-		$ret = shell_exec(".\\bin\\mysql.exe -u $user $pass_arg -h $host -P $port $db_arg < \"$path\"");
+		shell_exec(".\\bin\\mysql.exe -u $user $pass_arg -h $host -P $port $db_arg < \"$path\"");
 
 		chdir($cwd);
 	}
 }
-

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

@@ -5,7 +5,7 @@ namespace SDK\Build\PGO\Server;
 use SDK\Build\PGO\Interfaces;
 use SDK\Build\PGO\Abstracts;
 use SDK\Build\PGO\{Config as PGOConfig};
-use SDK\{Config as SDKConfig, Exception, FileOps};
+use SDK\{Exception, FileOps};
 use SDK\Build\PGO\Tool\PackageWorkman;
 
 class NGINX extends Abstracts\Server implements Interfaces\Server\HTTP
@@ -29,7 +29,6 @@ class NGINX extends Abstracts\Server implements Interfaces\Server\HTTP
 		$nginx_conf_in = $this->conf->getTplDir($this->name) . DIRECTORY_SEPARATOR . "nginx.conf";
 		$conf_fn = $this->base . DIRECTORY_SEPARATOR . "conf" . DIRECTORY_SEPARATOR . "nginx.conf";
 
-		$vars = array();
 		$port = $this->conf->getSectionItem($this->name, "port");
 		if (!$port) {
 			$port = $this->conf->getNextPort();
@@ -77,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);
 
@@ -148,4 +147,3 @@ class NGINX extends Abstracts\Server implements Interfaces\Server\HTTP
 		}
 	}
 }
-

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

@@ -5,7 +5,7 @@ namespace SDK\Build\PGO\Server;
 use SDK\Build\PGO\Interfaces\Server\DB;
 use SDK\Build\PGO\Abstracts\Server;
 use SDK\Build\PGO\Config as PGOConfig;
-use SDK\{Config as SDKConfig, Exception, FileOps};
+use SDK\{Exception, FileOps};
 use SDK\Build\PGO\Tool\PackageWorkman;
 
 class PostgreSQL extends Server implements DB
@@ -90,10 +90,6 @@ class PostgreSQL extends Server implements DB
 		echo "Stopping " . $this->name . ".\n";
 
 
-		$user = $this->conf->getSectionItem($this->name, "user");
-		$pass = $this->conf->getSectionItem($this->name, "pass");
-
-
 		$cmd = $this->base . DIRECTORY_SEPARATOR . "bin" . DIRECTORY_SEPARATOR . "pg_ctl.exe stop -D " . $this->data_dir . " -m fast";
 		exec($cmd);
 
@@ -108,7 +104,6 @@ class PostgreSQL extends Server implements DB
 	public function createDb(string $db_name) : void
 	{
 		$user = $this->conf->getSectionItem($this->name, "user");
-		$pass = $this->conf->getSectionItem($this->name, "pass");
 		$host = $this->conf->getSectionItem($this->name, "host");
 		$port = $this->conf->getSectionItem($this->name, "port");
 
@@ -119,7 +114,6 @@ class PostgreSQL extends Server implements DB
 	public function dropDb(string $db_name) : void
 	{
 		$user = $this->conf->getSectionItem($this->name, "user");
-		//$pass = $this->conf->getSectionItem($this->name, "pass");
 		$host = $this->conf->getSectionItem($this->name, "host");
 		$port = $this->conf->getSectionItem($this->name, "port");
 
@@ -132,13 +126,11 @@ class PostgreSQL extends Server implements DB
 		$ret = NULL;
 
 		$user = $this->conf->getSectionItem($this->name, "user");
-		//$pass = $this->conf->getSectionItem($this->name, "pass");
 		$host = $this->conf->getSectionItem($this->name, "host");
 		$port = $this->conf->getSectionItem($this->name, "port");
 
 		$db_arg = $db ? "-d $db" : "";
 		$cmd = $this->base . DIRECTORY_SEPARATOR . "bin" . DIRECTORY_SEPARATOR . "psql.exe -h $host -p $port -U $user $db_arg -c \"$s\"";
-		$ret = shell_exec($cmd);
+		shell_exec($cmd);
 	}
 }
-

lib/php/libsdk/SDK/Build/PGO/Tool/PGO.php

@@ -2,7 +2,7 @@
 
 namespace SDK\Build\PGO\Tool;
 
-use SDK\{Config as SDKConfig, Exception};
+use SDK\Exception;
 use SDK\Build\PGO\Config as PGOConfig;
 use SDK\Build\PGO\Interfaces;
 
@@ -41,7 +41,7 @@ class PGO
 		$dll = array_merge($dll, glob($this->php->getExtRootDir() . DIRECTORY_SEPARATOR . "php*.dll"));
 
 		/* find out next index */
-		$tpl = glob($this->php->getRootDir() . DIRECTORY_SEPARATOR . "php7{ts,}.dll", GLOB_BRACE)[0];
+		$tpl = glob($this->php->getRootDir() . DIRECTORY_SEPARATOR . "php{7,8,}{ts,}.dll", GLOB_BRACE)[0];
 		if (!$tpl) {
 			throw new Exception("Couldn't find php7[ts].dll in the PHP root dir.");
 		}
@@ -63,11 +63,11 @@ class PGO
 			$pgc = $this->getPgcName($base);
 			$pgd = $this->getPgdName($base);
 
-			`pgosweep $base $pgc`;
+			shell_exec("pgosweep $base $pgc");
 			//passthru("pgosweep $base $pgc");
 
 			if ($merge) {
-				`pgomgr /merge:1000 $pgc $pgd`;
+				shell_exec("pgomgr /merge:1000 $pgc $pgd");
 				//passthru("pgomgr /merge:1000 $pgc $pgd");
 				/* File is already spent, no need to keep it.
 					If seeing linker warnings about no pgc
@@ -98,10 +98,9 @@ class PGO
 			$its = glob($this->php->getRootDir() . DIRECTORY_SEPARATOR . "*.pgd");
 			$its = array_merge($its, glob($this->php->getExtRootDir() . DIRECTORY_SEPARATOR . "*" . DIRECTORY_SEPARATOR . "*.pgd"));
 			foreach (array_unique($its) as $pgd) {
-				`pgomgr /clear $pgd`;
+				shell_exec("pgomgr /clear $pgd");
 				//passthru("pgomgr /clear $pgd");
 			}
 		}
 	}
 }
-

lib/php/libsdk/SDK/Build/PGO/Tool/PackageWorkman.php

@@ -2,7 +2,7 @@
 
 namespace SDK\Build\PGO\Tool;
 
-use SDK\{Config as SDKConfig, Exception, FileOps};
+use SDK\{Exception, FileOps};
 use SDK\Build\PGO\Config as PGOConfig;
 
 
@@ -47,11 +47,10 @@ class PackageWorkman
 			echo "Unpacking '$cache_fn' to '$tgt_name'\n";
 			try {
 				$this->unzip($cache_fn, $zip_tgt_dn, $tgt_bn);
-			} catch (Throwable $e) {
+			} catch (\Throwable $e) {
 				$this->rm($cache_fn);
 				throw $e;
 			}
 		}
 	}
 }
-

lib/php/libsdk/SDK/Build/PGO/Tool/Training.php

@@ -4,7 +4,7 @@ namespace SDK\Build\PGO\Tool;
 
 use SDK\{Config as SDKConfig, Exception};
 use SDK\Build\PGO\Config as PGOConfig;
-use SDK\Build\PGO\Interfaces\{TrainingCase, Server, Server\DB, PHP};
+use SDK\Build\PGO\Interfaces\TrainingCase;
 
 class Training
 {
@@ -15,8 +15,9 @@ class Training
 	{
 		$this->conf = $conf;
 		$this->t_case = $t_case;
-		
-		if (!in_array($this->t_case->getType(), array("web", "cli"))) {
+
+		$type = $this->t_case->getType();
+		if (!in_array($type, array("web", "cli"))) {
 			throw new Exception("Unknown training type '$type'.");
 		}
 	}
@@ -107,8 +108,7 @@ class Training
 	public function run(int $max_runs = 1, ?array &$stat = array()) : void
 	{
 		$type = $this->t_case->getType();
-		switch ($type)
-		{
+		switch ($type) {
 			case "web":
 				$this->runWeb($max_runs, $stat);
 				break;

lib/php/libsdk/SDK/Build/PGO/TrainingCaseIterator.php

@@ -2,7 +2,6 @@
 
 namespace SDK\Build\PGO;
 
-use SDK\{Config as SDKConfig, Exception, FileOps};
 use SDK\Build\PGO\Config as PGOConfig;
 
 
@@ -21,7 +20,7 @@ class TrainingCaseIterator implements \Iterator
 
 		$items = glob($this->conf->getCasesTplDir() . DIRECTORY_SEPARATOR . "*");
 		foreach ($items as $it) {
-			if(!is_dir($it)) {
+			if (!is_dir($it)) {
 				continue;
 			}
 
@@ -53,7 +52,7 @@ class TrainingCaseIterator implements \Iterator
 
 	public function current()
 	{
-		$base =  $this->items[$this->idx];
+		$base = $this->items[$this->idx];
 		$ns = basename($base);
 
 		/* Don't overwrite generated config. */
@@ -97,6 +96,4 @@ class TrainingCaseIterator implements \Iterator
 
 		return $this->el->getName();
 	}
-
 }
-

lib/php/libsdk/SDK/Cache.php

@@ -2,10 +2,6 @@
 
 namespace SDK;
 
-use SDK\Config;
-use SDK\Cache;
-use SDK\Exception;
-
 class Cache
 {
 	protected $id;
@@ -48,7 +44,7 @@ class Cache
 		$old_sum = md5_file($p);
 		$new_sum = md5($content);
 
-		return $old_sum != $new_sum;
+		return $old_sum !== $new_sum;
 	}/*}}}*/
 
 	public function cacheContent(string $path, string $content, bool $relative = false) : void
@@ -64,7 +60,7 @@ class Cache
 
 		do {
 			$got = fwrite($fd, substr($content, $wrote));
-			if (false == $got) {
+			if (false === $got) {
 				break;
 			}
 			$wrote += $got;

lib/php/libsdk/SDK/Config.php

@@ -3,16 +3,14 @@
 namespace SDK;
 
 use SDK\Build\Dependency\Fetcher;
-use SDK\Cache;
-use SDK\Exception;
 
 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"; */
 
@@ -49,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;
@@ -59,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.");
+				}
 			}
 		}
 
@@ -87,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;
@@ -140,7 +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)) {
+				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();
@@ -183,6 +191,11 @@ class Config
 		$branch = NULL;
 		$found = false;
 
+		$rmtools_branch = getenv("PHP_RMTOOLS_PHP_BUILD_BRANCH");
+		if ("master" == $rmtools_branch) {
+			return "master";
+		}
+
 		/* Try to figure out the branch. The worky scenarios are
 			- CWD is in php-src 
 			- phpize is on the path
@@ -213,6 +226,19 @@ class Config
 			if (is_numeric($major) && is_numeric($minor)) {
 				$branch = "$major.$minor";
 			}
+
+			/* Verify that we use an available branch name. Master has some
+				version, but no dedicated series. For master, it rather
+				makes sense to use master as branch name. */
+			$git = trim(shell_exec("where git.exe"));
+			if ($git && is_dir(".git")) {
+				$cmd = "\"$git\" branch";
+
+				$ret = trim(shell_exec($cmd));
+				if (preg_match_all(",\*\s+master,", $ret) > 0) {	
+					$branch = "master";
+				}
+			}
 		}
 
 		return $branch;
@@ -252,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 {
@@ -260,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'");
 			}
 		}
 
@@ -277,10 +303,13 @@ class Config
 			}
 		}
 
-		if (!$ret["stability"]) {
+		if (!isset($ret["arch"]) || !$ret["arch"]) {
+			throw new Exception("Failed to find config with arch '" . self::getCurrentArchName() . "'");
+		}
+		if (!isset($ret["stability"]) || !$ret["stability"]) {
 			throw new Exception("Failed to find config with stability '" . self::getCurrentStabilityName() . "'");
 		}
-		if (!$ret["crt"]) {
+		if (!isset($ret["crt"]) || !$ret["crt"]) {
 			throw new Exception("Failed to find config with arch '" . self::getCurrentArchName() . "'");
 		}
 

lib/php/libsdk/SDK/FileOps.php

@@ -2,9 +2,6 @@
 
 namespace SDK;
 
-use SDK\Config;
-use SDK\Exception;
-
 trait FileOps
 {
 	protected function md(string $name = "", bool $tmp = false) : string
@@ -119,6 +116,9 @@ trait FileOps
 	protected function download(string $url, string $dest_fn = NULL) : ?string
 	{/*{{{*/
 		$fd = NULL;
+		$retry = 0;
+
+retry:
 		$ch = curl_init();
 
 		curl_setopt($ch, CURLOPT_URL, $url);
@@ -137,6 +137,9 @@ trait FileOps
 		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);
@@ -146,6 +149,9 @@ trait FileOps
 			if ($dest_fn) {
 				fclose($fd);
 			}
+			if ($retry++ < 3) {
+				goto retry;
+			}
 			throw new Exception($err);
 		}
 
@@ -193,7 +199,7 @@ trait FileOps
 			$name = substr($name, 0, -1);*/
 
 			$name = rtrim($stat["name"], "/");
-			while (strchr($name, '/') !== false) {
+			while (strstr($name, '/') !== false) {
 				$name = dirname($name);
 			}
 

lib/php/libsdk/SDK/Lock.php

@@ -2,8 +2,6 @@
 
 namespace SDK;
 
-use SDK\{Config, Exception};
-
 class Lock
 {
 	protected $fd;
@@ -68,6 +66,9 @@ class Lock
 		} else {
 			$this->fd = fopen($this->fn, "wb");
 		}
+		if (false === $this->fd) {
+			throw new Exception("Failed to open lock under '$this->fn'");
+		}
 		$this->locked = flock($this->fd, $flags, $this->wouldBlock);	
 		return $this->locked;
 	}/*}}}*/