rename post to http_post, get to http_get

simonLeary42 · simonLeary42 · commit 22b8b41d4c5a · 2025-04-29T16:09:08.000-04:00
diff --git a/test/functional/AccountDeletionRequestTest.php b/test/functional/AccountDeletionRequestTest.php
@@ -38,12 +38,12 @@ public function testRequestAccountDeletionUserHasNoGroups()
         $this->assertEmpty($USER->getGroups());
         $this->assertNumberAccountDeletionRequests(0);
         try {
-            post(
+            http_post(
                 __DIR__ . "/../../webroot/panel/account.php",
                 ["form_type" => "account_deletion_request"]
             );
             $this->assertNumberAccountDeletionRequests(1);
-            post(
+            http_post(
                 __DIR__ . "/../../webroot/panel/account.php",
                 ["form_type" => "account_deletion_request"]
             );
@@ -62,7 +62,7 @@ public function testRequestAccountDeletionUserHasGroup()
         $this->assertNotEmpty($USER->getGroups());
         $this->assertNumberAccountDeletionRequests(0);
         try {
-            post(
+            http_post(
                 __DIR__ . "/../../webroot/panel/account.php",
                 ["form_type" => "account_deletion_request"]
             );
diff --git a/test/functional/LoginShellSetTest.php b/test/functional/LoginShellSetTest.php
@@ -44,7 +44,7 @@ public function testSetLoginShell(string $shell): void
         if (!$this->isShellValid($shell)) {
             $this->expectException("Exception");
         }
-        post(
+        http_post(
             __DIR__ . "/../../webroot/panel/account.php",
             ["form_type" => "loginshell", "shellSelect" => $shell]
         );
diff --git a/test/functional/PiBecomeRequestTest.php b/test/functional/PiBecomeRequestTest.php
@@ -38,12 +38,12 @@ public function testRequestBecomePi()
         $this->assertFalse($USER->isPI());
         $this->assertNumberPiBecomeRequests(0);
         try {
-            post(
+            http_post(
                 __DIR__ . "/../../webroot/panel/account.php",
                 ["form_type" => "pi_request"]
             );
             $this->assertNumberPiBecomeRequests(1);
-            post(
+            http_post(
                 __DIR__ . "/../../webroot/panel/account.php",
                 ["form_type" => "pi_request"]
             );
@@ -61,7 +61,7 @@ public function testRequestBecomePiUserRequestedAccountDeletion()
         $this->assertNumberPiBecomeRequests(0);
         $this->assertTrue($SQL->accDeletionRequestExists($USER->getUID()));
         try {
-            post(
+            http_post(
                 __DIR__ . "/../../webroot/panel/account.php",
                 ["form_type" => "pi_request"]
             );
diff --git a/test/functional/SSHKeyAddTest.php b/test/functional/SSHKeyAddTest.php
@@ -9,7 +9,7 @@ class SSHKeyAddTest extends TestCase
 {
     private function addSshKeysPaste(array $keys): void {
         foreach ($keys as $key) {
-            post(
+            http_post(
                 __DIR__ . "/../../webroot/panel/account.php",
                 [
                     "form_type" => "addKey",
@@ -27,7 +27,7 @@ private function addSshKeysImport(array $keys): void {
             fwrite($tmp, $key);
             $_FILES["keyfile"] = ["tmp_name" => $tmp_path];
             try {
-                post(
+                http_post(
                     __DIR__ . "/../../webroot/panel/account.php",
                     ["form_type" => "addKey", "add_type" => "import"]
                 );
@@ -40,7 +40,7 @@ private function addSshKeysImport(array $keys): void {
 
     private function addSshKeysGenerate(array $keys): void {
         foreach ($keys as $key) {
-            post(
+            http_post(
                 __DIR__ . "/../../webroot/panel/account.php",
                 [
                     "form_type" => "addKey",
@@ -57,7 +57,7 @@ private function addSshKeysGithub(array $keys): void {
         $GITHUB = $this->createMock(UnityGithub::class);
         $GITHUB->method("getSshPublicKeys")->willReturn($keys);
         try {
-            post(
+            http_post(
                 __DIR__ . "/../../webroot/panel/account.php",
                 [
                     "form_type" => "addKey",
diff --git a/test/functional/SSHKeyDeleteTest.php b/test/functional/SSHKeyDeleteTest.php
@@ -13,7 +13,7 @@ public static function setUpBeforeClass(): void{
     }
 
     private function deleteKey(string $index): void {
-        post(
+        http_post(
             __DIR__ . "/../../webroot/panel/account.php",
             ["form_type" => "delKey", "delIndex" => $index]
         );
diff --git a/test/functional/ViewAsUserTest.php b/test/functional/ViewAsUserTest.php
@@ -16,7 +16,7 @@ public function testViewAsUser()
         $originalUid = $USER->getUID();
         $this->assertNotEquals($newUid, $originalUid);
         try {
-            post(
+            http_post(
                 __DIR__ . "/../../webroot/admin/user-mgmt.php",
                 [
                     "form_name" => "viewAsUser",
@@ -28,12 +28,12 @@ public function testViewAsUser()
         // redirect means that php process dies and user's browser will initiate a new one
         // this makes `require_once autoload.php` run again and init.php changes $USER
         session_write_close();
-        get(__DIR__ . "/../../resources/init.php");
+        http_get(__DIR__ . "/../../resources/init.php");
         // now we should be new user
         $this->assertEquals($newUid, $USER->getUID());
         $this->assertTrue($_SESSION["user_exists"]);
         try {
-            post(
+            http_post(
                 __DIR__ . "/../../resources/templates/header.php",
                 ["form_name" => "clearView"],
             );
@@ -42,7 +42,7 @@ public function testViewAsUser()
         // redirect means that php process dies and user's browser will initiate a new one
         // this makes `require_once autoload.php` run again and init.php changes $USER
         session_write_close();
-        get(__DIR__ . "/../../resources/init.php");
+        http_get(__DIR__ . "/../../resources/init.php");
         // now we should be back to original user
         $this->assertEquals($originalUid, $USER->getUID());
     }
diff --git a/test/phpunit-bootstrap.php b/test/phpunit-bootstrap.php
@@ -69,7 +69,7 @@ function switchUser(
     assert(!is_null($USER));
 }
 
-function post(string $phpfile, array $post_data): void
+function http_post(string $phpfile, array $post_data): void
 {
     global $CONFIG, $REDIS, $LDAP, $SQL, $MAILER, $WEBHOOK, $GITHUB, $SITE, $SSO, $OPERATOR, $USER, $SEND_PIMESG_TO_ADMINS, $LOC_HEADER, $LOC_FOOTER;
     $_SERVER["REQUEST_METHOD"] = "POST";

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function testSetLoginShell(string $shell): void`
`44`	`44`	`if (!$this->isShellValid($shell)) {`
`45`	`45`	`$this->expectException("Exception");`
`46`	`46`	`}`
`47`		`- post(`
	`47`	`+ http_post(`
`48`	`48`	`__DIR__ . "/../../webroot/panel/account.php",`
`49`	`49`	`["form_type" => "loginshell", "shellSelect" => $shell]`
`50`	`50`	`);`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public static function setUpBeforeClass(): void{`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`private function deleteKey(string $index): void {`
`16`		`- post(`
	`16`	`+ http_post(`
`17`	`17`	`__DIR__ . "/../../webroot/panel/account.php",`
`18`	`18`	`["form_type" => "delKey", "delIndex" => $index]`
`19`	`19`	`);`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ function switchUser(`
`69`	`69`	`assert(!is_null($USER));`
`70`	`70`	`}`
`71`	`71`
`72`		`-function post(string $phpfile, array $post_data): void`
	`72`	`+function http_post(string $phpfile, array $post_data): void`
`73`	`73`	`{`
`74`	`74`	`global $CONFIG, $REDIS, $LDAP, $SQL, $MAILER, $WEBHOOK, $GITHUB, $SITE, $SSO, $OPERATOR, $USER, $SEND_PIMESG_TO_ADMINS, $LOC_HEADER, $LOC_FOOTER;`
`75`	`75`	`$_SERVER["REQUEST_METHOD"] = "POST";`