PHP7.4-Compatibility: TypeContainer::addItemToOpenedContainer() putting optional parameter after the required one

mchekin · mchekin · commit 974a42b78fc9 · 2021-03-13T12:27:32.000+01:00
diff --git a/core/types/container.type.php b/core/types/container.type.php
@@ -71,7 +71,7 @@ public function addItem($client = false, UObject $UObject, $position = false, $n
         }
 
         if (!$noUpdate) {
-            $this->addItemToOpenedContainer($client, $UObject);
+            $this->addItemToOpenedContainer($UObject, $client);
             // $this->renderItems($client);
         }
 
@@ -110,7 +110,7 @@ public function drawContainer($client) {
         return true;
     }
 
-    public function addItemToOpenedContainer($client = false, UObject $instance) {
+    public function addItemToOpenedContainer(UObject $instance, $client = false) {
         $packet = new packet_0x25($client, $instance);
         $packet->send();
     }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function addItem($client = false, UObject $UObject, $position = false, $n`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`if (!$noUpdate) {`
`74`		`- $this->addItemToOpenedContainer($client, $UObject);`
	`74`	`+ $this->addItemToOpenedContainer($UObject, $client);`
`75`	`75`	`// $this->renderItems($client);`
`76`	`76`	`}`
`77`	`77`
`@@ -110,7 +110,7 @@ public function drawContainer($client) {`
`110`	`110`	`return true;`
`111`	`111`	`}`
`112`	`112`
`113`		`- public function addItemToOpenedContainer($client = false, UObject $instance) {`
	`113`	`+ public function addItemToOpenedContainer(UObject $instance, $client = false) {`
`114`	`114`	`$packet = new packet_0x25($client, $instance);`
`115`	`115`	`$packet->send();`
`116`	`116`	`}`