prepare 2.0.6

The command box has a title 'PHP SDK' now.
Make it descriptive like 'PHP SDK vc15 x86'

.gitignore

@@ -18,5 +18,4 @@ oracle
 # either these two become submodules, or uncomment them
 #pgo-build
 #rmtools*
-pgo
 phpsdk-local.bat

LICENSE

@@ -0,0 +1,9 @@
+Copyright 2017 Anatol Belski
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

VERSION

@@ -1 +1 @@
-2.0.4
+2.0.6

bin/phpsdk_deps.php

@@ -2,8 +2,7 @@
 
 include dirname(__FILE__) . "/../lib/php/libsdk/autoload.php";
 
-use SDK\Config;
-use SDK\Exception;
+use SDK\{Config, Exception};
 
 $sopt = "s:cuhb:a:d:t:fn";
 $lopt = array(
@@ -43,22 +42,16 @@ try {
 
 			case "b":
 			case "branch":
-				$branch = $val;
+				Config::setCurrentBranchName($val);
 				break;
 
 			case "s":
 			case "stability":
-				if ("stable" != $val && "staging" != $val) {
-					throw new Exception("Unknown stability keyword, either stable or staging is accepted");
-				}
 				Config::setCurrentStabilityName($val);
 				break;
 
 			case "a":
 			case "arch":
-				if ("x64" != $val && "x86" != $val) {
-					throw new Exception("Unknown arch keyword, either x86 or x64 is accepted");
-				}
 				Config::setCurrentArchName($val);
 				break;
 
@@ -97,77 +90,22 @@ try {
 		usage();
 	}
 
-	if (!Config::getDepsLocalPath()) {
-		if (file_exists("../deps")) {
-			Config::setDepsLocalPath(realpath("../deps"));
-		} else if (file_exists("main/php_version.h")) {
-			/* Deps dir might not exist. */
-			Config::setDepsLocalPath(realpath("..") . DIRECTORY_SEPARATOR . "deps");
-		} else {
-			usage(3);
-		}
+	if (NULL === Config::getDepsLocalPath()) {
+		usage(3);
 	}
 
-	if ($branch) {
-		Config::setCurrentBranchName($branch);
-	}
-	if (!Config::getCurrentBranchName()) {
-		/* Try to figure out the branch. For now it only works if CWD is in php-src. */
-		$fl = "main/php_version.h";
-		if (file_exists($fl)) {
-			$s = file_get_contents($fl);
-			$major = $minor = NULL;
-
-			if (preg_match(",PHP_MAJOR_VERSION (\d+),", $s, $m)) {
-				$major = $m[1];
-			}
-			if (preg_match(",PHP_MINOR_VERSION (\d+),", $s, $m)) {
-				$minor = $m[1];
-			}
-
-			if (is_numeric($major) && is_numeric($minor)) {
-				Config::setCurrentBranchName("$major.$minor");
-			} else {
-				usage(3);
-			}
-		} else {
-			usage(3);
-		}
+	$branch = Config::getCurrentBranchName();
+	if (NULL == $branch) {
+		usage(3);
 	}
 
-	if (NULL === Config::getCurrentArchName()) {
-		/* XXX this might be not true for other compilers! */
-		passthru("where cl.exe >nul", $status);
-		if (!$status) {
-			exec("cl.exe /? 2>&1", $a, $status);
-			if (!$status) {
-				if (preg_match(",x64,", $a[0])) {
-					Config::setCurrentArchName("x64");
-				} else {
-					Config::setCurrentArchName("x86");
-				}
-			} else {
-				usage(3);
-			}
-		} else {
-			usage(3);
-		}
-		$arch = Config::getCurrentArchName();
+	$arch = Config::getCurrentArchName();
+	if (NULL === $arch) {
+		usage(3);
 	}
 
 	if (NULL === Config::getCurrentCrtName()) {
-		$all_branches = Config::getKnownBranches();
-
-		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)));
-		} else {
-			Config::setCurrentCrtName(array_keys($branch)[0]);
-		}
+		usage(3);
 	}
 	/* The current CRT needs to match the config one. */
 	$active_crt = getenv("PHP_SDK_VC");

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

@@ -2,11 +2,12 @@
 
 namespace SDK\Build\Dependency;
 
-use SDK\Config;
-use SDK\Exception;
+use SDK\{Config, Exception, FileOps};
 
 class Fetcher
 {
+	use FileOps;
+
 	protected $host;
 	protected $port;
 	protected $stability;
@@ -27,7 +28,7 @@ class Fetcher
 		return $this->series;
 	}/*}}}*/
 
-	public function setSeries(Series $series)
+	public function setSeries(Series $series) : void
 	{/*{{{*/
 		$this->series = $series;
 	}/*}}}*/
@@ -37,13 +38,8 @@ class Fetcher
 	public function getByUri($uri) : string
 	{/*{{{*/
 		$url = "http://{$this->host}:{$this->port}$uri";
-		$s = file_get_contents($url);
 
-		if (false === $s) {
-			throw new Exception("failed to fetch $url");
-		}
-
-		return $s;
+		return $this->download($url);
 	}/*}}}*/
 
 	/*protected function fetch($uri) : string

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

@@ -2,10 +2,7 @@
 
 namespace SDK\Build\Dependency;
 
-use SDK\Config;
-use SDK\Cache;
-use SDK\Exception;
-use SDK\FileOps;
+use SDK\{Config, Cache, Exception, FileOps};
 
 class Manager
 {
@@ -35,7 +32,7 @@ class Manager
 		$this->series = $series;
 	}/*}}}*/
 
-	protected function getTmpSeriesPath()
+	protected function getTmpSeriesPath() : string
 	{/*{{{*/
 		return Config::getTmpDir() . DIRECTORY_SEPARATOR . $this->series->getname();
 	}/*}}}*/
@@ -45,9 +42,8 @@ class Manager
 		return $this->series->updatesAvailable();
 	}/*}}}*/
 
-	/* TODO and implement --force. */
 	/* FIXME implement rollback */
-	public function performUpdate(string &$msg = NULL, bool $force = false, bool $backup = true)
+	public function performUpdate(string &$msg = NULL, bool $force = false, bool $backup = true) : void
 	{/*{{{*/
 		if (!$force) {
 			if (!$this->updatesAvailable()) {

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

@@ -28,7 +28,7 @@ class Package
 		return "$base/{$branch_data['crt']}/$arch/{$this->name}";
 	}/*}}}*/
 
-	public function retrieve(string $path)
+	public function retrieve(string $path) : void
 	{/*{{{*/
 		$this->filepath = $path . DIRECTORY_SEPARATOR . $this->name;
 
@@ -39,7 +39,7 @@ class Package
 		fclose($fd);
 	}/*}}}*/
 
-	public function unpack(string $path)
+	public function unpack(string $path) : void
 	{/*{{{*/
 		if (!$this->filepath || !file_exists($this->filepath)) {
 			throw new Exception("Invalid filepath '{$this->filepath}'");
@@ -55,7 +55,7 @@ class Package
 		}
 	}/*}}}*/
 
-	public function cleanup()
+	public function cleanup() : void
 	{/*{{{*/
 		unlink($this->filepath);		
 	}/*}}}*/

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

@@ -27,7 +27,7 @@ class Series
 		return $this->fetcher;
 	}/*}}}*/
 
-	public function setFetcher(Fetcher $fetcher)
+	public function setFetcher(Fetcher $fetcher) : void
 	{/*{{{*/
 		$this->fetcher = $fetcher;
 	}/*}}}*/
@@ -37,7 +37,7 @@ class Series
 		return $this->arch;
 	}/*}}}*/
 
-	public function setArch(string $arch)
+	public function setArch(string $arch) : void
 	{/*{{{*/
 		$this->arch = $arch;
 	}/*}}}*/
@@ -52,7 +52,7 @@ class Series
 		return $file;
 	}/*}}}*/
 
-	protected function getUri() : string
+	protected function getUri() : string 
 	{/*{{{*/
 		$base = Config::getDepsBaseUri();
 		$file = $this->getName();
@@ -79,12 +79,12 @@ class Series
 		return $ret;
 	}/*}}}*/
 
-	public function getSavePath()
+	public function getSavePath() : string
 	{/*{{{*/
 		return Config::getCacheDir() . DIRECTORY_SEPARATOR . $this->getname();
 	}/*}}}*/
 
-	public function updatesAvailable()
+	public function updatesAvailable() : bool
 	{/*{{{*/
 		$series_data = $this->getData(true);
 		$series_file = $this->getSavePath();
@@ -92,7 +92,7 @@ class Series
 		return $this->cache->cachedContentDiffers($series_file, $series_data);
 	}/*}}}*/
 
-	public function cache(string $path = NULL)
+	public function cache(string $path = NULL) : void
 	{/*{{{*/
 		if (!$path) {
 			$path = $this->getSavePath();

lib/php/libsdk/SDK/Cache.php

@@ -50,7 +50,7 @@ class Cache
 		return $old_sum != $new_sum;
 	}/*}}}*/
 
-	public function cacheContent(string $path, string $content, bool $relative = false)
+	public function cacheContent(string $path, string $content, bool $relative = false) : void
 	{/*{{{*/
 		$p = $this->getCacheablePath($path, $relative);
 
@@ -59,7 +59,7 @@ class Cache
 		}
 	}/*}}}*/
 
-	public function getCachedContent(string $path, bool $relative = false)
+	public function getCachedContent(string $path, bool $relative = false) : ?string
 	{/*{{{*/
 		$p = $this->getCacheablePath($path, $relative);
 
@@ -67,7 +67,7 @@ class Cache
 			return file_get_contents($p);
 		}
 
-		return "";
+		return NULL;
 	}/*}}}*/
 }
 

lib/php/libsdk/SDK/Config.php

@@ -39,33 +39,85 @@ class Config
 		return self::$depsBaseUri;
 	}/*}}}*/
 
-	public static function setCurrentArchName(string $arch)
+	public static function setCurrentArchName(string $arch) : void
 	{/*{{{*/
+		$arch = strtolower($arch);
+
+		if ("x64" != $arch && "x86" != $arch) {
+			throw new Exception("Unknown arch keyword, either x86 or x64 is accepted");
+		}
+
 		self::$currentArchName = $arch;
 	}	/*}}}*/
 
-	public static function getCurrentArchName() 
+	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 find cl.exe.");
+			}
+
+			exec("cl.exe /? 2>&1", $a, $status);
+			if ($status) {
+				throw new Exception("Couldn't execute cl.exe.");
+			}
+
+			if (preg_match(",x64,", $a[0])) {
+				self::setCurrentArchName("x64");
+			} else {
+				self::setCurrentArchName("x86");
+			}
+		}
+
 		return self::$currentArchName;
 	}	/*}}}*/
 
-	public static function setCurrentCrtName(string $crt)
+	public static function setCurrentCrtName(string $crt) : void
 	{/*{{{*/
 		self::$currentCrtName = $crt;
 	}	/*}}}*/
 
-	public static function getCurrentCrtName()
+	public static function getCurrentCrtName() : ?string
 	{/*{{{*/
+		if (NULL === self::$currentCrtName) {
+			$all_branches = Config::getKnownBranches();
+
+			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]);
+		}
+
 		return self::$currentCrtName;
 	}	/*}}}*/
 
-	public static function setCurrentStabilityName(string $stability)
+	public static function setCurrentStabilityName(string $stability) : void
 	{/*{{{*/
+		if ("stable" != $stability && "staging" != $stability) {
+			throw new Exception("Unknown stability keyword, either stable or staging is accepted");
+		}
+
 		self::$currentStabilityName = $stability;
 	}	/*}}}*/
 
-	public static function getCurrentStabilityName()
+	public static function getCurrentStabilityName() : ?string
 	{/*{{{*/
+		if (NULL === self::$currentStabilityName) {
+			if ("master" == Config::getCurrentBranchName()) {
+				Config::setCurrentStabilityName("staging");
+			} else {
+				Config::setCurrentStabilityName("stable");
+			}
+		}
+
 		return self::$currentStabilityName;
 	}	/*}}}*/
 
@@ -93,6 +145,9 @@ class Config
 			} else {
 				/* It might be ok to use cached branches list, if a fetch failed. */
 				$tmp = $cache->getCachedContent($cache_file, true);
+				if (NULL == $tmp) {
+					throw new Exception("No cached branches list found");
+				}
 				$data = json_decode($tmp, true);
 			}
 
@@ -105,17 +160,37 @@ class Config
 		return self::$knownBranches;
 	}/*}}}*/
 
-	public static function setCurrentBranchName(string $name)
+	public static function setCurrentBranchName(string $name) : void
 	{/*{{{*/
 		if (!array_key_exists($name, self::getKnownBranches())) {
-		//	throw new Exception("Unsupported branch '$name'");
+			throw new Exception("Unsupported branch '$name'");
 		}
 
 		self::$currentBranchName = $name;
 	}/*}}}*/
 
-	public static function getCurrentBranchName()
+	public static function getCurrentBranchName() : ?string
 	{/*{{{*/
+		if (NULL == self::$currentBranchName) {
+			/* Try to figure out the branch. For now it only works if CWD is in php-src. */
+			$fl = "main/php_version.h";
+			if (file_exists($fl)) {
+				$s = file_get_contents($fl);
+				$major = $minor = NULL;
+
+				if (preg_match(",PHP_MAJOR_VERSION (\d+),", $s, $m)) {
+					$major = $m[1];
+				}
+				if (preg_match(",PHP_MINOR_VERSION (\d+),", $s, $m)) {
+					$minor = $m[1];
+				}
+
+				if (is_numeric($major) && is_numeric($minor)) {
+					self::setCurrentBranchName("$major.$minor");
+				}
+			}
+		}
+	
 		return self::$currentBranchName;
 	}/*}}}*/
 
@@ -124,36 +199,37 @@ class Config
 		$ret = array();
 		$branches = self::getKnownBranches();
 
-		if (!array_key_exists(self::$currentBranchName, $branches)) {
-			throw new Exception("Unknown branch '" . self::$currentBranchName . "'");
+		$current_branch_name = self::getCurrentBranchName();
+		if (!array_key_exists($current_branch_name, $branches)) {
+			throw new Exception("Unknown branch '$current_branch_name'");
 		}
 
 		$cur_crt = Config::getCurrentCrtName();
-		if (count($branches[self::$currentBranchName]) > 1) {
+		if (count($branches[$current_branch_name]) > 1) {
 			if (NULL === $cur_crt) {
-				throw new Exception("More than one CRT is available for branch '" . self::$currentBranchName . "', pass one explicitly.");
+				throw new Exception("More than one CRT is available for branch '$current_branch_name', pass one explicitly.");
 			}
 
 			$cur_crt_usable = false;
-			foreach (array_keys($branches[self::$currentBranchName]) as $crt) {
+			foreach (array_keys($branches[$current_branch_name]) as $crt) {
 				if ($cur_crt == $crt) {
 					$cur_crt_usable = true;
 					break;
 				}
 			}
 			if (!$cur_crt_usable) {
-				throw new Exception("The passed CRT '$cur_crt' doesn't match any availbale for branch '" . self::$currentBranchName . "'");
+				throw new Exception("The passed CRT '$cur_crt' doesn't match any availbale for branch '$current_branch_name'");
 			}
-			$data = $branches[self::$currentBranchName][$cur_crt];
+			$data = $branches[$current_branch_name][$cur_crt];
 		} else {
 			/* Evaluate CRTs, to avoid ambiquity. */
-			list($crt, $data) = each($branches[self::$currentBranchName]);
+			list($crt, $data) = each($branches[$current_branch_name]);
 			if ($crt != $cur_crt) {
-				throw new Exception("The passed CRT '$cur_crt' doesn't match any availbale for branch '" . self::$currentBranchName . "'");
+				throw new Exception("The passed CRT '$cur_crt' doesn't match any availbale for branch '$current_branch_name'");
 			}
 		}
 
-		$ret["name"] = self::$currentBranchName;
+		$ret["name"] = $current_branch_name;
 		$ret["crt"] = $crt;
 
 		/* Last step, filter by arch and stability. */
@@ -181,7 +257,7 @@ class Config
 		return self::$sdkNugetFeedUrl;
 	}/*}}}*/
 
-	public static function getSdkPath()
+	public static function getSdkPath() : string
 	{/*{{{*/
 		$path = getenv("PHP_SDK_ROOT_PATH");
 
@@ -208,12 +284,21 @@ class Config
 		return file_get_contents($path);
 	}/*}}}*/
 
-	public static function getDepsLocalPath()
+	public static function getDepsLocalPath() : ?string
 	{/*{{{*/
+		if (NULL == self::$depsLocalPath) {
+			if (file_exists("../deps")) {
+				self::setDepsLocalPath(realpath("../deps"));
+			} else if (file_exists("main/php_version.h")) {
+				/* Deps dir might not exist. */
+				self::setDepsLocalPath(realpath("..") . DIRECTORY_SEPARATOR . "deps");
+			}
+		}
+
 		return self::$depsLocalPath;
 	}/*}}}*/
 
-	public static function setDepsLocalPath(string $path)
+	public static function setDepsLocalPath(string $path) : void
 	{/*{{{*/
 		self::$depsLocalPath = $path;
 	}/*}}}*/

lib/php/libsdk/SDK/FileOps.php

@@ -115,6 +115,42 @@ trait FileOps
 
 		return $ret;
 	}/*}}}*/
+
+	protected function download(string $url, string $dest = NULL) : ?string
+	{
+		$fd = NULL;
+		$ch = curl_init($url);
+
+		if ($dest) {
+			$fd = fopen($dest, "w+");
+			curl_setopt($ch, CURLOPT_FILE, $fd); 
+		} else {
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		}
+
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+
+		$ret = curl_exec($ch);
+		if (false === $ret) {
+			$err = curl_error();
+			curl_close($ch);
+			if ($dest) {
+				fclose($fd);
+			}
+			throw new Exception($err);
+		}
+
+		curl_close($ch);
+
+		if ($dest) {
+			fclose($fd);
+			return NULL;
+		}
+
+		return $ret;
+	}
 }
 
 /*

phpsdk-starter.bat

@@ -31,7 +31,7 @@ set ARCH=%ARCH: =%
 set PHP_SDK_RUN_FROM_ROOT=1
 
 
-title PHP SDK
+title PHP SDK %CRT% %ARCH%
 
 call %PHP_SDK_ROOT_PATH%\bin\phpsdk_setshell.bat %CRT% %ARCH%
 
@@ -40,7 +40,7 @@ set CRT=
 set ARCH=
 
 if errorlevel 3 (
-	exit /b %errorlevel%
+	exit /b !ERRORLEVEL!
 )
 
 if "%TASK%" neq "" (
@@ -53,7 +53,7 @@ if "%TASK%" neq "" (
 			cmd /c "!PHP_SDK_VC_SHELL_CMD! && %PHP_SDK_ROOT_PATH%\bin\phpsdk_setvars.bat && %TASK% !TASK_ARGS!"
 		)
 		set TASK=
-		exit /b
+		exit /b !ERRORLEVEL!
 	) else (
 		echo could not find the task file
 		set TASK=
@@ -67,5 +67,5 @@ if exist "%PHP_SDK_ROOT_PATH%\phpsdk-local.bat" (
 	cmd /k "!PHP_SDK_VC_SHELL_CMD! && %PHP_SDK_ROOT_PATH%\bin\phpsdk_setvars.bat && %PHP_SDK_ROOT_PATH%\bin\phpsdk_dumpenv.bat && set prompt=$P$_$+$$$S"
 )
 
-exit /b
+exit /b !ERRORLEVEL!
 

phpsdk-vc14-x64.bat

@@ -2,5 +2,5 @@
 
 call %~dp0phpsdk-starter.bat -c vc14 -a x64 %*
 
-exit /b
+exit /b %ERRORLEVEL%
 

phpsdk-vc14-x86.bat

@@ -2,5 +2,5 @@
 
 call %~dp0phpsdk-starter.bat -c vc14 -a x86 %*
 
-exit /b
+exit /b %ERRORLEVEL%
 

phpsdk-vc15-x64.bat

@@ -2,5 +2,5 @@
 
 call %~dp0phpsdk-starter.bat -c vc15 -a x64 %*
 
-exit /b
+exit /b %ERRORLEVEL%
 

phpsdk-vc15-x86.bat

@@ -2,5 +2,5 @@
 
 call %~dp0phpsdk-starter.bat -c vc15 -a x86 %*
 
-exit /b
+exit /b %ERRORLEVEL%