Merge pull request #6940 from pmmp/r5.39.0

R5.39.0

Author: dktapps

.github/workflows/docker-image-ci.yml

@@ -0,0 +1,47 @@
+name: Docker image CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+
+    steps:
+    - uses: actions/checkout@v5
+      with:
+        submodules: true #needed for build/php submodule
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Create data directories
+      run: |
+        mkdir ./docker/test_data
+        sudo chown -R 1000:1000 ./docker/testsuite ./docker/test_data
+
+    - name: Build image for tag
+      uses: docker/build-push-action@v6.18.0
+      with:
+        context: ${{ github.workspace }}
+        push: false
+        load: true
+        file: ${{ github.workspace }}/docker/Dockerfile
+        tags: local-pocketmine-mp
+        build-args: |
+          GIT_HASH=${{ github.sha }}
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+
+    - name: Test if it runs the normal server properly
+      run: echo stop | docker run --rm -i -e POCKETMINE_ARGS="--settings.enable-dev-builds=1" local-pocketmine-mp
+
+    - name: Test if it loads plugins
+      run: |
+        echo stop | docker run --rm -i -v ./docker/test_data:/data -v ./docker/testsuite/create-data:/plugins -e POCKETMINE_ARGS="--settings.enable-dev-builds=1" local-pocketmine-mp
+        test -f ./docker/test_data/plugin_data/data-test/create-data
+        test "$(cat ./docker/test_data/plugin_data/data-test/create-data)" = "successful"
+
+    - name: Test if it persists plugin data
+      run: echo stop | docker run --rm -i -v ./docker/test_data:/data -v ./docker/testsuite/verify-data:/plugins -e POCKETMINE_ARGS="--settings.enable-dev-builds=1" local-pocketmine-mp

.github/workflows/build-docker-image.yml …ithub/workflows/docker-image-publish.yml.github/workflows/build-docker-image.yml renamed to .github/workflows/docker-image-publish.yml .github/workflows/build-docker-image.yml renamed to .github/workflows/docker-image-publish.yml

@@ -16,6 +16,10 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
+      - uses: actions/checkout@v5
+        with:
+          submodules: true #needed for build/php submodule
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -32,13 +36,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Clone pmmp/PocketMine-Docker repository
-        uses: actions/checkout@v6
-        with:
-          repository: pmmp/PocketMine-Docker
-          fetch-depth: 1
-
-
       - name: Get tag name
         id: tag-name
         run: |
@@ -73,49 +70,45 @@ jobs:
         uses: docker/build-push-action@v6.18.0
         with:
           push: true
-          context: ./pocketmine-mp
+          file: ./docker/Dockerfile
           tags: |
             ${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.TAG_NAME }}
             ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.TAG_NAME }}
           build-args: |
-            PMMP_TAG=${{ steps.tag-name.outputs.TAG_NAME }}
-            PMMP_REPO=${{ github.repository }}
+            GIT_HASH=${{ github.sha }}
 
       - name: Build image for major tag
         if: steps.channel.outputs.CHANNEL == 'stable'
         uses: docker/build-push-action@v6.18.0
         with:
           push: true
-          context: ./pocketmine-mp
+          file: ./docker/Dockerfile
           tags: |
             ${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.version.outputs.MAJOR }}
             ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.version.outputs.MAJOR }}
           build-args: |
-            PMMP_TAG=${{ steps.tag-name.outputs.TAG_NAME }}
-            PMMP_REPO=${{ github.repository }}
+            GIT_HASH=${{ github.sha }}
 
       - name: Build image for minor tag
         if: steps.channel.outputs.CHANNEL == 'stable'
         uses: docker/build-push-action@v6.18.0
         with:
           push: true
-          context: ./pocketmine-mp
+          file: ./docker/Dockerfile
           tags: |
             ${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.version.outputs.MINOR }}
             ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.version.outputs.MINOR }}
           build-args: |
-            PMMP_TAG=${{ steps.tag-name.outputs.TAG_NAME }}
-            PMMP_REPO=${{ github.repository }}
+            GIT_HASH=${{ github.sha }}
 
       - name: Build image for latest tag
         if: steps.channel.outputs.CHANNEL == 'stable'
         uses: docker/build-push-action@v6.18.0
         with:
           push: true
-          context: ./pocketmine-mp
+          file: ./docker/Dockerfile
           tags: |
             ${{ steps.docker-repo-name.outputs.NAME }}:latest
             ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:latest
           build-args: |
-            PMMP_TAG=${{ steps.tag-name.outputs.TAG_NAME }}
-            PMMP_REPO=${{ github.repository }}
+            GIT_HASH=${{ github.sha }}

.gitignore

@@ -17,6 +17,7 @@ memory_dumps/*
 resource_packs/
 server.lock
 /phpstan.neon
+/docker/test_data/
 
 # Common IDEs
 .idea/*

build/generate-known-translation-apis.php

@@ -24,19 +24,23 @@
 namespace pocketmine\build\generate_known_translation_apis;
 
 use pocketmine\lang\Translatable;
+use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Utils;
 use Symfony\Component\Filesystem\Path;
 use function array_map;
 use function count;
 use function dirname;
+use function fclose;
 use function file_put_contents;
+use function fopen;
 use function fwrite;
 use function implode;
 use function is_numeric;
 use function ksort;
 use function ob_get_clean;
 use function ob_start;
 use function parse_ini_file;
+use function preg_last_error_msg;
 use function preg_match_all;
 use function str_replace;
 use function strtoupper;
@@ -45,6 +49,8 @@
 use const SORT_STRING;
 use const STDERR;
 
+const PARAMETER_REGEX = '/{%(.+?)}/';
+
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 function constantify(string $permissionName) : string{
@@ -117,6 +123,51 @@ final class KnownTranslationKeys{
 	echo "Done generating KnownTranslationKeys.\n";
 }
 
+/**
+ * @param string[] $languageDefinitions
+ * @phpstan-param array<string, string> $languageDefinitions
+ */
+function generate_known_translation_parameter_info(array $languageDefinitions) : void{
+	$file = fopen(dirname(__DIR__) . '/src/lang/KnownTranslationParameterInfo.php', 'wb');
+	if($file === false){
+		fwrite(STDERR, "Unable to open KnownTranslationParameterInfo file\n");
+		exit(1);
+	}
+
+	fwrite($file, SHARED_HEADER);
+	fwrite($file, <<<'HEADER'
+use pocketmine\lang\KnownTranslationKeys as Keys;
+
+/**
+ * This class contains constants for all the translations known to PocketMine-MP as per the used version of pmmp/Language.
+ * This class is generated automatically, do NOT modify it by hand.
+ *
+ * @internal
+ */
+final class KnownTranslationParameterInfo{
+HEADER);
+	ksort($languageDefinitions, SORT_STRING);
+
+	fwrite($file, "\n\tpublic const TABLE = [\n");
+	foreach(Utils::stringifyKeys($languageDefinitions) as $k => $v){
+		if(preg_match_all(PARAMETER_REGEX, $v, $matches) === false){
+			throw new AssumptionFailedError(preg_last_error_msg());
+		}
+		$uniqueParameters = [];
+		foreach($matches[1] as $parameterName){
+			$uniqueParameters[$parameterName] = $parameterName;
+		}
+		fwrite($file, "\t\tKeys::" . constantify($k) . " => [" . implode(", ", array_map(fn(string $s) => "\"$s\"", $uniqueParameters)) . "],\n");
+	}
+	fwrite($file, "\t];\n");
+
+	fwrite($file, "}\n");
+
+	fclose($file);
+
+	echo "Done generating KnownTranslationParameterInfo.\n";
+}
+
 /**
  * @param string[] $languageDefinitions
  * @phpstan-param array<string, string> $languageDefinitions
@@ -138,7 +189,7 @@ final class KnownTranslationFactory{
 HEADER;
 	ksort($languageDefinitions, SORT_STRING);
 
-	$parameterRegex = '/{%(.+?)}/';
+	$parameterRegex = PARAMETER_REGEX;
 
 	$translationContainerClass = (new \ReflectionClass(Translatable::class))->getShortName();
 	foreach(Utils::stringifyKeys($languageDefinitions) as $key => $value){
@@ -190,4 +241,5 @@ functionify($key) .
 }
 
 generate_known_translation_keys($lang);
+generate_known_translation_parameter_info($lang);
 generate_known_translation_factory($lang);

build/generate-registry-annotations.php

@@ -24,6 +24,9 @@
 namespace pocketmine\build\update_registry_annotations;
 
 use pocketmine\utils\Utils;
+use function array_diff;
+use function array_map;
+use function array_unshift;
 use function basename;
 use function class_exists;
 use function count;
@@ -64,15 +67,23 @@ function generateMethodAnnotations(string $namespaceName, array $members) : stri
 	$memberLines = [];
 	foreach(Utils::stringifyKeys($members) as $name => $member){
 		$reflect = new \ReflectionClass($member);
-		while($reflect !== false && $reflect->isAnonymous()){
-			$reflect = $reflect->getParentClass();
+		$types = $reflect->getInterfaceNames();
+		$concreteClass = $reflect;
+		while($concreteClass !== false && $concreteClass->isAnonymous()){
+			$concreteClass = $concreteClass->getParentClass();
 		}
-		if($reflect === false){
+
+		if($concreteClass === false){
 			$typehint = "object";
-		}elseif($reflect->getNamespaceName() === $namespaceName){
-			$typehint = $reflect->getShortName();
 		}else{
-			$typehint = '\\' . $reflect->getName();
+			$types = array_diff($types, $concreteClass->getInterfaceNames());
+			array_unshift($types, $concreteClass->getName());
+			$typehint = implode("&", array_map(function(string $class) use ($namespaceName) : string{
+				$reflect = new \ReflectionClass($class);
+				return $reflect->getNamespaceName() === $namespaceName ?
+					$reflect->getShortName() :
+					'\\' . $reflect->getName();
+			}, $types));
 		}
 		$accessor = mb_strtoupper($name);
 		$memberLines[$accessor] = sprintf($lineTmpl, $accessor, $typehint);