From db32da8993efcaacebf1aa476a964abd534b1777 Mon Sep 17 00:00:00 2001 From: Andrew Minion Date: Sat, 24 Oct 2020 13:19:36 -0500 Subject: [PATCH 1/4] allow guzzle 7 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index f0d11fb..8fbcef9 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^7.0", - "guzzlehttp/guzzle": "~6.0" + "guzzlehttp/guzzle": "~6.0 || ~7.0" }, "autoload": { "psr-4": { @@ -26,4 +26,4 @@ } }, "prefer-stable": true -} \ No newline at end of file +} From 9728d8028c2b2941f2cf6a9aeb9dddfb44f48c4b Mon Sep 17 00:00:00 2001 From: Andrew Minion Date: Sat, 24 Oct 2020 17:19:27 -0500 Subject: [PATCH 2/4] fix typo --- src/Actions/ManagesDatabases.php | 422 +++++++++++++++---------------- 1 file changed, 211 insertions(+), 211 deletions(-) diff --git a/src/Actions/ManagesDatabases.php b/src/Actions/ManagesDatabases.php index dd5f1e4..bb4c53f 100644 --- a/src/Actions/ManagesDatabases.php +++ b/src/Actions/ManagesDatabases.php @@ -1,211 +1,211 @@ -post("servers/{$serverId}/databases", $data); - return new Database($database, $this); - } - - - /** - * Get the collection of databases - * - * @param int $serverId - * @param string $search - * @return Database[] - * - */ - public function databases(int $serverId, string $search = '') - { - $query = ['search' => $search]; - $query = array_filter($query, 'strlen'); - - $response = $this->getAllData("servers/{$serverId}/databases", $query); - return $this->transformCollection($response, Database::class); - } - - - /** - * Get a database - * - * @param int $serverId - * @param int $databaseId - * @return Database - * - */ - public function database(int $serverId, int $databaseId) - { - $db = $this->get("servers/{$serverId}/databases/{$databaseId}"); - return new Database($db, $this); - } - - - /** - * Delete a database - * - * @param int $serverId - * @param int $databaseId - * @param bool $alsoDeleteUsers - * @return Database - * - */ - public function deleteDatabase(int $serverId, int $databaseId, bool $alsoDeleteUsers = false) - { - $data = []; - - if ($alsoDeleteUsers === true) { - $data['deleteUser'] = true; - } - - $db = $this->delete("servers/{$serverId}/databases/{$databaseId}", $data); - return new Database($db, $this); - } - - - /** - * Create a database user - * - * @param int $serverId - * @param string $username - * @param string $password - * @return Database - * - */ - public function createDatabaseUser(string $serverId, string $username, string $password) - { - $data = compact('username', 'password'); - - $dbUser = $this->post("servers/{$serverId}/databaseusers", $data); - return new DatabaseUser($dbUser, $this); - } - - - /** - * Get the collection of database users. - * Optionally supply Database ID to show users granted access to that database. - * Optionally supply a search string. - * - * @param int $serverId - * @param int $databaseId - * @param string $search - * @return DatabaseUser[] - * - */ - public function databaseUsers(int $serverId, int $databaseId = null, string $search = '') - { - $query = ['search' => $search]; - $query = array_filter($query, 'strlen'); - - if ($databaseId === null) { - $response = $this->getAllData("servers/{$serverId}/databaseusers", $query); - } else { - $response = $this->getAllData("servers/{$serverId}/databases/{$databaseId}/grant", $query); - } - - return $this->transformCollection($response, DatabaseUser::class); - } - - - /** - * Get a database user - * - * @param int $serverId - * @param int $databaseUserId - * @return DatabaseUser - * - */ - public function databaseUser(int $serverId, int $databaseUserId) - { - $dbUser = $this->get("servers/{$serverId}/databaseusers/{$databaseUserId}"); - return new DatabaseUser($dbUser, $this); - } - - - /** - * Change database user password - * - * @param int $serverId - * @param int $databaseUserId - * @return DatabaseUser - * - */ - public function changeDatabaseUserPassword(int $serverId, int $databaseUserId, string $password) - { - $data = compact('password'); - $dbUser = $this->patch("servers/{$serverId}/databaseusers/{$databaseUserId}", $data); - return new DatabaseUser($dbUser, $this); - } - - - /** - * Delete database user - * - * @param int $serverId - * @param int $databaseUserId - * @return DatabaseUser - * - */ - public function deleteDatabaseUser(int $serverId, int $databaseUserId) - { - $dbUser = $this->delete("servers/{$serverId}/databaseusers/{$databaseUserId}"); - return new DatabaseUser($dbUser, $this); - } - - - /** - * Attach database user to database - * - * @param int $serverId - * @param int $databaseId - * @param int $databaseUserId - * @return DatabaseUser - * - */ - public function attachDatabaseUser(int $serverId, int $databaseId, int $databaseUserId) - { - $data = ['id' => $databaseUserId]; - $dbUser = $this->post("servers/{$serverId}/databases/{$databaseId}/grant", $data); - return new DatabaseUser($dbUser, $this); - } - - - /** - * Revoke database user from database - * - * @param int $serverId - * @param int $databaseId - * @param int $databaseUserId - * @return DatabaseUser - * - */ - public function revokeDatabaseUser(int $serverId, int $databaseId, int $databaseUserId) - { - $data = ['id' => $databaseUserId]; - $dbUser = $this->delete("servers/{$serverId}/databases/{$databaseId}/grant", $data); - return new DatabaseUser($dbUser, $this); - } - - -} +post("servers/{$serverId}/databases", $data); + return new Database($database, $this); + } + + + /** + * Get the collection of databases + * + * @param int $serverId + * @param string $search + * @return Database[] + * + */ + public function databases(int $serverId, string $search = '') + { + $query = ['search' => $search]; + $query = array_filter($query, 'strlen'); + + $response = $this->getAllData("servers/{$serverId}/databases", $query); + return $this->transformCollection($response, Database::class); + } + + + /** + * Get a database + * + * @param int $serverId + * @param int $databaseId + * @return Database + * + */ + public function database(int $serverId, int $databaseId) + { + $db = $this->get("servers/{$serverId}/databases/{$databaseId}"); + return new Database($db, $this); + } + + + /** + * Delete a database + * + * @param int $serverId + * @param int $databaseId + * @param bool $alsoDeleteUsers + * @return Database + * + */ + public function deleteDatabase(int $serverId, int $databaseId, bool $alsoDeleteUsers = false) + { + $data = []; + + if ($alsoDeleteUsers === true) { + $data['deleteUser'] = true; + } + + $db = $this->delete("servers/{$serverId}/databases/{$databaseId}", $data); + return new Database($db, $this); + } + + + /** + * Create a database user + * + * @param int $serverId + * @param string $username + * @param string $password + * @return DatabaseUser + * + */ + public function createDatabaseUser(string $serverId, string $username, string $password) + { + $data = compact('username', 'password'); + + $dbUser = $this->post("servers/{$serverId}/databaseusers", $data); + return new DatabaseUser($dbUser, $this); + } + + + /** + * Get the collection of database users. + * Optionally supply Database ID to show users granted access to that database. + * Optionally supply a search string. + * + * @param int $serverId + * @param int $databaseId + * @param string $search + * @return DatabaseUser[] + * + */ + public function databaseUsers(int $serverId, int $databaseId = null, string $search = '') + { + $query = ['search' => $search]; + $query = array_filter($query, 'strlen'); + + if ($databaseId === null) { + $response = $this->getAllData("servers/{$serverId}/databaseusers", $query); + } else { + $response = $this->getAllData("servers/{$serverId}/databases/{$databaseId}/grant", $query); + } + + return $this->transformCollection($response, DatabaseUser::class); + } + + + /** + * Get a database user + * + * @param int $serverId + * @param int $databaseUserId + * @return DatabaseUser + * + */ + public function databaseUser(int $serverId, int $databaseUserId) + { + $dbUser = $this->get("servers/{$serverId}/databaseusers/{$databaseUserId}"); + return new DatabaseUser($dbUser, $this); + } + + + /** + * Change database user password + * + * @param int $serverId + * @param int $databaseUserId + * @return DatabaseUser + * + */ + public function changeDatabaseUserPassword(int $serverId, int $databaseUserId, string $password) + { + $data = compact('password'); + $dbUser = $this->patch("servers/{$serverId}/databaseusers/{$databaseUserId}", $data); + return new DatabaseUser($dbUser, $this); + } + + + /** + * Delete database user + * + * @param int $serverId + * @param int $databaseUserId + * @return DatabaseUser + * + */ + public function deleteDatabaseUser(int $serverId, int $databaseUserId) + { + $dbUser = $this->delete("servers/{$serverId}/databaseusers/{$databaseUserId}"); + return new DatabaseUser($dbUser, $this); + } + + + /** + * Attach database user to database + * + * @param int $serverId + * @param int $databaseId + * @param int $databaseUserId + * @return DatabaseUser + * + */ + public function attachDatabaseUser(int $serverId, int $databaseId, int $databaseUserId) + { + $data = ['id' => $databaseUserId]; + $dbUser = $this->post("servers/{$serverId}/databases/{$databaseId}/grant", $data); + return new DatabaseUser($dbUser, $this); + } + + + /** + * Revoke database user from database + * + * @param int $serverId + * @param int $databaseId + * @param int $databaseUserId + * @return DatabaseUser + * + */ + public function revokeDatabaseUser(int $serverId, int $databaseId, int $databaseUserId) + { + $data = ['id' => $databaseUserId]; + $dbUser = $this->delete("servers/{$serverId}/databases/{$databaseId}/grant", $data); + return new DatabaseUser($dbUser, $this); + } + + +} From c77dd61b1c51d0c0f7be415f91b9ee2c500de55a Mon Sep 17 00:00:00 2001 From: Andrew Minion Date: Sat, 24 Oct 2020 21:17:41 -0500 Subject: [PATCH 3/4] fix typo --- src/Actions/ManagesWebApps.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Actions/ManagesWebApps.php b/src/Actions/ManagesWebApps.php index 20b9960..b587f2b 100644 --- a/src/Actions/ManagesWebApps.php +++ b/src/Actions/ManagesWebApps.php @@ -19,7 +19,7 @@ trait ManagesWebApps * * @param int $serverId * @param array $data - * @return Server + * @return WebApp * */ public function createWebApp(int $serverId, array $data = []) From b8d6202df15c56b4034d614b2d15040ee67228e3 Mon Sep 17 00:00:00 2001 From: Andrew Minion Date: Tue, 26 Oct 2021 16:39:31 -0500 Subject: [PATCH 4/4] allow PHP 8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8fbcef9..00349bf 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^7.0", + "php": "^7.0|^8.0", "guzzlehttp/guzzle": "~6.0 || ~7.0" }, "autoload": {