Model Objects - Fixed bugs caused by numeric strings

+ Made the model objects accept numeric strings instead of being so strict about integer values
This commit is contained in:
Benjamin Blake
2020-03-31 14:00:52 -06:00
parent 27972b95c7
commit 027b430adc
6 changed files with 17 additions and 17 deletions

View File

@ -48,7 +48,7 @@ class Owner extends AbstractApiModel {
if (count($args) >= 2) {
$id = $args[0];
$login = $args[1];
if (!is_int($id)) {
if (!is_numeric($id)) {
$argumentType = gettype($id);
throw new InvalidArgumentException("The \"__construct()\" function requires the 3rd parameter to be of the integer type, but a \"$argumentType\" was passed in");
}
@ -76,7 +76,7 @@ class Owner extends AbstractApiModel {
new static(
$client,
$caller,
isset($map->id) && is_int($map->id) ? $map->id : -1,
isset($map->id) && is_numeric($map->id) ? $map->id : -1,
isset($map->login) && is_string($map->login) ? $map->login : ''
)
)

View File

@ -100,7 +100,7 @@ class Repository extends AbstractApiModel {
if (count($args) >= 2) {
$id = $args[0];
$fullName = $args[1];
if (!is_int($id)) {
if (!is_numeric($id)) {
$argumentType = gettype($id);
throw new InvalidArgumentException("The \"construct()\" function requires the 3rd parameter to be of the integer type, but a \"$argumentType\" was passed in");
}
@ -128,7 +128,7 @@ class Repository extends AbstractApiModel {
new static(
$client,
$caller,
isset($map->id) && is_int($map->id) ? $map->id : -1,
isset($map->id) && is_numeric($map->id) ? $map->id : -1,
isset($map->full_name) && is_string($map->full_name) ? $map->full_name : ''
)
)
@ -138,20 +138,20 @@ class Repository extends AbstractApiModel {
->setDescription(isset($map->description) && is_string($map->description) ? $map->description : '')
->setEmpty(isset($map->empty) && is_bool($map->empty) ? $map->empty : true)
->setFork(isset($map->fork) && is_bool($map->fork) ? $map->fork : false)
->setForksCount(isset($map->forks_count) && is_int($map->forks_count) ? $map->forks_count : 0)
->setForksCount(isset($map->forks_count) && is_numeric($map->forks_count) ? $map->forks_count : 0)
->setHtmlUrl(isset($map->html_url) && is_string($map->html_url) ? new Uri($map->html_url) : null)
->setMirror(isset($map->mirror) && is_bool($map->mirror) ? $map->mirror : false)
->setName(isset($map->name) && is_string($map->name) ? $map->name : '')
->setOpenIssuesCount(isset($map->open_issues_count) && is_int($map->open_issues_count) ? $map->open_issues_count : 0)
->setOpenIssuesCount(isset($map->open_issues_count) && is_numeric($map->open_issues_count) ? $map->open_issues_count : 0)
->setOwner(isset($map->owner) && is_object($map->owner) ? Owner::fromJson($client, null, $map->owner) : null)
->setParent(isset($map->parent) && is_object($map->parent) ? Repository::fromJson($client, null, $map->parent) : null)
->setPermissions(isset($map->permissions) && is_object($map->permissions) ? Permission::fromJson($client, null, $map->permissions) : null)
->setPrivate(isset($map->private) && is_bool($map->private) ? $map->private : false)
->setSize(isset($map->size) && is_int($map->size) ? $map->size : 0)
->setSize(isset($map->size) && is_numeric($map->size) ? $map->size : 0)
->setSshUrl(isset($map->ssh_url) && is_string($map->ssh_url) ? new Uri($map->ssh_url) : null)
->setStarsCount(isset($map->stars_count) && is_int($map->stars_count) ? $map->stars_count : 0)
->setStarsCount(isset($map->stars_count) && is_numeric($map->stars_count) ? $map->stars_count : 0)
->setUpdatedAt(isset($map->updated_at) && is_string($map->updated_at) ? new \DateTime($map->updated_at) : null)
->setWatchersCount(isset($map->watchers_count) && is_int($map->watchers_count) ? $map->watchers_count : 0)
->setWatchersCount(isset($map->watchers_count) && is_numeric($map->watchers_count) ? $map->watchers_count : 0)
->setWebsite(isset($map->website) && is_string($map->website) ? new Uri($map->website) : null);
}

View File

@ -36,7 +36,7 @@ class Tag extends AbstractApiModel {
* Creates a new tag
* @param object $client The Gitea client that originally made the request for this object's data
* @param object|null $caller The object that called this method
* @param int $id The tag identifier
* @param int|string $id The tag identifier
* @param string $name The tag name
*/
public function __construct(Client &$client , ?object $caller, ...$args) {
@ -44,7 +44,7 @@ class Tag extends AbstractApiModel {
if (count($args) >= 2) {
$id = $args[0];
$name = $args[1];
if (!is_int($id)) {
if (!is_numeric($id)) {
$argumentType = gettype($id);
throw new InvalidArgumentException("The \"__construct()\" function requires the 3rd parameter to be of the integer type, but a \"$argumentType\" was passed in");
}
@ -71,7 +71,7 @@ class Tag extends AbstractApiModel {
$newTag = new static(
$client,
$caller,
isset($map->id) && is_int($map->id) ? $map->id : -1,
isset($map->id) && is_numeric($map->id) ? $map->id : -1,
isset($map->name) && is_string($map->name) ? $map->name : ''
);
$newTag->setTarballURL(isset($map->tarball_url) && is_string($map->tarball_url) ? new Uri($map->tarball_url) : null);

View File

@ -32,7 +32,7 @@ class Team implements \JsonSerializable {
* @return static The instance corresponding to the specified JSON map.
*/
static function fromJson(object $map): self {
return (new static(isset($map->id) && is_int($map->id) ? $map->id : -1, isset($map->name) && is_string($map->name) ? $map->name : ''))
return (new static(isset($map->id) && is_numeric($map->id) ? $map->id : -1, isset($map->name) && is_string($map->name) ? $map->name : ''))
->setDescription(isset($map->description) && is_string($map->description) ? $map->description : '')
->setPermission(isset($map->permission) && is_string($map->permission) ? $map->permission : TeamPermission::none);
}

View File

@ -35,10 +35,10 @@ class TrackedTime implements \JsonSerializable {
* @return static The instance corresponding to the specified JSON map.
*/
static function fromJson(object $map): self {
return (new static(isset($map->id) && is_int($map->id) ? $map->id : -1, isset($map->time) && is_int($map->time) ? $map->time : 0))
return (new static(isset($map->id) && is_numeric($map->id) ? $map->id : -1, isset($map->time) && is_numeric($map->time) ? $map->time : 0))
->setCreatedAt(isset($map->created) && is_string($map->created) ? new \DateTime($map->created) : null)
->setIssueId(isset($map->issue_id) && is_int($map->issue_id) ? $map->issue_id : -1)
->setUserId(isset($map->user_id) && is_int($map->user_id) ? $map->user_id : -1);
->setIssueId(isset($map->issue_id) && is_numeric($map->issue_id) ? $map->issue_id : -1)
->setUserId(isset($map->user_id) && is_numeric($map->user_id) ? $map->user_id : -1);
}
/**

View File

@ -41,7 +41,7 @@ class User implements \JsonSerializable {
* @return static The instance corresponding to the specified JSON map.
*/
static function fromJson(object $map): self {
return (new static(isset($map->id) && is_int($map->id) ? $map->id : -1, isset($map->login) && is_string($map->login) ? $map->login : ''))
return (new static(isset($map->id) && is_numeric($map->id) ? $map->id : -1, isset($map->login) && is_string($map->login) ? $map->login : ''))
->setAvatarUrl(isset($map->avatar_url) && is_string($map->avatar_url) ? new Uri($map->avatar_url) : null)
->setEmail(isset($map->email) && is_string($map->email) ? mb_strtolower($map->email) : '')
->setFullName(isset($map->full_name) && is_string($map->full_name) ? $map->full_name : '')