Merge branch 'master' into extend-http-client-config-in-option

Author: ramsey

.gitattributes

@@ -1,6 +1,12 @@
-/.gitattributes     export-ignore
-/.github/           export-ignore
-/.gitignore         export-ignore
-/docs/              export-ignore
-/phpunit.xml        export-ignore
-/test/              export-ignore
+/.gitattributes             export-ignore
+/.github/                   export-ignore
+/.gitignore                 export-ignore
+/CHANGELOG.md               export-ignore
+/codecov.yml                export-ignore
+/CODE_OF_CONDUCT.md         export-ignore
+/CONTRIBUTING.md            export-ignore
+/CREDITS.md                 export-ignore
+/docs/                      export-ignore
+/phpunit.xml                export-ignore
+/README.PROVIDER-GUIDE.md   export-ignore
+/test/                      export-ignore

.github/dependabot.yml

@@ -3,6 +3,8 @@ updates:
   - package-ecosystem: "composer"
     directory: "/"
     schedule:
-      interval: "weekly"
-      day: "thursday"
-    versioning-strategy: "increase-if-necessary"
+      interval: "daily"
+  - package-ecosystem: "bundler"
+    directory: "/docs"
+    schedule:
+      interval: "daily"

.github/workflows/continuous-integration.yml

@@ -16,13 +16,21 @@ jobs:
   lint:
     name: "Lint"
     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' ]
+
+    continue-on-error: ${{ matrix.php-version == '8.1' }}
+
     steps:
       - uses: "actions/checkout@v2"
       - uses: "shivammathur/setup-php@v2"
         with:
           php-version: "7.4"
           coverage: "none"
-          ini-values: "memory_limit=-1"
+          ini-values: "memory_limit=-1, zend.assertions=1, error_reporting=-1, display_errors=On"
           tools: "composer:v2"
       - uses: "ramsey/composer-install@v1"
       - name: "Lint the PHP source code"
@@ -58,19 +66,17 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
         experimental:
           - false
-        include:
-          - php-version: "8.1"
-            experimental: true
-            composer-options: "--ignore-platform-reqs"
+
     steps:
       - uses: "actions/checkout@v2"
       - uses: "shivammathur/setup-php@v2"
         with:
           php-version: "${{ matrix.php-version }}"
           coverage: "pcov"
-          ini-values: "memory_limit=-1"
+          ini-values: "memory_limit=-1, zend.assertions=1, error_reporting=-1, display_errors=On"
           tools: "composer:v2"
       - name: "Prepare for tests"
         run: "mkdir -p build/logs"
@@ -79,10 +85,5 @@ jobs:
           composer-options: "${{ matrix.composer-options }}"
       - name: "Run unit tests"
         run: "./vendor/bin/phpunit --colors=always --coverage-clover build/logs/clover.xml"
-      - name: "Publish coverage report to Coveralls"
-        continue-on-error: true
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          composer global --ansi require php-coveralls/php-coveralls
-          php-coveralls --ansi -vv --coverage_clover=build/logs/clover.xml
+      - name: "Publish coverage report to Codecov"
+        uses: "codecov/codecov-action@v1"

.gitignore

@@ -6,3 +6,4 @@ testing/
 nbproject/private/
 test/log
 build
+/.phpunit.result.cache

CHANGELOG.md

@@ -2,9 +2,11 @@
 
 ## 2.6.0
 
-_Released: TBD_
+_Released: 2020-10-27_
 
-* Support PHP 8
+* Indicate support for PHP 8
+* Allow time to be set for testing purposes
+  [#852](https://github.com/thephpleague/oauth2-client/pull/852)
 
 ## 2.5.0
 

CREDITS.md

@@ -4,9 +4,10 @@
 
 Also see <https://github.com/thephpleague/oauth2-client/contributors>.
 
-### Current Maintainer
+### Current Maintainers
 
 - [Ben Ramsey](https://github.com/ramsey)
+- [Woody Gilk](https://github.com/shadowhand)
 
 ### Contributors
 
@@ -17,4 +18,3 @@ Also see <https://github.com/thephpleague/oauth2-client/contributors>.
 - [Phil Sturgeon](https://github.com/philsturgeon)
 - [Rudi Theunissen](https://github.com/rtheunissen)
 - [Tom Anderson](https://github.com/TomHAnderson)
-- [Woody Gilk](https://github.com/shadowhand)