Merge branch 'dev/4.2'

fuyutsuki · Jul 15, 2023 · 134d9cb · 134d9cb
2 parents 87b168a + a253a55
commit 134d9cb
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 64 deletions.
diff --git a/composer.json b/composer.json
@@ -36,16 +36,16 @@
 	},
 	"require-dev": {
 		"phpstan/phpstan": "^1.10",
-		"pocketmine/pocketmine-mp": "^5.1",
-		"sof3/pharynx": "^0.3.2"
+		"pocketmine/pocketmine-mp": "^5.3",
+		"sof3/pharynx": "^0.3.4"
 	},
 	"autoload": {
 		"psr-4": {
 			"jp\\mcbe\\fuyutsuki\\Texter\\": ["src"]
 		}
 	},
 	"scripts": {
-		"build": "php -dphar.readonly=0 vendor/bin/pharynx -i=. -c -p=Timer.phar"
+		"build": "php -dphar.readonly=0 vendor/bin/pharynx -i=. -c -p=Texter.phar"
 	},
 	"config": {
 		"sort-packages": true

diff --git a/composer.lock b/composer.lock
diff --git a/src/jp/mcbe/fuyutsuki/Texter/task/CheckUpdateTask.php b/src/jp/mcbe/fuyutsuki/Texter/task/CheckUpdateTask.php
@@ -46,8 +46,11 @@ public function onCompletion(): void {
 		if ($plugin !== null && $plugin->isEnabled()) {
 			/** @var Main $plugin */
 			$data = $this->getResult();
-			if (isset($data["name"], $data["html_url"])) {
-				$ver = new VersionString($data["name"]);
+			if (isset($data["tag_name"], $data["html_url"])) {
+				$pattern = "/(?<=v)\d+\.\d+\.\d+/";
+				preg_match($pattern, $data["tag_name"], $version);
+
+				$ver = new VersionString($version[0]);
 				$plugin->compareVersion(true, $ver, $data["html_url"]);
 			}else {
 				$plugin->compareVersion(false);