Merge branch 'master' into token-abstraction

thephpleague · Dec 10, 2024 · 9cc147c · 9cc147c
2 parents 993d279 + 17f5b55
commit 9cc147c
Show file tree

Hide file tree

Showing 29 changed files with 341 additions and 221 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,3 +8,8 @@ updates:
     directory: "/docs"
     schedule:
       interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 5
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -19,39 +19,39 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        php-version: [ '8.1', '8.2', '8.3', '8.4' ]
     steps:
-      - uses: "actions/checkout@v2"
+      - uses: "actions/checkout@v4"
       - uses: "shivammathur/setup-php@v2"
         with:
           php-version: "${{ matrix.php-version }}"
           coverage: "none"
           ini-values: "memory_limit=-1, zend.assertions=1, error_reporting=-1, display_errors=On"
           tools: "composer:v2"
-      - uses: "ramsey/composer-install@v2"
+      - uses: "ramsey/composer-install@v3"
       - name: "Lint the PHP source code"
         run: "./vendor/bin/parallel-lint src test"
 
   coding-standards:
     name: "Coding Standards"
     runs-on: "ubuntu-latest"
     steps:
-      - uses: "actions/checkout@v2"
+      - uses: "actions/checkout@v4"
       - uses: "shivammathur/setup-php@v2"
         with:
           php-version: "latest"
           coverage: "none"
           ini-values: "memory_limit=-1"
           tools: "composer:v2"
-      - uses: "ramsey/composer-install@v2"
+      - uses: "ramsey/composer-install@v3"
       - name: "Check coding standards"
         run: "./vendor/bin/phpcs src --standard=psr2 -sp --colors"
 
   coverage:
     name: "Coverage"
     runs-on: "ubuntu-latest"
     steps:
-      - uses: "actions/checkout@v2"
+      - uses: "actions/checkout@v4"
       - uses: "shivammathur/setup-php@v2"
         with:
           php-version: "latest"
@@ -60,21 +60,21 @@ jobs:
           tools: "composer"
       - name: "Prepare for tests"
         run: "mkdir -p build/logs"
-      - uses: "ramsey/composer-install@v2"
+      - uses: "ramsey/composer-install@v3"
       - name: "Run unit tests"
         run: "./vendor/bin/phpunit --colors=always --coverage-clover build/logs/clover.xml --coverage-text"
       - name: "Publish coverage report to Codecov"
-        uses: "codecov/codecov-action@v2"
+        uses: "codecov/codecov-action@v5"
 
   unit-tests:
     name: "Unit Tests"
     runs-on: "ubuntu-latest"
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        php-version: [ '8.1', '8.2', '8.3', '8.4' ]
     steps:
-      - uses: "actions/checkout@v2"
+      - uses: "actions/checkout@v4"
       - uses: "shivammathur/setup-php@v2"
         with:
           php-version: "${{ matrix.php-version }}"
@@ -83,6 +83,6 @@ jobs:
           tools: "composer"
       - name: "Prepare for tests"
         run: "mkdir -p build/logs"
-      - uses: "ramsey/composer-install@v2"
+      - uses: "ramsey/composer-install@v3"
       - name: "Run unit tests"
-        run: "./vendor/bin/phpunit --colors=always"
+        run: "./vendor/bin/phpunit --colors=always --no-coverage"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # OAuth 2.0 Client Changelog
 
+## x.x.x
+
+* Send scopes with access token request [#1029](https://github.com/thephpleague/oauth2-client/issues/1029)
+
+## 2.7.0
+
+_Released: 2023-04-16_
+
+* Add support for PKCE (Proof Key for Code Exchange,
+  [RFC 7636](https://www.rfc-editor.org/rfc/rfc7636))
+  [#901](https://github.com/thephpleague/oauth2-client/pull/901)
+* Various type improvements for static analysis
+  [#939](https://github.com/thephpleague/oauth2-client/pull/939)
+  [#959](https://github.com/thephpleague/oauth2-client/pull/959)
+  [#972](https://github.com/thephpleague/oauth2-client/pull/972)
+  [#997](https://github.com/thephpleague/oauth2-client/pull/997)
+
 ## 2.6.1
 
 _Released: 2021-12-22_

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2020 Alex Bilbie <[email protected]>
+Copyright (c) 2013-2023 Alex Bilbie <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ This package provides a base for integrating with [OAuth 2.0](http://oauth.net/2
 [![Source Code](https://img.shields.io/badge/source-thephpleague/oauth2--client-blue.svg?style=flat-square)](https://github.com/thephpleague/oauth2-client)
 [![Latest Version](https://img.shields.io/github/release/thephpleague/oauth2-client.svg?style=flat-square)](https://github.com/thephpleague/oauth2-client/releases)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](https://github.com/thephpleague/oauth2-client/blob/master/LICENSE)
-[![Build Status](https://img.shields.io/github/workflow/status/thephpleague/oauth2-client/CI?label=CI&logo=github&style=flat-square)](https://github.com/thephpleague/oauth2-client/actions?query=workflow%3ACI)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/thephpleague/oauth2-client/continuous-integration.yml?label=CI&logo=github&style=flat-square)](https://github.com/thephpleague/oauth2-client/actions?query=workflow%3ACI)
 [![Codecov Code Coverage](https://img.shields.io/codecov/c/gh/thephpleague/oauth2-client?label=codecov&logo=codecov&style=flat-square)](https://codecov.io/gh/thephpleague/oauth2-client)
 [![Total Downloads](https://img.shields.io/packagist/dt/league/oauth2-client.svg?style=flat-square)](https://packagist.org/packages/league/oauth2-client)
 
@@ -24,14 +24,10 @@ This package is compliant with [PSR-1][], [PSR-2][], [PSR-4][], and [PSR-7][]. I
 
 We support the following versions of PHP:
 
+* PHP 8.4
+* PHP 8.3
+* PHP 8.2
 * PHP 8.1
-* PHP 8.0
-* PHP 7.4
-* PHP 7.3
-* PHP 7.2
-* PHP 7.1
-* PHP 7.0
-* PHP 5.6
 
 ## Provider Clients
 

diff --git a/composer.json b/composer.json
@@ -6,15 +6,15 @@
         "sort-packages": true
     },
     "require": {
-        "php": "^5.6 || ^7.0 || ^8.0",
-        "guzzlehttp/guzzle": "^6.0 || ^7.0",
-        "paragonie/random_compat": "^1 || ^2 || ^9.99"
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+        "ext-json": "*",
+        "guzzlehttp/guzzle": "^7.0"
     },
     "require-dev": {
-        "mockery/mockery": "^1.3.5",
-        "php-parallel-lint/php-parallel-lint": "^1.3.1",
-        "phpunit/phpunit": "^5.7 || ^6.0 || ^9.5",
-        "squizlabs/php_codesniffer": "^2.3 || ^3.0"
+        "mockery/mockery": "^1.6",
+        "php-parallel-lint/php-parallel-lint": "^1.4",
+        "phpunit/phpunit": "^10.5 || ^11.5",
+        "squizlabs/php_codesniffer": "^3.11"
     },
     "keywords": [
         "oauth",
@@ -49,10 +49,5 @@
         "psr-4": {
             "League\\OAuth2\\Client\\Test\\": "test/src/"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-2.x": "2.0.x-dev"
-        }
     }
 }
diff --git a/docs/.ruby-version b/docs/.ruby-version
@@ -1 +1 @@
-2.6.2
+3.2.2
diff --git a/docs/Gemfile b/docs/Gemfile
@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
-gem 'therubyracer'
 gem 'github-pages', group: :jekyll_plugins