Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@ jobs:
fail-fast: true
matrix:
php: [7.3, 7.4, 8.0, 8.1]
laravel: ["8.*"]
laravel: ["8.*", "9.*"]
exclude:
- php: 7.3
laravel: "9.*"
- php: 7.4
laravel: "9.*"

steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions .php_cs → .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
'elseif' => true,
'encoding' => true,
'single_blank_line_at_eof' => true,
'no_extra_consecutive_blank_lines' => true,
'no_extra_blank_lines' => true,
'include' => true,
'blank_line_after_namespace' => true,
'not_operator_with_successor_space' => true,
'lowercase_constants' => true,
'constant_case' => ['case' => 'lower'],
'lowercase_keywords' => true,
'array_syntax' => ['syntax' => 'short'],
'no_unused_imports' => true
Expand All @@ -27,7 +27,7 @@
__DIR__.'/tests',
]);

return PhpCsFixer\Config::create()
return (new PhpCsFixer\Config())
->setFinder($finder)
->setRules($fixers)
->setUsingCache(false);
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
}
],
"require": {
"php": "^7.3|^8.0",
"illuminate/auth": "^8.0",
"illuminate/console": "^8.0",
"illuminate/encryption": "^8.0",
"illuminate/support": "^8.0",
"illuminate/view": "^8.0",
"php": "^7.3|^8.0.2",
"illuminate/auth": "^8.0|^9.0",
"illuminate/console": "^8.0|^9.0",
"illuminate/encryption": "^8.0|^9.0",
"illuminate/support": "^8.0|^9.0",
"illuminate/view": "^8.0|^9.0",
"laravel/socialite": "^5.0",
"socialiteproviders/gitlab": "^3.1|^4.0",
"socialiteproviders/dropbox": "^4.1"
Expand All @@ -31,8 +31,8 @@
"fakerphp/faker": "^1.9.1",
"mockery/mockery": "^1.4.4",
"phpunit/phpunit": "^9.5.10",
"orchestra/testbench": "^6.15",
"friendsofphp/php-cs-fixer": "^2.16"
"orchestra/testbench": "^6.15|^7.4",
"friendsofphp/php-cs-fixer": "^2.16|^3.8"
},
"autoload": {
"psr-4": {
Expand Down
1 change: 0 additions & 1 deletion tests/Unit/IdentityLinkTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use Oneofftech\Identities\Facades\Identity;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use InvalidArgumentException;
use Illuminate\Support\Facades\View;
use Illuminate\View\Component;
use Oneofftech\Identities\View\Components\IdentityLink;

Expand Down