Fix implementations and adjust tests (#69)

Author: rossaddison

.github/workflows/build.yml

@@ -37,13 +37,12 @@ jobs:
           - windows-latest
 
         php:
-          - 7.4
-          - 8.0
-          - 8.1
+          - 8.3
+          - 8.4
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v5
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
@@ -62,7 +61,7 @@ jobs:
         run: echo "COMPOSER_CACHE_DIR=~\AppData\Local\Composer" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: Cache dependencies installed with composer
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ env.COMPOSER_CACHE_DIR }}
           key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}

.github/workflows/mutation.yml

@@ -18,6 +18,8 @@ on:
       - 'psalm.xml'
 
 name: mutation test
+permissions:
+  contents: read
 
 jobs:
   mutation:
@@ -31,11 +33,11 @@ jobs:
           - ubuntu-latest
 
         php:
-          - 8.1
+          - 8.3
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v5
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
@@ -49,21 +51,24 @@ jobs:
         run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
 
       - name: Cache dependencies installed with composer
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ env.COMPOSER_CACHE_DIR }}
           key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: |
             php${{ matrix.php }}-composer-
 
+      - name: Validate composer configuration
+        run: composer validate --no-check-publish
+
       - name: Update composer
         run: composer self-update
 
       - name: Install dependencies with composer
-        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+        run: composer install --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run infection
         run: |
-          vendor/bin/roave-infection-static-analysis-plugin -j2 --ignore-msi-with-no-mutations --only-covered
+          vendor/bin/roave-infection-static-analysis-plugin --threads=2 --ignore-msi-with-no-mutations --only-covered
         env:
-          STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
+          STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

.github/workflows/static.yml

@@ -33,13 +33,13 @@ jobs:
           - ubuntu-latest
 
         php:
-          - 7.4
-          - 8.0
-          - 8.1
+          - 8.2
+          - 8.3
+          - 8.4
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v5
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
@@ -52,7 +52,7 @@ jobs:
         run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
 
       - name: Cache dependencies installed with composer
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ env.COMPOSER_CACHE_DIR }}
           key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}

.styleci.yml

@@ -1,12 +1,12 @@
 preset: psr12
 risky: true
 
-version: 8.1
+version: 8.3
 
 finder:
   exclude:
-    - docs
-    - vendor
+    - "resources"
+    - "vendor"
 
 enabled:
   - alpha_ordered_traits
@@ -44,13 +44,6 @@ enabled:
   - no_useless_else
   - no_useless_return
   - normalize_index_brace
-  - php_unit_dedicate_assert
-  - php_unit_dedicate_assert_internal_type
-  - php_unit_expectation
-  - php_unit_mock
-  - php_unit_mock_short_will_return
-  - php_unit_namespaced
-  - php_unit_no_expectation_annotation
   - phpdoc_no_empty_return
   - phpdoc_no_useless_inheritdoc
   - phpdoc_order
@@ -82,4 +75,4 @@ enabled:
   - union_type_without_spaces
 
 disabled:
-  - function_declaration
+  - function_declaration

Makefile

@@ -0,0 +1,100 @@
+.DEFAULT_GOAL := help
+
+CLI_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
+$(eval $(CLI_ARGS):;@:)
+
+PRIMARY_GOAL := $(firstword $(MAKECMDGOALS))
+
+#
+# Targets
+#
+
+ifeq ($(PRIMARY_GOAL),p)
+p: ## Run PHP Psalm
+	php vendor/bin/psalm
+endif
+
+ifeq ($(PRIMARY_GOAL),pf)
+pf: ## Run PHP Psalm on a specific file
+ifndef FILE
+	$(error Please provide FILE, e.g. 'make pf FILE=src/Foo.php')
+endif
+	php vendor/bin/psalm "$(FILE)"
+endif
+
+ifeq ($(PRIMARY_GOAL),pc)
+pc: ## Clear Psalm's cache
+	php vendor/bin/psalm --clear-cache
+endif
+
+ifeq ($(PRIMARY_GOAL),pu)
+pu: ## Run PHPUnit tests
+	php vendor/bin/phpunit
+endif
+
+ifeq ($(PRIMARY_GOAL),ric)
+ric: ## Roave Infection Covered
+	php vendor/bin/roave-infection-static-analysis-plugin --only-covered --min-msi=92
+endif
+
+ifeq ($(PRIMARY_GOAL),riu)
+riu: ## Roave Infection Uncovered
+	php vendor/bin/roave-infection-static-analysis-plugin --min-msi=92
+endif
+
+ifeq ($(PRIMARY_GOAL),i)
+i: ## Infection Mutation Test
+	php vendor/bin/infection
+endif
+
+ifeq ($(PRIMARY_GOAL),co)
+co: ## Composer outdated
+	composer outdated
+endif
+
+ifeq ($(PRIMARY_GOAL),cwn)
+cwn: ## Composer why-not
+ifndef REPO
+	$(error Please provide REPO, e.g. 'make cwn REPO=yiisoft/yii-demo VERSION=1.1.1')
+endif
+ifndef VERSION
+	$(error Please provide VERSION, e.g. 'make cwn REPO=yiisoft/yii-demo VERSION=1.1.1')
+endif
+	composer why-not $(REPO) $(VERSION)
+endif
+
+ifeq ($(PRIMARY_GOAL),cu)
+cu: ## Composer update
+	composer update
+endif
+
+ifeq ($(PRIMARY_GOAL),cda)
+cda: ## Composer dump-autoload
+	composer dump-autoload -o
+endif
+
+ifeq ($(PRIMARY_GOAL),crc)
+crc: ## Composer require checker
+	php vendor/bin/composer-require-checker
+endif
+
+ifeq ($(PRIMARY_GOAL),rdr)
+rdr: ## Rector Dry Run (see changes)
+	php vendor/bin/rector process --dry-run
+endif
+
+ifeq ($(PRIMARY_GOAL),rmc)
+rmc: ## Rector (make changes)
+	php vendor/bin/rector
+endif
+
+#
+# Help
+#
+
+ifeq ($(PRIMARY_GOAL),help)
+help: ## This help.
+	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
+endif
+
+.PHONY: menu p pf pc pu ric riu i co cwn cu cda crc rdr rmc help

README.md

@@ -25,7 +25,7 @@ consumers for the [Yii framework](https://www.yiiframework.com).
 
 ## Requirements
 
-- PHP 7.4 or higher.
+- PHP 8.1 or higher.
 
 ## Installation
 
@@ -60,4 +60,4 @@ Maintained by [Yii Software](https://www.yiiframework.com/).
 [![Twitter](https://img.shields.io/badge/twitter-follow-1DA1F2?logo=twitter&logoColor=1DA1F2&labelColor=555555?style=flat)](https://twitter.com/yiiframework)
 [![Telegram](https://img.shields.io/badge/telegram-join-1DA1F2?style=flat&logo=telegram)](https://t.me/yii3en)
 [![Facebook](https://img.shields.io/badge/facebook-join-1DA1F2?style=flat&logo=facebook&logoColor=ffffff)](https://www.facebook.com/groups/yiitalk)
-[![Slack](https://img.shields.io/badge/slack-join-1DA1F2?style=flat&logo=slack)](https://yiiframework.com/go/slack)
+[![Slack](https://img.shields.io/badge/slack-join-1DA1F2?style=flat&logo=slack)](https://yiiframework.com/go/slack)

composer.json

@@ -1,10 +1,9 @@
 {
     "name": "yiisoft/yii-auth-client",
-    "description": "Yii Framework external authentication via OAuth and OpenID Extension",
+    "description": "Yii Framework external authentication via OAuth",
     "keywords": [
         "yii",
         "OAuth",
-        "OpenID Connect",
         "auth",
         "api"
     ],
@@ -29,40 +28,46 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
-        "psr/http-client": "^1.0",
-        "psr/http-factory": "^1.0",
+        "php": "8.1 - 8.4",        
+        "phpseclib/phpseclib": ">=3.0.46",
+        "psr/container": "^2.0.2",
+        "psr/http-client": "^1.0.3",
+        "psr/http-factory": "^1.1",
         "psr/http-factory-implementation": "1.0",
-        "psr/http-message": "^1.0",
+        "psr/http-message": "^2.0",
         "psr/http-message-implementation": "1.0",
-        "psr/log-implementation": "^1.0",
+        "psr/http-server-handler": "^1.0.2",
+        "psr/http-server-middleware": "^1.0.2",
+        "psr/log-implementation": "^2.0",
         "psr/simple-cache-implementation": "^1.0",
-        "yiisoft/assets": "^4.0",
+        "web-token/jwt-framework": ">=4.0.6",
+        "yiisoft/aliases": "^3.1",
+        "yiisoft/assets": "^5.1.1",
+        "yiisoft/factory": "^1.3",
+        "yiisoft/html": "^3.11",
+        "yiisoft/http": "^1.2",
         "yiisoft/json": "^1.0",
-        "yiisoft/session": "^2.0",
-        "yiisoft/view": "^8.0",
-        "yiisoft/widget": "^2.0"
+        "yiisoft/router": "^4.0",
+        "yiisoft/session": "^3.0",
+        "yiisoft/view": "^12.2.1",
+        "yiisoft/widget": "^2.2"
     },
     "require-dev": {
-        "kriswallsmith/buzz": "^1.1",
-        "nyholm/psr7": "^1.3",
-        "phpunit/phpunit": "^9.5",
-        "roave/infection-static-analysis-plugin": "^1.16",
-        "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.18",
-        "yiisoft/cache": "^1.0",
-        "yiisoft/di": "^1.0",
-        "yiisoft/log": "^1.0",
-        "yiisoft/router-fastroute": "^1.0",
-        "yiisoft/psr-dummy-provider": "*"
-    },
-    "suggest": {
-        "web-token/jwt-checker": "required for JWS, JWT or JWK related flows like OpenIDConnect",
-        "web-token/jwt-key-mgmt": "required for JWS, JWT or JWK related flows like OpenIDConnect",
-        "web-token/jwt-signature": "required for JWS, JWT or JWK related flows like OpenIDConnect",
-        "web-token/jwt-signature-algorithm-hmac": "required for JWS, JWT or JWK related flows like OpenIDConnect",
-        "web-token/jwt-signature-algorithm-ecdsa": "required for JWS, JWT or JWK related flows like OpenIDConnect",
-        "web-token/jwt-signature-algorithm-rsa": "required for JWS, JWT or JWK related flows like OpenIDConnect"
+        "ext-curl": "*",
+        "maglnet/composer-require-checker": "^4.16.1",
+        "kriswallsmith/buzz": "^1.3",
+        "nyholm/psr7": "^1.8.2",
+        "phpunit/phpunit": ">=11.5.9",        
+        "rector/rector": "^2.1.6",
+        "roave/infection-static-analysis-plugin": ">=1.39",
+        "spatie/phpunit-watcher": "^1.24",
+        "styleci/cli": "^1.6.0",
+        "vimeo/psalm": "^6.13.1",
+        "yiisoft/cache": "^3.1",
+        "yiisoft/di": "^1.4",
+        "yiisoft/log": "^2.1.1",
+        "yiisoft/router-fastroute": "^4.0.1",
+        "yiisoft/psr-dummy-provider": "^1.0.2"
     },
     "repositories": [
         {
@@ -94,13 +99,14 @@
     },
     "config": {
         "sort-packages": true,
+        "bump-after-update": true,
         "allow-plugins": {
             "infection/extension-installer": true,
             "composer/package-versions-deprecated": true
         }
     },
     "scripts": {
-        "test": "phpunit --testdox --no-interaction",
+        "test": "phpunit --stop-on-notice --display-phpunit-deprecations --testdox",
         "test-watch": "phpunit-watcher watch"
     }
 }

phpunit.xml.dist

@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<phpunit bootstrap="./vendor/autoload.php"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         stopOnFailure="false">
+<phpunit bootstrap="./vendor/autoload.php" 
+         colors="true" 
+         displayDetailsOnTestsThatTriggerDeprecations="true">
 
-  <coverage>
+  <source>
     <include>
       <directory>./src</directory>
     </include>
     <exclude>
       <directory>./tests</directory>
       <directory>./vendor</directory>
     </exclude>
-  </coverage>
+  </source>
 
   <php>
     <ini name="error_reporting" value="-1"/>