some minor improvements

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 @@
 		switch ($name) {
 			default:
 				throw new Exception("Unknown switch '$name'");
-			break;
+				break;
 
 			case "h":
 			case "help":

bin/phpsdk_dllmap.php

@@ -29,10 +29,10 @@
 $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 @@
 
 		$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_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 @@
 	$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;
 		}
 	}
 

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 @@ public function __construct(string $host, int $port, string $scheme = "https", s
 		$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 @@ protected function getTmpSeriesPath() : string
 
 	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 @@ public function setArch(string $arch) : void
 
 	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,17 +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()
 	{
@@ -44,7 +44,7 @@ protected function createEnv() : array
 			$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;
 				}
 			}
@@ -110,7 +110,7 @@ public function getVersion(bool $short = false) : string
 			}
 		}
 
-		if (is_null($ret)) {
+		if (NULL === $ret) {
 			throw new Exception("Failed to determine the test PHP version.");
 		}
 
@@ -194,8 +194,8 @@ protected function getIniTplFilename()
 	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";
@@ -223,7 +223,7 @@ public function exec(string $php_cmd, string $args = NULL, array $extra_env = ar
 			$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"),
@@ -244,4 +244,3 @@ public function getIdString(): string
 			. "-" . substr(md5(uniqid()), 0, 8);
 	}
 }
-

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

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

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

@@ -2,18 +2,19 @@
 
 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;
 
 	const TYPE_WEB = "web";
 	const TYPE_CLI = "cli";
 
 	protected $stat = array();
+	/** @var \SDK\Build\PGO\Config */
+	protected $conf;
 
 	public function getType() : string
 	{
@@ -148,4 +149,3 @@ public function probeUrl(string $url) : bool
 		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 @@ public function __construct(int $mode = MODE_RUN)
 		$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 @@ public function processTpl(string $s, array $additional_vars = array()) : string
 	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 @@ public function getSrv(?string $name = NULL)
 		return $ret;
 	}
 }
-