Merge branch '1.12.x' into 2.0.x

ondrejmirtes · ondrejmirtes · commit d4596bc16368 · 2024-10-14T10:44:35.000+02:00
diff --git a/composer.json b/composer.json
@@ -117,6 +117,9 @@
 			],
 			"nette/di": [
 				"patches/DependencyChecker.patch"
+			],
+			"react/http": [
+				"patches/Sender.patch"
 			]
 		}
 	},
diff --git a/composer.lock b/composer.lock
diff --git a/patches/Sender.patch b/patches/Sender.patch
@@ -0,0 +1,11 @@
+--- src/Io/Sender.php	2024-03-27 18:20:46
++++ src/Io/Sender.php	2024-10-14 10:19:28
+@@ -48,7 +48,7 @@
+      * @param ConnectorInterface|null $connector
+      * @return self
+      */
+-    public static function createFromLoop(LoopInterface $loop, ConnectorInterface $connector = null)
++    public static function createFromLoop(LoopInterface $loop, ?ConnectorInterface $connector = null)
+     {
+         if ($connector === null) {
+             $connector = new Connector(array(), $loop);

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,9 @@`
`117`	`117`	`],`
`118`	`118`	`"nette/di": [`
`119`	`119`	`"patches/DependencyChecker.patch"`
	`120`	`+ ],`
	`121`	`+ "react/http": [`
	`122`	`+ "patches/Sender.patch"`
`120`	`123`	`]`
`121`	`124`	`}`
`122`	`125`	`},`