Skip to content
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.

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

Enhancement dependency review #3

Open
wants to merge 67 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
40a0c8a
Revert "IMDS dualstack support (#2277)"
SamRemis Aug 3, 2021
fc2854e
Merge remote-tracking branch 'upstream/master'
SamRemis Aug 4, 2021
c538c98
merge
SamRemis Aug 6, 2021
530dea0
merge
SamRemis Aug 10, 2021
056bd46
Merge remote-tracking branch 'upstream/master'
SamRemis Sep 3, 2021
ed9796c
Merge remote-tracking branch 'upstream/master'
SamRemis Sep 3, 2021
e818536
Merge remote-tracking branch 'upstream/master'
SamRemis Sep 8, 2021
e29a218
Merge remote-tracking branch 'upstream/master'
SamRemis Sep 28, 2021
5319955
merge
SamRemis Oct 12, 2021
d36bb84
merge
SamRemis Oct 21, 2021
930ff7e
merge
SamRemis Oct 26, 2021
c40f9a8
Merge remote-tracking branch 'upstream/master'
SamRemis Nov 5, 2021
dfdac4e
Merge remote-tracking branch 'upstream/master'
SamRemis Nov 10, 2021
1d52190
Merge remote-tracking branch 'upstream/master'
SamRemis Nov 16, 2021
02c9847
Merge remote-tracking branch 'upstream/master'
SamRemis Dec 2, 2021
c13eb8e
Merge remote-tracking branch 'upstream/master'
SamRemis Dec 9, 2021
cdf6b29
merge
SamRemis Dec 15, 2021
754f1a2
merge
SamRemis Jan 25, 2022
928722f
merge
SamRemis Jan 28, 2022
b4ea7d8
merge
SamRemis Feb 4, 2022
08dfebf
Revert "Enhancement: S3 StreamWrapper error handling (#2372)"
SamRemis Feb 4, 2022
99dbfd4
Merge remote-tracking branch 'upstream/master'
SamRemis Feb 9, 2022
211eaaa
Merge remote-tracking branch 'upstream/master'
SamRemis Feb 10, 2022
4955db2
merge
SamRemis Feb 18, 2022
b6ef7a9
merge
SamRemis Feb 24, 2022
eeca3e8
merge
SamRemis Feb 28, 2022
17b5fcb
merge
SamRemis Mar 21, 2022
f9abc3a
Merge remote-tracking branch 'upstream/master'
SamRemis Mar 30, 2022
bbdcf16
Merge remote-tracking branch 'upstream/master'
aws-sdk-php-automation Jun 17, 2022
d1c75dc
Merge remote-tracking branch 'upstream/master'
aws-sdk-php-automation Jun 23, 2022
cc91889
merge
aws-sdk-php-automation Jun 30, 2022
4e5b79e
Merge remote-tracking branch 'upstream/master'
aws-sdk-php-automation Jul 14, 2022
6f22eca
Merge remote-tracking branch 'upstream/master'
Sep 6, 2022
3e3418f
Merge remote-tracking branch 'upstream/master'
Sep 27, 2022
de1fb72
Update StreamWrapperTest.php
Sep 27, 2022
cbaa4e7
Merge remote-tracking branch 'upstream/master'
Oct 18, 2022
fb7aed9
Merge remote-tracking branch 'upstream/master'
Oct 19, 2022
55d098f
Merge remote-tracking branch 'upstream/master'
Oct 19, 2022
444c21f
Merge remote-tracking branch 'upstream/master'
Oct 20, 2022
1a5a364
Merge remote-tracking branch 'upstream/master'
Nov 14, 2022
5648ddf
Merge remote-tracking branch 'upstream/master'
Dec 19, 2022
ea37aa7
Merge remote-tracking branch 'upstream/master'
Dec 21, 2022
5a9631a
rollback
Dec 22, 2022
e0685c1
Revert "bugfix: add MD5 header for PutObject and UploadPart by defaul…
Dec 22, 2022
cd85c7f
Merge remote-tracking branch 'upstream/master'
Dec 27, 2022
c2cbe50
Merge remote-tracking branch 'upstream/master'
Jan 5, 2023
5b76cff
Merge remote-tracking branch 'upstream/master'
Jan 10, 2023
78f97a9
Merge remote-tracking branch 'upstream/master'
Jan 18, 2023
f073509
merge
Jan 25, 2023
1ed73fd
Merge remote-tracking branch 'upstream/master'
Feb 3, 2023
e23d611
merge
Feb 21, 2023
44c74e5
Merge remote-tracking branch 'upstream/master'
Mar 29, 2023
c682258
initial commit
Mar 29, 2023
00a6297
Revert "initial commit"
Mar 29, 2023
1e5788c
Revert "Revert "initial commit""
Mar 29, 2023
eb5c285
Create dependency-review.yml
Apr 20, 2023
139d275
Update composer.json
Apr 20, 2023
3d9831d
Merge remote-tracking branch 'upstream/master'
Apr 20, 2023
734eca2
Merge branch 'master' into enhancement-dependency-review
Apr 20, 2023
07154a9
Update dependency-review.yml
Apr 20, 2023
2146543
Update dependency-review.yml
Apr 20, 2023
5c13c09
Update dependency-review.yml
Apr 20, 2023
11205e1
Update dependency-review.yml
Apr 20, 2023
c4b93d5
Update dependency-review.yml
Apr 20, 2023
71fd0e1
Update dependency-review.yml
Apr 20, 2023
6b772dc
Update composer.json
Apr 20, 2023
c089c9e
Update composer.json
Apr 20, 2023
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
12 changes: 12 additions & 0 deletions .changes/nextrelease/bugfix-sso-provider.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[
{
"type": "bugfix",
"category": "Credentials",
"description": "Fixes a bug with the new SSO login flow where the wrong index was being looked at for the SSO client provider region"
},
{
"type": "enhancement",
"category": "Token",
"description": "Removes an instance of the utf8_decode function that was deprecated as of 8.2"
}
]
20 changes: 20 additions & 0 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Dependency Review
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

permissions:
contents: read

jobs:
dependency-review:
runs-on: ubuntu-20.04
steps:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Dependency Review
uses: actions/dependency-review-action@v3
with:
fail-on-severity: low
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"require": {
"php": ">=5.5",
"guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
"guzzlehttp/guzzle": "<6.3 || <7.1",
"guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
"guzzlehttp/promises": "^1.4.0",
"mtdowling/jmespath.php": "^2.6",
Expand All @@ -39,7 +39,7 @@
"nette/neon": "^2.3",
"andrewsville/php-token-reflection": "^1.4",
"psr/cache": "^1.0",
"psr/http-message": "^1.0",
"psr/http-message": "<1.1",
"psr/simple-cache": "^1.0",
"paragonie/random_compat": ">= 2",
"sebastian/comparator": "^1.2.3 || ^4.0",
Expand Down
13 changes: 1 addition & 12 deletions src/S3/StreamWrapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,7 @@ public static function register(

public function stream_close()
{
if (!$this->isFlushed
&& empty($this->body->getSize())
&& $this->mode !== 'r'
) {
if ($this->body->getSize() === 0 && !($this->isFlushed)) {
$this->stream_flush();
}
$this->body = $this->cache = null;
Expand Down Expand Up @@ -171,14 +168,6 @@ public function stream_eof()

public function stream_flush()
{
// Check if stream body size has been
// calculated via a flush or close
if($this->body->getSize() === null && $this->mode !== 'r') {
return $this->triggerError(
"Unable to determine stream size. Did you forget to close or flush the stream?"
);
}

$this->isFlushed = true;
if ($this->mode == 'r') {
return false;
Expand Down