Skip to content

Fixed containerName was not set #208

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

Merged
merged 1 commit into from
Feb 8, 2018
Merged

Fixed containerName was not set #208

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
10 changes: 9 additions & 1 deletion src/ObjectStore/v1/Models/Container.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,15 @@ public function populateFromResponse(ResponseInterface $response): self
public function listObjects(array $options = [], callable $mapFn = null): \Generator
{
$options = array_merge($options, ['name' => $this->name, 'format' => 'json']);
return $this->model(StorageObject::class)->enumerate($this->api->getContainer(), $options, $mapFn);

$appendContainerNameFn = function (StorageObject $resource) use ($mapFn) {
$resource->containerName = $this->name;
if ($mapFn) {
call_user_func_array($mapFn, [&$resource]);
}
};

return $this->model(StorageObject::class)->enumerate($this->api->getContainer(), $options, $appendContainerNameFn);
}

/**
Expand Down
19 changes: 17 additions & 2 deletions src/ObjectStore/v1/Models/StorageObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace OpenStack\ObjectStore\v1\Models;

use GuzzleHttp\Psr7\Uri;
use OpenStack\Common\Resource\Alias;
use OpenStack\Common\Transport\Utils;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\StreamInterface;
Expand Down Expand Up @@ -32,7 +33,7 @@ class StorageObject extends OperatorResource implements Creatable, Deletable, Ha
/** @var string */
public $contentType;

/** @var int */
/** @var \DateTimeImmutable */
public $contentLength;

/** @var string */
Expand All @@ -42,7 +43,21 @@ class StorageObject extends OperatorResource implements Creatable, Deletable, Ha
public $metadata;

protected $markerKey = 'name';
protected $aliases = ['bytes' => 'contentLength'];

protected $aliases = [
'bytes' => 'contentLength',
'content_type' => 'contentType',
];

/**
* @inheritdoc
*/
protected function getAliases(): array
{
return parent::getAliases() + [
'last_modified' => new Alias('lastModified', \DateTimeImmutable::class),
];
}

/**
* {@inheritdoc}
Expand Down