Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix get() method not respecting perPage() definitions #61

Merged
merged 4 commits into from
Mar 22, 2022
Merged

Fix get() method not respecting perPage() definitions #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4bfd95e
Fix get not respecting perPage() method
miguilimzero Mar 18, 2022
f7e2a0a
Add page() for Redirect
miguilimzero Mar 18, 2022
1a3a4f8
Fix non-empty ID verification
miguilimzero Mar 20, 2022
b939531
Fix comparision since 0 is false and can be an ID
miguilimzero Mar 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Ploi/Resources/AuthUser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ public function get(?int $id = null): Response

$this->buildEndpoint();

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function create(string $name, string $password): Response
Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/Certificate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ public function get(int $id = null): Response
// Make sure the endpoint is built
$this->buildEndpoint();

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function create(string $certificate, string $type = 'letsencrypt'): Response
Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/Cronjob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ public function get(int $id = null): Response
// Make sure the endpoint is built
$this->buildEndpoint();

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function create(string $command, string $frequency, string $user = 'ploi'): Response
Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/Daemon.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ public function get(int $id = null): Response
// Make sure the endpoint is built
$this->buildEndpoint();

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function create(string $command, string $systemUser, int $processes, ?string $directory = null): Response
Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ public function get(int $id = null): Response
// Make sure the endpoint is built
$this->buildEndpoint();

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function create(string $name, string $user, string $password, $description = null, $siteId = null): Response
Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/DatabaseBackup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ public function get(int $id = null): Response
// Make sure the endpoint is built
$this->buildEndpoint();

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function create(
Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/DatabaseUser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ public function get(int $id = null): Response

$this->buildEndpoint();

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function create(string $user, string $password): Response
Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/Incident.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ public function get(?int $id = null): Response

$this->buildEndpoint();

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function create(string $title, string $description, string $severity): Response
Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/Insight.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ public function get(?int $id = null): Response

$this->buildEndpoint();

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function detail(?int $id = null): Response
Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/NetworkRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ public function get(int $id = null): Response
// Make sure the endpoint is built
$this->buildEndpoint();

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function create(string $name, int $port, string $type = 'tcp', ?string $fromIpAddress = null, string $ruleType = 'allow'): Response
Expand Down
3 changes: 1 addition & 2 deletions src/Ploi/Resources/Opcache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
namespace Ploi\Resources;

use Ploi\Http\Response;
use Ploi\Traits\HasPagination;

class Opcache extends Resource
{
private $server;

public function __construct(Server $server, int $id = null)
public function __construct(Server $server, ?int $id = null)
{
parent::__construct($server->getPloi(), $id);

Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/Queue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ public function get(int $id = null): Response
// Make sure the endpoint is built
$this->buildEndpoint();

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function create(
Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/Redirect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ public function get(int $id = null): Response
// Make sure the endpoint is built
$this->buildEndpoint();

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function create(string $redirectFrom, string $redirectTo, $type = 'redirect'): Response
Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/Script.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ public function get(int $id = null): Response
$this->setEndpoint($this->getEndpoint() . '/' . $this->getId());
}

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function create(
Expand Down
9 changes: 7 additions & 2 deletions src/Ploi/Resources/Server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function __construct(Ploi $ploi = null, int $id = null)

public function buildEndpoint(string $path = null): string
{
$base = 'servers';
$base = $this->endpoint;

if ($this->getId()) {
$base = "{$base}/{$this->getId()}";
Expand Down Expand Up @@ -51,7 +51,12 @@ public function get(int $id = null): Response
$this->setId($id);
}

return $this->callApi();
// This method do not need the special callApi() method on pagination
// Since its a the simple get of the servers using the $this->endpoint url

return (is_null($this->getId()))
? $this->page()
: $this->callApi();
}

public function delete(int $id = null): Response
Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/Site.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ public function get(int $id = null)
// Make sure the endpoint is built
$this->buildEndpoint();

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function getServer(): Server
Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/SshKey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ public function get(?int $id = null): Response

$this->buildEndpoint();

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function create(string $name, string $key, ?string $systemUser = null): Response
Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/StatusPage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ public function get(?int $id = null): Response

$this->buildEndpoint();

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function incident(?int $id = null): Incident
Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/SystemUser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ public function get(int $id = null): Response
// Make sure the endpoint is built
$this->buildEndpoint();

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}

public function create(string $name, bool $sudo = false): Response
Expand Down
4 changes: 3 additions & 1 deletion src/Ploi/Resources/WebserverTemplate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ public function get(?int $id = null): Response
$this->setEndpoint($this->getEndpoint() . '/' . $this->getId());
}

return $this->getPloi()->makeAPICall($this->getEndpoint());
return (is_null($this->getId()))
? $this->page()
: $this->getPloi()->makeAPICall($this->getEndpoint());
}
}