Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"variables": {
"${LATEST}": "3.356.12"
"${LATEST}": "3.356.13"
},
"endpoints": "https://raw.githubusercontent.com/aws/aws-sdk-php/${LATEST}/src/data/endpoints.json",
"services": {
Expand Down
4 changes: 4 additions & 0 deletions src/Service/S3/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## NOT RELEASED

### Added

- AWS api-change: This release includes backward compatibility work on the "Expires" parameter.

## 2.10.0

### Added
Expand Down
2 changes: 1 addition & 1 deletion src/Service/S3/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.10-dev"
"dev-master": "2.11-dev"
}
}
}
14 changes: 7 additions & 7 deletions src/Service/S3/src/Input/CopyObjectRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ final class CopyObjectRequest extends Input
/**
* The date and time at which the object is no longer cacheable.
*
* @var \DateTimeImmutable|null
* @var string|null
*/
private $expires;

Expand Down Expand Up @@ -713,7 +713,7 @@ final class CopyObjectRequest extends Input
* CopySourceIfModifiedSince?: null|\DateTimeImmutable|string,
* CopySourceIfNoneMatch?: null|string,
* CopySourceIfUnmodifiedSince?: null|\DateTimeImmutable|string,
* Expires?: null|\DateTimeImmutable|string,
* Expires?: null|string,
* GrantFullControl?: null|string,
* GrantRead?: null|string,
* GrantReadACP?: null|string,
Expand Down Expand Up @@ -759,7 +759,7 @@ public function __construct(array $input = [])
$this->copySourceIfModifiedSince = !isset($input['CopySourceIfModifiedSince']) ? null : ($input['CopySourceIfModifiedSince'] instanceof \DateTimeImmutable ? $input['CopySourceIfModifiedSince'] : new \DateTimeImmutable($input['CopySourceIfModifiedSince']));
$this->copySourceIfNoneMatch = $input['CopySourceIfNoneMatch'] ?? null;
$this->copySourceIfUnmodifiedSince = !isset($input['CopySourceIfUnmodifiedSince']) ? null : ($input['CopySourceIfUnmodifiedSince'] instanceof \DateTimeImmutable ? $input['CopySourceIfUnmodifiedSince'] : new \DateTimeImmutable($input['CopySourceIfUnmodifiedSince']));
$this->expires = !isset($input['Expires']) ? null : ($input['Expires'] instanceof \DateTimeImmutable ? $input['Expires'] : new \DateTimeImmutable($input['Expires']));
$this->expires = $input['Expires'] ?? null;
$this->grantFullControl = $input['GrantFullControl'] ?? null;
$this->grantRead = $input['GrantRead'] ?? null;
$this->grantReadAcp = $input['GrantReadACP'] ?? null;
Expand Down Expand Up @@ -805,7 +805,7 @@ public function __construct(array $input = [])
* CopySourceIfModifiedSince?: null|\DateTimeImmutable|string,
* CopySourceIfNoneMatch?: null|string,
* CopySourceIfUnmodifiedSince?: null|\DateTimeImmutable|string,
* Expires?: null|\DateTimeImmutable|string,
* Expires?: null|string,
* GrantFullControl?: null|string,
* GrantRead?: null|string,
* GrantReadACP?: null|string,
Expand Down Expand Up @@ -942,7 +942,7 @@ public function getExpectedSourceBucketOwner(): ?string
return $this->expectedSourceBucketOwner;
}

public function getExpires(): ?\DateTimeImmutable
public function getExpires(): ?string
{
return $this->expires;
}
Expand Down Expand Up @@ -1127,7 +1127,7 @@ public function request(): Request
$headers['x-amz-copy-source-if-unmodified-since'] = $this->copySourceIfUnmodifiedSince->setTimezone(new \DateTimeZone('GMT'))->format(\DateTimeInterface::RFC7231);
}
if (null !== $this->expires) {
$headers['Expires'] = $this->expires->setTimezone(new \DateTimeZone('GMT'))->format(\DateTimeInterface::RFC7231);
$headers['Expires'] = $this->expires;
}
if (null !== $this->grantFullControl) {
$headers['x-amz-grant-full-control'] = $this->grantFullControl;
Expand Down Expand Up @@ -1392,7 +1392,7 @@ public function setExpectedSourceBucketOwner(?string $value): self
return $this;
}

public function setExpires(?\DateTimeImmutable $value): self
public function setExpires(?string $value): self
{
$this->expires = $value;

Expand Down
14 changes: 7 additions & 7 deletions src/Service/S3/src/Input/CreateMultipartUploadRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ final class CreateMultipartUploadRequest extends Input
/**
* The date and time at which the object is no longer cacheable.
*
* @var \DateTimeImmutable|null
* @var string|null
*/
private $expires;

Expand Down Expand Up @@ -552,7 +552,7 @@ final class CreateMultipartUploadRequest extends Input
* ContentEncoding?: null|string,
* ContentLanguage?: null|string,
* ContentType?: null|string,
* Expires?: null|\DateTimeImmutable|string,
* Expires?: null|string,
* GrantFullControl?: null|string,
* GrantRead?: null|string,
* GrantReadACP?: null|string,
Expand Down Expand Up @@ -588,7 +588,7 @@ public function __construct(array $input = [])
$this->contentEncoding = $input['ContentEncoding'] ?? null;
$this->contentLanguage = $input['ContentLanguage'] ?? null;
$this->contentType = $input['ContentType'] ?? null;
$this->expires = !isset($input['Expires']) ? null : ($input['Expires'] instanceof \DateTimeImmutable ? $input['Expires'] : new \DateTimeImmutable($input['Expires']));
$this->expires = $input['Expires'] ?? null;
$this->grantFullControl = $input['GrantFullControl'] ?? null;
$this->grantRead = $input['GrantRead'] ?? null;
$this->grantReadAcp = $input['GrantReadACP'] ?? null;
Expand Down Expand Up @@ -624,7 +624,7 @@ public function __construct(array $input = [])
* ContentEncoding?: null|string,
* ContentLanguage?: null|string,
* ContentType?: null|string,
* Expires?: null|\DateTimeImmutable|string,
* Expires?: null|string,
* GrantFullControl?: null|string,
* GrantRead?: null|string,
* GrantReadACP?: null|string,
Expand Down Expand Up @@ -720,7 +720,7 @@ public function getExpectedBucketOwner(): ?string
return $this->expectedBucketOwner;
}

public function getExpires(): ?\DateTimeImmutable
public function getExpires(): ?string
{
return $this->expires;
}
Expand Down Expand Up @@ -867,7 +867,7 @@ public function request(): Request
$headers['Content-Type'] = $this->contentType;
}
if (null !== $this->expires) {
$headers['Expires'] = $this->expires->setTimezone(new \DateTimeZone('GMT'))->format(\DateTimeInterface::RFC7231);
$headers['Expires'] = $this->expires;
}
if (null !== $this->grantFullControl) {
$headers['x-amz-grant-full-control'] = $this->grantFullControl;
Expand Down Expand Up @@ -1067,7 +1067,7 @@ public function setExpectedBucketOwner(?string $value): self
return $this;
}

public function setExpires(?\DateTimeImmutable $value): self
public function setExpires(?string $value): self
{
$this->expires = $value;

Expand Down
14 changes: 7 additions & 7 deletions src/Service/S3/src/Input/PutObjectRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ final class PutObjectRequest extends Input
*
* [^1]: https://www.rfc-editor.org/rfc/rfc7234#section-5.3
*
* @var \DateTimeImmutable|null
* @var string|null
*/
private $expires;

Expand Down Expand Up @@ -633,7 +633,7 @@ final class PutObjectRequest extends Input
* ChecksumCRC64NVME?: null|string,
* ChecksumSHA1?: null|string,
* ChecksumSHA256?: null|string,
* Expires?: null|\DateTimeImmutable|string,
* Expires?: null|string,
* IfMatch?: null|string,
* IfNoneMatch?: null|string,
* GrantFullControl?: null|string,
Expand Down Expand Up @@ -679,7 +679,7 @@ public function __construct(array $input = [])
$this->checksumCrc64Nvme = $input['ChecksumCRC64NVME'] ?? null;
$this->checksumSha1 = $input['ChecksumSHA1'] ?? null;
$this->checksumSha256 = $input['ChecksumSHA256'] ?? null;
$this->expires = !isset($input['Expires']) ? null : ($input['Expires'] instanceof \DateTimeImmutable ? $input['Expires'] : new \DateTimeImmutable($input['Expires']));
$this->expires = $input['Expires'] ?? null;
$this->ifMatch = $input['IfMatch'] ?? null;
$this->ifNoneMatch = $input['IfNoneMatch'] ?? null;
$this->grantFullControl = $input['GrantFullControl'] ?? null;
Expand Down Expand Up @@ -725,7 +725,7 @@ public function __construct(array $input = [])
* ChecksumCRC64NVME?: null|string,
* ChecksumSHA1?: null|string,
* ChecksumSHA256?: null|string,
* Expires?: null|\DateTimeImmutable|string,
* Expires?: null|string,
* IfMatch?: null|string,
* IfNoneMatch?: null|string,
* GrantFullControl?: null|string,
Expand Down Expand Up @@ -857,7 +857,7 @@ public function getExpectedBucketOwner(): ?string
return $this->expectedBucketOwner;
}

public function getExpires(): ?\DateTimeImmutable
public function getExpires(): ?string
{
return $this->expires;
}
Expand Down Expand Up @@ -1046,7 +1046,7 @@ public function request(): Request
$headers['x-amz-checksum-sha256'] = $this->checksumSha256;
}
if (null !== $this->expires) {
$headers['Expires'] = $this->expires->setTimezone(new \DateTimeZone('GMT'))->format(\DateTimeInterface::RFC7231);
$headers['Expires'] = $this->expires;
}
if (null !== $this->ifMatch) {
$headers['If-Match'] = $this->ifMatch;
Expand Down Expand Up @@ -1292,7 +1292,7 @@ public function setExpectedBucketOwner(?string $value): self
return $this;
}

public function setExpires(?\DateTimeImmutable $value): self
public function setExpires(?string $value): self
{
$this->expires = $value;

Expand Down
6 changes: 3 additions & 3 deletions src/Service/S3/src/Result/GetObjectOutput.php
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ class GetObjectOutput extends Result
/**
* The date and time at which the object is no longer cacheable.
*
* @var \DateTimeImmutable|null
* @var string|null
*/
private $expires;

Expand Down Expand Up @@ -499,7 +499,7 @@ public function getExpiration(): ?string
return $this->expiration;
}

public function getExpires(): ?\DateTimeImmutable
public function getExpires(): ?string
{
$this->initialize();

Expand Down Expand Up @@ -678,7 +678,7 @@ protected function populateResult(Response $response): void
$this->contentLanguage = $headers['content-language'][0] ?? null;
$this->contentRange = $headers['content-range'][0] ?? null;
$this->contentType = $headers['content-type'][0] ?? null;
$this->expires = isset($headers['expires'][0]) ? new \DateTimeImmutable($headers['expires'][0]) : null;
$this->expires = $headers['expires'][0] ?? null;
$this->websiteRedirectLocation = $headers['x-amz-website-redirect-location'][0] ?? null;
$this->serverSideEncryption = $headers['x-amz-server-side-encryption'][0] ?? null;
$this->sseCustomerAlgorithm = $headers['x-amz-server-side-encryption-customer-algorithm'][0] ?? null;
Expand Down
6 changes: 3 additions & 3 deletions src/Service/S3/src/Result/HeadObjectOutput.php
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ class HeadObjectOutput extends Result
/**
* The date and time at which the object is no longer cacheable.
*
* @var \DateTimeImmutable|null
* @var string|null
*/
private $expires;

Expand Down Expand Up @@ -556,7 +556,7 @@ public function getExpiration(): ?string
return $this->expiration;
}

public function getExpires(): ?\DateTimeImmutable
public function getExpires(): ?string
{
$this->initialize();

Expand Down Expand Up @@ -736,7 +736,7 @@ protected function populateResult(Response $response): void
$this->contentLanguage = $headers['content-language'][0] ?? null;
$this->contentType = $headers['content-type'][0] ?? null;
$this->contentRange = $headers['content-range'][0] ?? null;
$this->expires = isset($headers['expires'][0]) ? new \DateTimeImmutable($headers['expires'][0]) : null;
$this->expires = $headers['expires'][0] ?? null;
$this->websiteRedirectLocation = $headers['x-amz-website-redirect-location'][0] ?? null;
$this->serverSideEncryption = $headers['x-amz-server-side-encryption'][0] ?? null;
$this->sseCustomerAlgorithm = $headers['x-amz-server-side-encryption-customer-algorithm'][0] ?? null;
Expand Down
6 changes: 3 additions & 3 deletions src/Service/S3/src/S3Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ public function completeMultipartUpload($input): CompleteMultipartUploadOutput
* CopySourceIfModifiedSince?: null|\DateTimeImmutable|string,
* CopySourceIfNoneMatch?: null|string,
* CopySourceIfUnmodifiedSince?: null|\DateTimeImmutable|string,
* Expires?: null|\DateTimeImmutable|string,
* Expires?: null|string,
* GrantFullControl?: null|string,
* GrantRead?: null|string,
* GrantReadACP?: null|string,
Expand Down Expand Up @@ -913,7 +913,7 @@ public function createBucket($input): CreateBucketOutput
* ContentEncoding?: null|string,
* ContentLanguage?: null|string,
* ContentType?: null|string,
* Expires?: null|\DateTimeImmutable|string,
* Expires?: null|string,
* GrantFullControl?: null|string,
* GrantRead?: null|string,
* GrantReadACP?: null|string,
Expand Down Expand Up @@ -2627,7 +2627,7 @@ public function putBucketTagging($input): Result
* ChecksumCRC64NVME?: null|string,
* ChecksumSHA1?: null|string,
* ChecksumSHA256?: null|string,
* Expires?: null|\DateTimeImmutable|string,
* Expires?: null|string,
* IfMatch?: null|string,
* IfNoneMatch?: null|string,
* GrantFullControl?: null|string,
Expand Down
Loading