Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
TLingC committed Oct 5, 2020
2 parents ae0b585 + f05579b commit ff6d87b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/Actions/ManagesServers.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ public function server(int $serverId, array $includes = ['allocations'])
/**
* Get a server instance by external id.
*
* @param int $externalId
* @param array $includes
* @param string $externalId
* @param array $includes
*
* @return Server
*/
public function serverEx(int $externalId, array $includes = ['allocations'])
public function serverEx(string $externalId, array $includes = ['allocations'])
{
return $this->get("api/application/servers/external/$externalId".$this->include($includes));
}
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/Egg.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class Egg extends Resource
*
* @var string
*/
public $docker_image;
public $dockerImage;

/**
* The config of the egg.
Expand Down

0 comments on commit ff6d87b

Please sign in to comment.