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.

Sign up for GitHub

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
56c5808
- Update all non-major dependencies with digest and pinDigest
blumilk-renovate[bot] Jan 27, 2025
81ce077
fix dockerfile build, bump redis, xdebug, nginx
mtracz Jan 27, 2025
2b6a0d5
bump PHP to 8.4.3 in php tests in github actions workflow
mtracz Jan 27, 2025
42f6033
bump PHP to 8.4 in composer.json, add PHP_CS_FIXER_IGNORE_ENV=1 flag …
mtracz Jan 27, 2025
da78891
fix code style
mtracz Jan 27, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/check.js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
restore-keys: ${{ runner.os }}-npm-dependencies

- name: Set up node
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 # https://github.com/actions/setup-node
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0 # https://github.com/actions/setup-node
with:
node-version: 22

Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/check.php.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ jobs:
timeout-minutes: 10
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
env:
# renovate: datasource=docker depName=php
PHP_VERSION: 8.4.3
services:
pgsql:
image: postgres:16.3-alpine3.18@sha256:64e18e8fb3e9c9aac89ac590c5dd8306b862478404f76cd9b5f7720d012b4c47 # https://hub.docker.com/_/postgres
Expand Down Expand Up @@ -47,9 +50,9 @@ jobs:
restore-keys: ${{ runner.os }}-composer-dependencies

- name: Setup PHP
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1 # https://github.com/shivammathur/setup-php
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # 2.32.0 # https://github.com/shivammathur/setup-php
with:
php-version: 8.3
php-version: ${{ env.PHP_VERSION }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql, intl
coverage: none

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-to-beta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0

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

- name: build and push image
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
with:
context: .
file: ./environment/prod/app/Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-to-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0

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

- name: build and push image
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
with:
context: .
file: ./environment/prod/app/Dockerfile
Expand Down
32 changes: 15 additions & 17 deletions app/Filament/Resources/ContactFormResource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@

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 @@ -88,17 +94,15 @@ public static function table(Table $table): Table
Forms\Components\DatePicker::make("created_to")
->label("Data do")
->format(DateFormats::DATE_DISPLAY),
])->query(function (Builder $query, array $data): Builder {
return $query
->when(
$data["created_from"],
fn(Builder $query, $date): Builder => $query->whereDate("created_at", ">=", $date),
)
->when(
$data["created_to"],
fn(Builder $query, $date): Builder => $query->whereDate("created_at", "<=", $date),
);
}),
])->query(fn(Builder $query, array $data): Builder => $query
->when(
$data["created_from"],
fn(Builder $query, $date): Builder => $query->whereDate("created_at", ">=", $date),
)
->when(
$data["created_to"],
fn(Builder $query, $date): Builder => $query->whereDate("created_at", "<=", $date),
)),
SelectFilter::make("status")
->label("Status wiadomości")
->options(ContactFormStatus::class),
Expand Down Expand Up @@ -128,10 +132,4 @@ 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;
}
32 changes: 15 additions & 17 deletions app/Filament/Resources/NewsResource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ 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 @@ -122,17 +128,15 @@ public static function table(Table $table): Table
Forms\Components\DatePicker::make("published_to")
->label("Data publikacji do")
->format(DateFormats::DATE_DISPLAY),
])->query(function (Builder $query, array $data): Builder {
return $query
->when(
$data["published_from"],
fn(Builder $query, $date): Builder => $query->whereDate("published_at", ">=", $date),
)
->when(
$data["published_to"],
fn(Builder $query, $date): Builder => $query->whereDate("published_at", "<=", $date),
);
}),
])->query(fn(Builder $query, array $data): Builder => $query
->when(
$data["published_from"],
fn(Builder $query, $date): Builder => $query->whereDate("published_at", ">=", $date),
)
->when(
$data["published_to"],
fn(Builder $query, $date): Builder => $query->whereDate("published_at", "<=", $date),
)),
])
->actions([
Tables\Actions\ViewAction::make(),
Expand All @@ -159,10 +163,4 @@ 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@

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 @@ -117,12 +123,6 @@ 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@

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 @@ -110,10 +116,4 @@ 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@

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 @@ -67,9 +72,4 @@ 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@

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 @@ -112,10 +118,4 @@ 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;
}
26 changes: 13 additions & 13 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,30 @@
"keywords": ["framework", "laravel"],
"license": "MIT",
"require": {
"php": "^8.3",
"php": "^8.4",
"ext-gd": "*",
"ext-intl": "*",
"ext-pdo": "*",
"codezero/laravel-localized-routes": "^4.0.1",
"codezero/laravel-unique-translation": "^4.3.1",
"filament/filament": "^3.2.128",
"filament/spatie-laravel-translatable-plugin": "^3.2.128",
"filament/filament": "^3.2.135",
"filament/spatie-laravel-translatable-plugin": "^3.2.135",
"guzzlehttp/guzzle": "^7.9.2",
"intervention/image-laravel": "^1.3",
"laravel/framework": "^11.34.2",
"laravel/sanctum": "^4.0.5",
"intervention/image-laravel": "^1.4.0",
"laravel/framework": "^11.39.1",
"laravel/sanctum": "^4.0.7",
"laravel/tinker": "^2.10.0",
"mvenghaus/filament-plugin-translatable-inline": "^3.0.8",
"nesbot/carbon": "^3.8.2",
"sentry/sentry-laravel": "^4.10.1"
"nesbot/carbon": "^3.8.4",
"sentry/sentry-laravel": "^4.11.0"
},
"require-dev": {
"blumilksoftware/codestyle": "^4.0.0",
"blumilksoftware/codestyle": "^4.0.1",
"fakerphp/faker": "^1.24.1",
"mockery/mockery": "^1.6.12",
"nunomaduro/collision": "^8.5.0",
"nunomaduro/collision": "^8.6.1",
"larastan/larastan": "^3.0.2",
"phpunit/phpunit": "^11.5.0",
"phpunit/phpunit": "^11.5.3",
"spatie/laravel-ignition": "^2.9.0"
},
"autoload": {
Expand Down Expand Up @@ -58,8 +58,8 @@
"@php artisan test"
],
"analyse": "./vendor/bin/phpstan analyse",
"cs": "./vendor/bin/php-cs-fixer fix --dry-run --diff --config codestyle.php",
"csf": "./vendor/bin/php-cs-fixer fix --diff --config codestyle.php",
"cs": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --dry-run --diff --config codestyle.php",
"csf": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --diff --config codestyle.php",
"fresh:demo": "@php artisan migrate:fresh --seed"
},
"extra": {
Expand Down
Loading
Loading