Merge branch 'pmmp:stable' into feature/weather-system

Author: GroXzaLYs

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,9 @@
 <!-- Summarize your PR here. Keep it short and simple. -->
 <!-- Explain existing problems or why this pull request is necessary -->
 
+<!-- DO NOT submit AI generated code or use AI to generate PR descriptions. -->
+<!-- These are a waste of our team's time and your PR will be closed immediately. -->
+
 ### Related issues & PRs
 <!--
 * Fixes #1

.github/workflows/main.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.1", "8.2", "8.3", "8.4"]
+        php: ["8.1", "8.2", "8.3", "8.4", "8.5"]
 
     uses: ./.github/workflows/main-php-matrix.yml
     with:

.github/workflows/verify-translations.php

@@ -87,13 +87,17 @@ function verify_translations(array $baseLanguageDef, string $altLanguageName, ar
 	return $ok;
 }
 
+function language_file_path(string $path, string $code) : string{
+	return $path . "/" . "$code.ini";
+}
+
 /**
  * @return string[]|null
  * @phpstan-return array<string, string>|null
  */
-function parse_language_file(string $path, string $code) : ?array{
-	$lang = parse_ini_file($path . "/" . "$code.ini", false, INI_SCANNER_RAW);
-	if($lang === false){
+function parse_language_file(string $contents) : ?array{
+	$lang = parse_ini_string($contents, false, INI_SCANNER_RAW);
+	if($lang === false || count($lang) === 0){
 		return null;
 	}
 	return $lang;
@@ -151,7 +155,12 @@ function verify_keys(array $pocketmine, array $mojang, array $knownBadKeys) : ar
 	fwrite(STDERR, "Required arguments: path\n");
 	exit(1);
 }
-$eng = parse_language_file($argv[1], "eng");
+$rawEng = file_get_contents(language_file_path($argv[1], "eng"));
+if($rawEng === false){
+	fwrite(STDERR, "Failed to read eng.ini\n");
+	exit(1);
+}
+$eng = parse_language_file($rawEng);
 if($eng === null){
 	fwrite(STDERR, "Failed to parse eng.ini\n");
 	exit(1);
@@ -196,10 +205,19 @@ function verify_keys(array $pocketmine, array $mojang, array $knownBadKeys) : ar
  */
 foreach(new \RegexIterator(new \FilesystemIterator($argv[1], \FilesystemIterator::CURRENT_AS_PATHNAME), "/([a-z]+)\.ini$/", \RegexIterator::GET_MATCH) as $match){
 	$code = $match[1];
-	if($code === "eng"){
+	$path = language_file_path($argv[1], $code);
+	$raw = file_get_contents($path);
+	if($raw === false){
+		fwrite(STDERR, "Unable to read contents of $path\n");
+		$exit = 1;
 		continue;
 	}
-	$otherLang = parse_language_file($argv[1], $code);
+	if(str_starts_with($raw, "\xef\xbb\xbf")){
+		fwrite(STDERR, "Unexpected byte-order mark at the start of $code.ini\n");
+		$exit = 1;
+		//we can still try to parse the file - this is more of a cosmetic check than a functional one
+	}
+	$otherLang = parse_language_file($raw);
 	if($otherLang === null){
 		fwrite(STDERR, "Error parsing $code.ini\n");
 		$exit = 1;

build/dump-version-info.php

@@ -71,7 +71,7 @@
 		return true;
 	}
 ];
-if(count($argv) !== 2 || !isset($options[$argv[1]])){
+if(!isset($argv) || count($argv) !== 2 || !isset($options[$argv[1]])){
 	fwrite(STDERR, "Please provide an option (one of: " . implode(", ", array_keys($options)) . PHP_EOL);
 	exit(1);
 }

build/generate-block-serializer-consts.php

@@ -195,7 +195,7 @@ function generateBlockStringValues(BlockPaletteReport $data) : void{
 	fclose($output);
 }
 
-if(count($argv) !== 2){
+if(!isset($argv) || count($argv) !== 2){
 	fwrite(STDERR, "This script regenerates BlockTypeNames, BlockStateNames and BlockStateStringValues from a given palette file\n");
 	fwrite(STDERR, "Required arguments: path to block palette file\n");
 	exit(1);

build/generate-build-info-json.php

@@ -26,7 +26,7 @@
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-if(count($argv) !== 7){
+if(!isset($argv) || count($argv) !== 7){
 	fwrite(STDERR, "required args: <git hash> <tag name> <github repo (owner/name)> <build number> <github actions run ID> <PHP binary download URL>\n");
 	exit(1);
 }

build/generate-item-type-names.php

@@ -99,7 +99,7 @@ final class ItemTypeNames{
 	fclose($file);
 }
 
-if(count($argv) !== 2){
+if(!isset($argv) || count($argv) !== 2){
 	fwrite(STDERR, "This script regenerates ItemTypeNames from a given item dictionary file\n");
 	fwrite(STDERR, "Required argument: path to item type dictionary file\n");
 	exit(1);

build/generate-registry-annotations.php

@@ -45,7 +45,7 @@
 use const SORT_STRING;
 use const STDERR;
 
-if(count($argv) !== 2){
+if(!isset($argv) || count($argv) !== 2){
 	fwrite(STDERR, "Provide a path to process\n");
 	exit(1);
 }

build/php

@@ -60,7 +60,7 @@ function parse_language_file(string $path, string $file) : ?array{
 	return $lang;
 }
 
-if(count($argv) !== 2){
+if(!isset($argv) || count($argv) !== 2){
 	fwrite(STDERR, "Usage: php remove-dead-translations.php <translations folder>\n");
 	exit(1);
 }