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 #397

Merged
merged 5 commits into from
Dec 11, 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
6 changes: 3 additions & 3 deletions .github/workflows/check.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ jobs:
runs-on: ubuntu-latest

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

- name: Cache dependencies
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 # https://github.com/actions/cache
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 # https://github.com/actions/cache
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 # https://github.com/actions/setup-node
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 # https://github.com/actions/setup-node
with:
node-version: 22

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check.php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ jobs:
- 5432:5432

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

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

- name: Cache dependencies
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 # https://github.com/actions/cache
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 # https://github.com/actions/cache
with:
path: vendor
key: ${{ runner.os }}-composer-dependencies-${{ hashFiles('composer.lock') }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deploy-to-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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 @@ -39,7 +39,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 @@ -53,15 +53,15 @@ 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
context: workflow

- name: build and push image
uses: docker/build-push-action@32945a339266b759abcbdc89316275140b0fc960 # v6.8.0
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
with:
context: .
file: ./environment/prod/app/Dockerfile
Expand All @@ -87,7 +87,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
10 changes: 5 additions & 5 deletions .github/workflows/deploy-to-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,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 @@ -42,7 +42,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 @@ -56,7 +56,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 All @@ -65,7 +65,7 @@ jobs:
context: workflow

- name: build and push image
uses: docker/build-push-action@32945a339266b759abcbdc89316275140b0fc960 # v6.8.0
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
with:
context: .
file: ./environment/prod/app/Dockerfile
Expand All @@ -91,7 +91,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
12 changes: 6 additions & 6 deletions app/Filament/Resources/ContactFormResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@

class ContactFormResource extends Resource
{
protected static ?string $model = ContactForm::class;
protected static ?string $label = "wiadomość";
protected static ?string $pluralLabel = "Wiadomości";
protected static ?string $navigationIcon = "heroicon-o-envelope-open";
protected static bool $hasTitleCaseModelLabel = false;

public static function form(Form $form): Form
{
return $form
Expand Down Expand Up @@ -134,4 +128,10 @@ public static function canCreate(): bool
{
return false;
}

protected static ?string $model = ContactForm::class;
protected static ?string $label = "wiadomość";
protected static ?string $pluralLabel = "Wiadomości";
protected static ?string $navigationIcon = "heroicon-o-envelope-open";
protected static bool $hasTitleCaseModelLabel = false;
}
12 changes: 6 additions & 6 deletions app/Filament/Resources/NewsResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ class NewsResource extends Resource
{
use Translatable;

protected static ?string $model = News::class;
protected static ?string $label = "aktualność";
protected static ?string $pluralLabel = "Aktualności";
protected static ?string $navigationIcon = "heroicon-o-rectangle-stack";
protected static bool $hasTitleCaseModelLabel = false;

public static function form(Form $form): Form
{
return $form
Expand Down Expand Up @@ -161,4 +155,10 @@ public static function getTranslatableLocales(): array
{
return config("app.translatable_locales");
}

protected static ?string $model = News::class;
protected static ?string $label = "aktualność";
protected static ?string $pluralLabel = "Aktualności";
protected static ?string $navigationIcon = "heroicon-o-rectangle-stack";
protected static bool $hasTitleCaseModelLabel = false;
}
12 changes: 6 additions & 6 deletions app/Filament/Resources/ProjectResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@

class ProjectResource extends Resource
{
protected static ?string $model = Project::class;
protected static ?string $label = "projekt";
protected static ?string $pluralLabel = "Projekty";
protected static ?string $navigationIcon = "heroicon-o-swatch";
protected static bool $hasTitleCaseModelLabel = false;

public static function form(Form $form): Form
{
return $form
Expand Down Expand Up @@ -120,6 +114,12 @@ public static function getPages(): array
];
}

protected static ?string $model = Project::class;
protected static ?string $label = "projekt";
protected static ?string $pluralLabel = "Projekty";
protected static ?string $navigationIcon = "heroicon-o-swatch";
protected static bool $hasTitleCaseModelLabel = false;

protected static function getTemplateOptions(): array
{
$files = scandir(resource_path("views/projects"));
Expand Down
12 changes: 6 additions & 6 deletions app/Filament/Resources/ReferenceResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@

class ReferenceResource extends Resource
{
protected static ?string $model = Reference::class;
protected static ?string $label = "referencję";
protected static ?string $pluralLabel = "Referencje";
protected static ?string $navigationIcon = "heroicon-o-hand-thumb-up";
protected static bool $hasTitleCaseModelLabel = false;

public static function form(Form $form): Form
{
return $form
Expand Down Expand Up @@ -113,4 +107,10 @@ public static function getPages(): array
"edit" => Pages\EditReferences::route("/{record}/edit"),
];
}

protected static ?string $model = Reference::class;
protected static ?string $label = "referencję";
protected static ?string $pluralLabel = "Referencje";
protected static ?string $navigationIcon = "heroicon-o-hand-thumb-up";
protected static bool $hasTitleCaseModelLabel = false;
}
10 changes: 5 additions & 5 deletions app/Filament/Resources/TagResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@

class TagResource extends Resource
{
protected static ?string $model = Tag::class;
protected static ?string $label = "tag";
protected static ?string $pluralLabel = "Tagi";
protected static ?string $navigationIcon = "heroicon-o-rectangle-stack";

public static function form(Form $form): Form
{
return $form
Expand Down Expand Up @@ -72,4 +67,9 @@ public static function getPages(): array
"edit" => Pages\EditTag::route("/{record}/edit"),
];
}

protected static ?string $model = Tag::class;
protected static ?string $label = "tag";
protected static ?string $pluralLabel = "Tagi";
protected static ?string $navigationIcon = "heroicon-o-rectangle-stack";
}
12 changes: 6 additions & 6 deletions app/Filament/Resources/UserResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@

class UserResource extends Resource
{
protected static ?string $model = User::class;
protected static ?string $label = "użytkownika";
protected static ?string $pluralLabel = "Użytkownicy";
protected static ?string $navigationIcon = "heroicon-o-user-group";
protected static bool $hasTitleCaseModelLabel = false;

public static function form(Form $form): Form
{
/** @var User $authUser */
Expand Down Expand Up @@ -118,4 +112,10 @@ public static function canDelete(Model $record): bool

return $user->isAdmin() && $record->id !== $user->id;
}

protected static ?string $model = User::class;
protected static ?string $label = "użytkownika";
protected static ?string $pluralLabel = "Użytkownicy";
protected static ?string $navigationIcon = "heroicon-o-user-group";
protected static bool $hasTitleCaseModelLabel = false;
}
2 changes: 1 addition & 1 deletion app/Http/Controllers/ContactController.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public function index(Factory $factory): View

public function store(StoreRequest $request): RedirectResponse
{
ContactForm::create($request->data());
ContactForm::create($request->getData());

return redirect()->back()->with(["success" => __("toast.contact.success")]);
}
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Requests/StoreRequest.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 [
"email" => $this->get("email"),
Expand Down
10 changes: 5 additions & 5 deletions app/Models/News.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ class News extends Model
"tags" => "array",
];

public function getRelatedTagModels(): Collection
{
return Tag::query()->whereIn("id", $this->tags)->get();
}

public static function boot(): void
{
parent::boot();
static::observe(NewsObserver::class);
}

public function getRelatedTagModels(): Collection
{
return Tag::query()->whereIn("id", $this->tags)->get();
}
}
24 changes: 12 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@
"ext-pdo": "*",
"codezero/laravel-localized-routes": "^4.0.1",
"codezero/laravel-unique-translation": "^4.3.1",
"filament/filament": "^3.2.115",
"filament/spatie-laravel-translatable-plugin": "^3.2.115",
"filament/filament": "^3.2.128",
"filament/spatie-laravel-translatable-plugin": "^3.2.128",
"guzzlehttp/guzzle": "^7.9.2",
"laravel/framework": "^11.25.0",
"laravel/sanctum": "^4.0.3",
"laravel/framework": "^11.34.2",
"laravel/sanctum": "^4.0.5",
"laravel/tinker": "^2.10.0",
"mvenghaus/filament-plugin-translatable-inline": "^3.0.8",
"nesbot/carbon": "^3.8.0",
"sentry/sentry-laravel": "^4.9"
"nesbot/carbon": "^3.8.2",
"sentry/sentry-laravel": "^4.10.1"
},
"require-dev": {
"blumilksoftware/codestyle": "^3.3.0",
"fakerphp/faker": "^1.23.1",
"blumilksoftware/codestyle": "^4.0.0",
"fakerphp/faker": "^1.24.1",
"mockery/mockery": "^1.6.12",
"nunomaduro/collision": "^8.4.0",
"larastan/larastan": "^2.9.8",
"phpunit/phpunit": "^11.3.6",
"spatie/laravel-ignition": "^2.8.0"
"nunomaduro/collision": "^8.5.0",
"larastan/larastan": "^3.0.2",
"phpunit/phpunit": "^11.5.0",
"spatie/laravel-ignition": "^2.9.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading
Loading