diff --git a/.changes/nextrelease/bugfix-sso-provider.json b/.changes/nextrelease/bugfix-sso-provider.json new file mode 100644 index 0000000000..52d9eb2eb5 --- /dev/null +++ b/.changes/nextrelease/bugfix-sso-provider.json @@ -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" + } +] \ No newline at end of file diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml new file mode 100644 index 0000000000..de68edbfca --- /dev/null +++ b/.github/workflows/dependency-review.yml @@ -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 diff --git a/composer.json b/composer.json index 0fbde38895..38c37253e0 100644 --- a/composer.json +++ b/composer.json @@ -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", @@ -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", diff --git a/src/S3/StreamWrapper.php b/src/S3/StreamWrapper.php index a70e5cd52d..3e7c9aa4a7 100644 --- a/src/S3/StreamWrapper.php +++ b/src/S3/StreamWrapper.php @@ -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; @@ -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;