Skip to content
This repository has been archived by the owner on Jun 13, 2022. It is now read-only.

Commit

Permalink
Merge c4091e0 into 5213052
Browse files Browse the repository at this point in the history
  • Loading branch information
ildyria committed Dec 10, 2020
2 parents 5213052 + c4091e0 commit c461ff4
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Install dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-progress --no-update
composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress --no-suggest
composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress
- name: Run Tests
run: composer run-script test
Expand Down
56 changes: 56 additions & 0 deletions .github/workflows/php8.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: PHP Composer

on:
push:
pull_request:

jobs:
test:

runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php: [8.0]
laravel: [8.*]
dependency-version: [--prefer-lowest, --prefer-stable]
include:
- laravel: 8.*
testbench: 6.*

name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.dependency-version }}

steps:
- name: Checkout
uses: actions/checkout@v1

- name: Setup PHP
uses: shivammathur/setup-php@v1
with:
php-version: ${{ matrix.php }}
extensions: mbstring, intl
coverage: xdebug

- name: Cache dependencies
uses: actions/cache@v1
with:
path: ~/.composer/cache/files
key: ${{ runner.os }}-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
restore-keys: ${{ runner.os }}-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-

- name: Install dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-progress --no-update
composer update ${{ matrix.dependency-version }} --prefer-dist --no-progress
- name: Run Tests
run: composer run-script test

- name: Upload Coverage to Coveralls
env:
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_SERVICE_NAME: github
run: |
rm -rf composer.* vendor/
composer require cedx/coveralls
vendor/bin/coveralls build/logs/clover.xml
19 changes: 9 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,21 @@
"homepage": "https://github.com/darkghosthunter/larapass",
"license": "MIT",
"type": "library",
"authors": [
{
"name": "Italo Israel Baeza Cabrera",
"email": "darkghosthunter@gmail.com",
"role": "Developer"
}
],
"authors": [{
"name": "Italo Israel Baeza Cabrera",
"email": "darkghosthunter@gmail.com",
"role": "Developer"
}],
"require": {
"php": "^7.3.0",
"php": "^7.3.0 || ^8.0",
"ext-json": "*",
"illuminate/support": "^8.0",
"web-auth/webauthn-lib" : "^3.2",
"web-auth/webauthn-lib": "^3.2",
"symfony/psr-http-message-bridge": "^2.0",
"ramsey/uuid": "^4.0",
"nyholm/psr7": "^1.3"
},
"minimum-stability": "dev",
"require-dev": {
"orchestra/testbench": "^6.0",
"phpunit/phpunit": "^8.5||^9.0"
Expand Down Expand Up @@ -53,4 +52,4 @@
]
}
}
}
}
2 changes: 1 addition & 1 deletion src/WebAuthn/AuthenticatorSelectionCriteria.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class AuthenticatorSelectionCriteria extends WebAuthnAuthenticatorSelectionCrite
*
* @param string $type
*/
public function setResidentKey(string $type)
public function setResidentKey(?string $type)
{
if (! in_array($type, [self::USER_VERIFICATION_REQUIREMENT_REQUIRED,
self::USER_VERIFICATION_REQUIREMENT_PREFERRED,
Expand Down

0 comments on commit c461ff4

Please sign in to comment.