Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

- Update all non-major dependencies with digest and pinDigest #508

Merged
merged 3 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/deploy-to-beta-manually.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
run: echo "BRANCH_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV

- name: checkout
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
ref: ${{ env.BRANCH_NAME }}
Expand All @@ -38,7 +38,7 @@ jobs:
run: echo "DEPLOYMENT_PROJECT_VERSION=$(bash ./environment/prod/deployment/scripts/version.sh --long)" >> $GITHUB_ENV

- name: set up Docker Buildx
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1

- name: login to GitHub Container Registry
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
Expand All @@ -52,7 +52,7 @@ jobs:

- name: Docker meta
id: meta
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
with:
images: ${{ env.DOCKER_IMAGE_NAME }}
tags: type=raw,value=beta
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
rm: true

- name: run deployment script over ssh
uses: appleboy/ssh-action@029f5b4aeeeb58fdfe1410a5d17f967dacf36262 # v1.0.3
uses: appleboy/ssh-action@7eaf76671a0d7eec5d98ee897acda4f968735a17 # v1.2.0
with:
timeout: 10s
command_timeout: 10m
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy-to-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
DOCKER_REGISTRY_REPO_NAME: toby
steps:
- name: checkout
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: set deployment project version
run: echo "DEPLOYMENT_PROJECT_VERSION=$(bash ./environment/prod/deployment/scripts/version.sh --long)" >> $GITHUB_ENV

- name: set up Docker Buildx
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1

- name: login to GitHub Container Registry
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
Expand All @@ -41,7 +41,7 @@ jobs:

- name: Docker meta
id: meta
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
with:
images: ${{ env.DOCKER_IMAGE_NAME }}
tags: |
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
target: ${{ secrets.TOBY_VPS_LIVE_APP_PATH }}
rm: true

- uses: appleboy/ssh-action@029f5b4aeeeb58fdfe1410a5d17f967dacf36262 # v1.0.3
- uses: appleboy/ssh-action@7eaf76671a0d7eec5d98ee897acda4f968735a17 # v1.2.0
with:
timeout: 10s
command_timeout: 10m
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-command-on-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: run php artisan command
uses: appleboy/ssh-action@029f5b4aeeeb58fdfe1410a5d17f967dacf36262 # v1.0.3
uses: appleboy/ssh-action@7eaf76671a0d7eec5d98ee897acda4f968735a17 # v1.2.0
with:
timeout: 10s
command_timeout: 10m
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-and-lint-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Cache dependencies
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
with:
path: node_modules
key: ${{ runner.os }}-npm-dependencies-${{ hashFiles('package.lock') }}
restore-keys: ${{ runner.os }}-npm-dependencies

- name: Set up node
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version: 22.4.1

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-and-lint-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-22.04
services:
pgsql:
image: postgres:15@sha256:8e97b8526ed19304b144f7478bc9201646acf0723cdc100e9bb7495712cbadb6
image: postgres:15@sha256:6cbdd616ae7ea61fa88873fdab529b3fd141b8a8311bfe4e6e62575f643f88fe
env:
POSTGRES_DB: toby
POSTGRES_USER: toby
Expand All @@ -34,13 +34,13 @@ jobs:
- 5432:5432

steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Validate composer.json and composer.lock
run: composer validate

- name: Cache dependencies
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
with:
path: vendor
key: ${{ runner.os }}-composer-dependencies-${{ hashFiles('composer.lock') }}
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/EquipmentController.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public function store(
): RedirectResponse {
$this->authorize("manageEquipment");

EquipmentItem::query()->create($request->data());
EquipmentItem::query()->create($request->getData());

return redirect()
->route("equipment-items.index")
Expand Down Expand Up @@ -157,7 +157,7 @@ public function update(
): RedirectResponse {
$this->authorize("manageUsers");

$equipmentItem->update($request->data());
$equipmentItem->update($request->getData());

return redirect()
->route("equipment-items.index")
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/EquipmentLabelController.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function store(EquipmentLabelRequest $request): RedirectResponse
{
$this->authorize("manageEquipment");

$label = EquipmentLabel::query()->create($request->data());
$label = EquipmentLabel::query()->create($request->getData());

return redirect()
->back()
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/HolidayController.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function store(HolidayRequest $request): RedirectResponse
{
$this->authorize("manageHolidays");

Holiday::query()->create($request->data());
Holiday::query()->create($request->getData());

return redirect()
->route("holidays.index")
Expand All @@ -74,7 +74,7 @@ public function update(HolidayRequest $request, Holiday $holiday): RedirectRespo
{
$this->authorize("manageHolidays");

$holiday->update($request->data());
$holiday->update($request->getData());

return redirect()
->route("holidays.index")
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/OvertimeRequestController.php
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public function store(OvertimeRequestRequest $request, CreateAction $createActio
{
$this->authorize("canUseOvertimeRequestFunctionality", $request->user());

$overtimeRequest = $createAction->execute($request->data(), $request->user());
$overtimeRequest = $createAction->execute($request->getData(), $request->user());

return redirect()
->route("overtime.requests.show", $overtimeRequest)
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/TechnologyController.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function store(TechnologyRequest $request): RedirectResponse
{
$this->authorize("manageResumes");

$technology = Technology::query()->create($request->data());
$technology = Technology::query()->create($request->getData());

return redirect()
->back()
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/UserHistoryController.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function store(UserHistoryRequest $request, User $user): RedirectResponse
{
$this->authorize("manageUsers");

$user->histories()->create($request->data());
$user->histories()->create($request->getData());

return redirect()
->route("users.history", $user)
Expand All @@ -67,7 +67,7 @@ public function update(UserHistoryRequest $request, UserHistory $history): Redir
{
$this->authorize("manageUsers");

$history->update($request->data());
$history->update($request->getData());

return redirect()
->route("users.history", $history->user_id)
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/VacationLimitController.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function update(VacationLimitRequest $request): RedirectResponse
{
$this->authorize("manageVacationLimits");

foreach ($request->data() as $limit) {
foreach ($request->getData() as $limit) {
VacationLimit::query()->updateOrCreate(
[
"user_id" => $limit["user"],
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/VacationRequestController.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ public function store(VacationRequestRequest $request, CreateAction $createActio
$this->authorize("skipRequestFlow");
}

$vacationRequest = $createAction->execute($request->data(), $request->user());
$vacationRequest = $createAction->execute($request->getData(), $request->user());

return redirect()
->route("vacation.requests.show", $vacationRequest)
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Requests/EquipmentLabelRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public function rules(): array
];
}

public function data(): array
public function getData(): array
{
return [
"name" => $this->get("name"),
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Requests/EquipmentRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function rules(): array
];
}

public function data(): array
public function getData(): array
{
return [
"id_number" => $this->get("idNumber"),
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Requests/HolidayRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function rules(): array
];
}

public function data(): array
public function getData(): array
{
$date = $this->get("date");

Expand Down
2 changes: 1 addition & 1 deletion app/Http/Requests/OvertimeRequestRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function rules(): array
];
}

public function data(): array
public function getData(): array
{
return [
"user_id" => $this->get("user"),
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Requests/TechnologyRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public function rules(): array
];
}

public function data(): array
public function getData(): array
{
return [
"name" => $this->get("name"),
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Requests/UserHistoryRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function rules(): array
];
}

public function data(): array
public function getData(): array
{
return [
"from" => $this->get("from"),
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Requests/VacationLimitRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public function rules(): array
];
}

public function data(): Collection
public function getData(): Collection
{
return $this->collect("items");
}
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Requests/VacationRequestRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function rules(): array
];
}

public function data(): array
public function getData(): array
{
return [
"user_id" => $this->get("user"),
Expand Down
30 changes: 15 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,31 @@
"azuyalabs/yasumi": "^2.7",
"barryvdh/laravel-dompdf": "^3.0",
"dompdf/dompdf": "^3.0",
"fakerphp/faker": "^1.23",
"fakerphp/faker": "^1.24.1",
"guzzlehttp/guzzle": "^7.9.2",
"inertiajs/inertia-laravel": "^1.3",
"inertiajs/inertia-laravel": "^1.3.1",
"laragear/cache-query": "^4.0",
"laravel/framework": "^11.29",
"laravel/sanctum": "^4.0",
"laravel/framework": "^11.34.2",
"laravel/sanctum": "^4.0.5",
"laravel/socialite": "^5.16",
"laravel/telescope": "^5.2.2",
"laravel/telescope": "^5.2.6",
"laravel/tinker": "^2.10",
"maatwebsite/excel": "^3.1",
"maatwebsite/excel": "^3.1.61",
"phpoffice/phpword": "^1.3",
"sentry/sentry-laravel": "^4.9",
"sentry/sentry-laravel": "^4.10.1",
"spatie/laravel-google-calendar": "^3.8",
"spatie/laravel-model-states": "^2.7",
"spatie/laravel-permission": "^6.9",
"spatie/laravel-model-states": "^2.7.2",
"spatie/laravel-permission": "^6.10.1",
"spatie/laravel-slack-slash-command": "^1.12"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.14",
"barryvdh/laravel-debugbar": "^3.14.9",
"blumilksoftware/codestyle": "^4.0",
"laravel/dusk": "^8.2",
"mockery/mockery": "^1.6",
"nunomaduro/collision": "^8.4",
"phpunit/phpunit": "^11.4",
"spatie/laravel-ignition": "^2.8"
"laravel/dusk": "^8.2.12",
"mockery/mockery": "^1.6.12",
"nunomaduro/collision": "^8.5.0",
"phpunit/phpunit": "^11.4.4",
"spatie/laravel-ignition": "^2.9.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading