Skip to content

Fix Image Parsing Between Object And Array #147

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

Open
DanielWiedemann248 wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −21
Open

Fix Image Parsing Between Object And Array #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 18 additions & 18 deletions src/Models/Images/Image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class Image extends Model implements Resource
public $protection;

/**
* @var array
* @var \stdClass|null
*/
public $labels;

Expand All @@ -158,21 +158,21 @@ class Image extends Model implements Resource
* Image constructor.
*
* @param int $id
* @param string $type
* @param string $status
* @param string $name
* @param string $description
* @param float $imageSize
* @param int $diskSize
* @param string $created
* @param \LKDev\HetznerCloud\Models\Servers\Server $createdFrom
* @param int $boundTo
* @param string $osFlavor
* @param string $osVersion
* @param string|null $type
* @param string|null $status
* @param string|null $name
* @param string|null $description
* @param float|null $imageSize
* @param int|null $diskSize
* @param string|null $created
* @param null $createdFrom
* @param int|null $boundTo
* @param string|null $osFlavor
* @param string|null $osVersion
* @param bool $rapidDeploy
* @param Protection $protection
* @param string $architecture
* @param array $labels
* @param Protection|null $protection
* @param string|null $architecture
* @param \stdClass $labels
* @param string|null $deleted
* @param string|null $deprecated
*/
Expand All @@ -192,7 +192,7 @@ public function __construct(
?bool $rapidDeploy = null,
?Protection $protection = null,
?string $architecture = null,
array $labels = [],
\stdClass $labels = new \stdClass(),
?string $deleted = null,
?string $deprecated = null
) {
Expand Down Expand Up @@ -293,15 +293,15 @@ public function delete(): bool

/**
* @param $input
* @return \LKDev\HetznerCloud\Models\Images\Image|static
* @return \LKDev\HetznerCloud\Models\Images\Image|static|null
*/
public static function parse($input): ?Image
{
if ($input == null) {
return null;
}

return new self($input->id, $input->type, $input->status, $input->name, $input->description, $input->image_size, $input->disk_size, $input->created, $input->created_from, $input->bound_to, $input->os_flavor, $input->os_version, $input->rapid_deploy, Protection::parse($input->protection), $input->architecture ?? null, get_object_vars($input->labels), $input->deleted ?? null, $input->deprecated ?? null);
return new self($input->id, $input->type, $input->status, $input->name, $input->description, $input->image_size, $input->disk_size, $input->created, $input->created_from, $input->bound_to, $input->os_flavor, $input->os_version, $input->rapid_deploy, Protection::parse($input->protection), $input->architecture ?? null, $input->labels, $input->deleted ?? null, $input->deprecated ?? null);
}

public function reload()
Expand Down
6 changes: 3 additions & 3 deletions tests/Unit/Models/Images/ImagesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function testGet()
$this->assertEquals($image->id, 4711);
$this->assertEquals($image->name, 'ubuntu-20.04');

$this->assertEmpty($image->labels);
$this->assertEmpty((array) $image->labels);

$this->assertLastRequestEquals('GET', '/images/4711');
}
Expand All @@ -45,7 +45,7 @@ public function testGetByName()
$this->assertEquals($image->id, 4711);
$this->assertEquals($image->name, 'ubuntu-20.04');

$this->assertEmpty($image->labels);
$this->assertEmpty((array) $image->labels);
$this->assertLastRequestEquals('GET', '/images');
$this->assertLastRequestQueryParametersContains('name', 'ubuntu-20.04');
}
Expand All @@ -57,7 +57,7 @@ public function testGetByNameWithArchitecture()
$this->assertEquals($image->id, 4711);
$this->assertEquals($image->name, 'ubuntu-20.04');

$this->assertEmpty($image->labels);
$this->assertEmpty((array) $image->labels);
$this->assertLastRequestEquals('GET', '/images');
$this->assertLastRequestQueryParametersContains('name', 'ubuntu-20.04');
$this->assertLastRequestQueryParametersContains('architecture', 'arm');
Expand Down
Loading