Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added forward compatibility for PHP 8.1+ #13

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added forward compatibility for PHP 8.1+ #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion bin/phpsdk_deps.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ if "%PHP_SDK_PHP_CMD%"=="" (
call %PHP_SDK_PHP_CMD% %PHP_SDK_BIN_PATH%\phpsdk_deps.php %*

exit /b %errorlevel%

12 changes: 6 additions & 6 deletions lib/php/libsdk/SDK/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public static function guessCurrentBranchName() : ?string
}

/* Try to figure out the branch. The worky scenarios are
- CWD is in php-src
- CWD is in php-src
- phpize is on the path
FIXME for the dev package, there should be a php-config utility
*/
Expand Down Expand Up @@ -230,12 +230,12 @@ public static function guessCurrentBranchName() : ?string
/* 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"));
$git = trim((string)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) {
if (preg_match_all(",\*\s+master,", $ret) > 0) {
$branch = "master";
}
}
Expand All @@ -250,7 +250,7 @@ public static function getCurrentBranchName() : string
$branch = self::guessCurrentBranchName();
self::setCurrentBranchName($branch);
}

return self::$currentBranchName;
}/*}}}*/

Expand Down Expand Up @@ -313,7 +313,7 @@ public static function getCurrentBranchData() : array
throw new Exception("Failed to find config with arch '" . self::getCurrentArchName() . "'");
}

return $ret;
return $ret;
}/*}}}*/

public static function getSdkNugetFeedUrl() : string
Expand Down Expand Up @@ -368,7 +368,7 @@ public static function getDepsLocalPath() : ?string
self::setDepsLocalPath($tmp);
}
}

if (NULL == self::$depsLocalPath) {
$tmp = realpath("../deps");
if (is_dir($tmp)) {
Expand Down