BulkCurlTask constructor now accepts BulkCurlTaskOperation[] instead of shaped arrays

src/command/defaults/TimingsCommand.php

@@ -29,6 +29,7 @@ use pocketmine\command\utils\InvalidCommandSyntaxException;
 use pocketmine\lang\TranslationContainer;
 use pocketmine\player\Player;
 use pocketmine\scheduler\BulkCurlTask;
+use pocketmine\scheduler\BulkCurlTaskOperation;
 use pocketmine\timings\TimingsHandler;
 use pocketmine\utils\InternetException;
 use function count;
@@ -139,9 +140,11 @@ class TimingsCommand extends VanillaCommand{
 					 */
 					public function __construct(CommandSender $sender, string $host, string $agent, array $data){
 						parent::__construct([
-							[
+							new BulkCurlTaskOperation(
-								"page" => "https://$host?upload=true",
+								"https://$host?upload=true",
-								"extraOpts" => [
+								10,
+								[],
+								[
 									CURLOPT_HTTPHEADER => [
 										"User-Agent: $agent",
 										"Content-Type: application/x-www-form-urlencoded"
@@ -151,7 +154,7 @@ class TimingsCommand extends VanillaCommand{
 									CURLOPT_AUTOREFERER => false,
 									CURLOPT_FOLLOWLOCATION => false
 								]
-							]
+							)
 						]);
 						$this->host = $host;
 						$this->storeLocal(self::TLS_KEY_SENDER, $sender);

src/scheduler/BulkCurlTask.php

@@ -44,20 +44,23 @@ class BulkCurlTask extends AsyncTask{
 	 * "timeout", "extraHeaders" and "extraOpts". Documentation of these options are same as those in
 	 * {@link Utils::simpleCurl}.
 	 *
-	 * @param mixed[][]  $operations
+	 * @param BulkCurlTaskOperation[]  $operations
-	 * @phpstan-param list<array{page: string, timeout?: float, extraHeaders?: list<string>, extraOpts?: array<int, mixed>}> $operations
+	 * @phpstan-param list<BulkCurlTaskOperation> $operations
 	 */
 	public function __construct(array $operations){
 		$this->operations = igbinary_serialize($operations);
 	}
 
 	public function onRun() : void{
-		/** @phpstan-var list<array{page: string, timeout?: float, extraHeaders?: list<string>, extraOpts?: array<int, mixed>}> $operations */
+		/**
+		 * @var BulkCurlTaskOperation[] $operations
+		 * @phpstan-var list<BulkCurlTaskOperation> $operations
+		 */
 		$operations = igbinary_unserialize($this->operations);
 		$results = [];
 		foreach($operations as $op){
 			try{
-				$results[] = Internet::simpleCurl($op["page"], $op["timeout"] ?? 10, $op["extraHeaders"] ?? [], $op["extraOpts"] ?? []);
+				$results[] = Internet::simpleCurl($op->getPage(), $op->getTimeout(), $op->getExtraHeaders(), $op->getExtraOpts());
 			}catch(InternetException $e){
 				$results[] = $e;
 			}

src/scheduler/BulkCurlTaskOperation.php

@@ -0,0 +1,71 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\scheduler;
+
+final class BulkCurlTaskOperation{
+
+	/** @var string */
+	private $page;
+	/** @var float */
+	private $timeout;
+	/**
+	 * @var string[]
+	 * @phpstan-var list<string>
+	 */
+	private $extraHeaders;
+	/**
+	 * @var mixed[]
+	 * @phpstan-var array<int, mixed>
+	 */
+	private $extraOpts;
+
+	/**
+	 * @param string[] $extraHeaders
+	 * @param mixed[] $extraOpts
+	 * @phpstan-param list<string> $extraHeaders
+	 * @phpstan-param array<int, mixed> $extraOpts
+	 */
+	public function __construct(string $page, float $timeout = 10, array $extraHeaders = [], array $extraOpts = []){
+		$this->page = $page;
+		$this->timeout = $timeout;
+		$this->extraHeaders = $extraHeaders;
+		$this->extraOpts = $extraOpts;
+	}
+
+	public function getPage() : string{ return $this->page; }
+
+	public function getTimeout() : float{ return $this->timeout; }
+
+	/**
+	 * @return string[]
+	 * @phpstan-return list<string>
+	 */
+	public function getExtraHeaders() : array{ return $this->extraHeaders; }
+
+	/**
+	 * @return mixed[]
+	 * @phpstan-return array<int, mixed>
+	 */
+	public function getExtraOpts() : array{ return $this->extraOpts; }
+}

tests/phpstan/configs/check-explicit-mixed-baseline.neon

@@ -96,7 +96,7 @@ parameters:
 			path: ../../../src/command/CommandReader.php
 
 		-
-			message: "#^Parameter \\#2 \\$host of class class@anonymous/src/command/defaults/TimingsCommand\\.php\\:130 constructor expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$host of class class@anonymous/src/command/defaults/TimingsCommand\\.php\\:131 constructor expects string, mixed given\\.$#"
 			count: 1
 			path: ../../../src/command/defaults/TimingsCommand.php
 

tests/phpstan/configs/l7-baseline.neon

@@ -511,7 +511,7 @@ parameters:
 			path: ../../../src/command/defaults/TimingsCommand.php
 
 		-
-			message: "#^Parameter \\#4 \\$data of class class@anonymous/src/command/defaults/TimingsCommand\\.php\\:130 constructor expects array\\<string, string\\>, array\\<string, string\\|false\\> given\\.$#"
+			message: "#^Parameter \\#4 \\$data of class class@anonymous/src/command/defaults/TimingsCommand\\.php\\:131 constructor expects array\\<string, string\\>, array\\<string, string\\|false\\> given\\.$#"
 			count: 1
 			path: ../../../src/command/defaults/TimingsCommand.php