Skip to content

Commit 596060f

Browse files
committed
Fix CI: Pint style fixes, lowercase GHCR image name
1 parent cfb3020 commit 596060f

36 files changed

Lines changed: 170 additions & 107 deletions

.env.testing

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ DB_CONNECTION=mysql
44
DB_HOST=mysql
55
DB_PORT=3306
66
DB_DATABASE=idp-test
7-
DB_USERNAME=sail
8-
DB_PASSWORD=password
7+
DB_USERNAME=idp
8+
DB_PASSWORD=idp
99

1010
HYDRA_ADMIN_URL=http://localhost:4445
1111
HASHIDS_SALT=1

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212

1313
env:
1414
REGISTRY: ghcr.io
15-
IMAGE_NAME: ${{ github.repository }}
15+
IMAGE_NAME: thiritin/identity
1616

1717
jobs:
1818
create-release:

.github/workflows/laravel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
image: mysql:8.0
1616
env:
1717
MYSQL_ROOT_PASSWORD: password
18-
MYSQL_DATABASE: testing
18+
MYSQL_DATABASE: idp-test
1919
ports:
2020
- 3306:3306
2121
options: >-
@@ -65,7 +65,7 @@ jobs:
6565
echo "DB_CONNECTION=mysql" >> .env
6666
echo "DB_HOST=127.0.0.1" >> .env
6767
echo "DB_PORT=3306" >> .env
68-
echo "DB_DATABASE=testing" >> .env
68+
echo "DB_DATABASE=idp-test" >> .env
6969
echo "DB_USERNAME=root" >> .env
7070
echo "DB_PASSWORD=password" >> .env
7171
echo "CACHE_DRIVER=array" >> .env

app/Console/Commands/FixTeamMembershipsCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function handle()
103103
}
104104

105105
// Check if user is member of staff (and not already processed)
106-
if (!in_array($membership->user_id, $processedUsers)) {
106+
if (! in_array($membership->user_id, $processedUsers)) {
107107
$isStaffMember = DB::table('group_user')
108108
->where('group_id', $staffGroup->id)
109109
->where('user_id', $membership->user_id)
@@ -134,7 +134,7 @@ public function handle()
134134
// Now process department members (those not in teams but directly in departments)
135135
$this->info("\nProcessing department-only members:");
136136
$currentDept = null;
137-
137+
138138
foreach ($departmentMemberships as $membership) {
139139
// Show department header when we switch departments
140140
if ($currentDept !== $membership->dept_name) {

app/Exceptions/Handler.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
namespace App\Exceptions;
44

55
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
6+
use Illuminate\Http\JsonResponse;
7+
use Illuminate\Http\RedirectResponse;
8+
use Illuminate\Http\Response;
69
use Illuminate\Support\Facades\App;
710
use Throwable;
811

@@ -58,7 +61,7 @@ public function report(Throwable $exception)
5861
public function render(
5962
$request,
6063
Throwable $e
61-
): \Illuminate\Http\Response|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response|\Illuminate\Http\RedirectResponse {
64+
): Response|JsonResponse|\Symfony\Component\HttpFoundation\Response|RedirectResponse {
6265
$response = parent::render($request, $e);
6366
$status = $response->getStatusCode();
6467

app/Http/Controllers/Auth/VerifyEmailController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use App\Http\Requests\EmailVerificationRequest;
77
use Illuminate\Auth\Events\Verified;
88
use Illuminate\Http\Request;
9+
use Illuminate\Support\Facades\RateLimiter;
910
use Illuminate\Support\Facades\Redirect;
1011
use Inertia\Inertia;
1112

@@ -35,7 +36,7 @@ public function verify(EmailVerificationRequest $request)
3536

3637
public function resend(Request $request)
3738
{
38-
$success = \Illuminate\Support\Facades\RateLimiter::attempt($request->user()->id . ':resend-verification-email',
39+
$success = RateLimiter::attempt($request->user()->id . ':resend-verification-email',
3940
1,
4041
function () use ($request) {
4142
if ($request->user()->hasVerifiedEmail()) {

app/Http/Controllers/DashboardController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace App\Http\Controllers;
44

55
use App\Models\App;
6+
use App\Models\Group;
67
use Auth;
78
use Illuminate\Contracts\Database\Query\Builder;
89
use Illuminate\Support\Facades\Cache;
@@ -26,7 +27,7 @@ public function __invoke()
2627
})->orderBy('priority')->get(['id', 'name', 'description', 'icon', 'url']);
2728

2829
$staffGroupId = Cache::rememberForever('staff-group-id', function () {
29-
return \App\Models\Group::where('system_name', 'staff')->firstOrFail()->id;
30+
return Group::where('system_name', 'staff')->firstOrFail()->id;
3031
});
3132

3233
$isStaff = $user->groups->contains('id', $staffGroupId);

app/Http/Controllers/HealthController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ public function __invoke(): JsonResponse
2727
],
2828
], $httpCode);
2929
}
30-
}
30+
}

app/Http/Middleware/RedirectIfAuthenticated.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ class RedirectIfAuthenticated
1212
/**
1313
* Handle an incoming request.
1414
*
15-
* @param \Illuminate\Http\Request $request
16-
* @param \Closure $next
15+
* @param Request $request
16+
* @param Closure $next
1717
* @param string|null ...$guards
1818
* @return mixed
1919
*/

app/Http/Requests/Auth/RegisterRequest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace App\Http\Requests\Auth;
44

55
use Illuminate\Foundation\Http\FormRequest;
6+
use Illuminate\Validation\Rules\Password;
67

78
class RegisterRequest extends FormRequest
89
{
@@ -29,7 +30,7 @@ public function rules()
2930
'required',
3031
'confirmed',
3132
'max:255',
32-
\Illuminate\Validation\Rules\Password::min(8)->mixedCase()->numbers(),
33+
Password::min(8)->mixedCase()->numbers(),
3334
],
3435
];
3536
}

0 commit comments

Comments
 (0)