Skip to content
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/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ on:

jobs:
carpenter:
name: Finalizing the stage (PHP 8.2 on ubuntu-latest)
name: Finalizing the stage (PHP 8.3 on ubuntu-latest)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
php-version: '8.3'
coverage: none

- name: Install dependencies
run: |
composer config minimum-stability ${{ matrix.stability }}
composer install --no-interaction --dev
composer install --no-interaction

- name: Run PHPStan
run: ./vendor/bin/phpstan --error-format=github
4 changes: 2 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
stability: [dev] # "dev"| "alpha"| "beta"| "RC" | "stable"
operating-system: [ubuntu-latest] # , windows-latest, macos-latest
php-versions: ['8.2'] #, '8.3'
php-versions: ['8.3']

services:
mysql:
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Install dependencies
run: |
composer config minimum-stability ${{ matrix.stability }}
composer install --no-interaction --dev
composer install --no-interaction

- name: Execute tests
env:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/setup-in-laravel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
operating-system: [ubuntu-latest] #, windows-latest, macos-latest
php-versions: ['8.2'] #, '8.3'
php-versions: ['8.3']
steps:
- name: Checkout
uses: actions/checkout@v5
Expand Down Expand Up @@ -59,6 +59,8 @@ jobs:
run: |
cd theater
composer config minimum-stability dev
composer config repositories.cms vcs [email protected]:backstagephp/cms.git
git clone --branch ${{ steps.extract_branch.outputs.branch }} https://github.com/backstagephp/cms.git
composer config repositories.backstage-packages path "cms/packages/*"
composer require backstage/cms:dev-${{ steps.extract_branch.outputs.branch }}
composer update --no-interaction
php artisan backstage:install
24 changes: 14 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@
}
],
"require": {
"php": "^8.2",
"backstage/redirects": "dev-release/1.x",
"backstage/translations": "^0.4.1",
"php": "^8.3",
"backstage/fields": "self.version",
"backstage/media": "self.version",
"backstage/redirects": "self.version",
"baspa/laravel-timezones": "^1.2",
"codewithdennis/filament-select-tree": "^4.0",
"filament/filament": "^4.0",
Expand All @@ -50,18 +51,14 @@
"spatie/schema-org": "^3.23",
"staudenmeir/laravel-adjacency-list": "^1.0"
},
"replace": {
"backstage/fields": "self.version",
"backstage/media": "self.version"
},
"require-dev": {
"larastan/larastan": "^3.0",
"laravel/pint": "^1.0",
"nunomaduro/collision": "^8.0",
"orchestra/testbench": "^9.0",
"pestphp/pest": "^3.7",
"pestphp/pest-plugin-arch": "^3.0",
"pestphp/pest-plugin-laravel": "^3.0",
"pestphp/pest": "^4.1",
"pestphp/pest-plugin-arch": "^4.0",
"pestphp/pest-plugin-laravel": "^4.0",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan-deprecation-rules": "^2.0",
"phpstan/phpstan-phpunit": "^2.0"
Expand Down Expand Up @@ -117,6 +114,13 @@
}
}
},
"repositories": [
{
"type": "path",
"url": "packages/*",
"canonical": false
}
],
"minimum-stability": "dev",
"prefer-stable": true
}
53 changes: 0 additions & 53 deletions config/backstage/cms.php

This file was deleted.

69 changes: 0 additions & 69 deletions config/backstage/media.php

This file was deleted.

12 changes: 0 additions & 12 deletions config/backstage/translations.php

This file was deleted.

4 changes: 2 additions & 2 deletions packages/announcements/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
],
"require": {
"php": "^8.2",
"php": "^8.3",
"filament/filament": "^4.0",
"spatie/laravel-package-tools": "^1.15.0"
},
Expand All @@ -30,7 +30,7 @@
"laravel/pint": "^1.0",
"nunomaduro/collision": "^8.0",
"orchestra/testbench": "^9.0|^10.0",
"pestphp/pest": "^3.0",
"pestphp/pest": "^4.1",
"pestphp/pest-plugin-arch": "^3.0",
"pestphp/pest-plugin-laravel": "^3.0",
"pestphp/pest-plugin-livewire": "^3.0",
Expand Down
21 changes: 10 additions & 11 deletions packages/core/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,10 @@
}
],
"require": {
"php": "^8.2",
"backstage/fields": "^0.8.0",
"backstage/media": "^0",
"backstage/redirects": "dev-release/1.x",
"backstage/translations": "^0.4.1",
"php": "^8.3",
"backstage/fields": "self.version",
"backstage/media": "self.version",
"backstage/redirects": "self.version",
"baspa/laravel-timezones": "^1.2",
"codewithdennis/filament-select-tree": "^4.0",
"filament/filament": "^4.0",
Expand All @@ -49,15 +48,15 @@
},
"require-dev": {
"larastan/larastan": "^3.0",
"laravel/pint": "^1.0",
"nunomaduro/collision": "^8.0",
"orchestra/testbench": "^9.0",
"pestphp/pest": "^3.7",
"pestphp/pest-plugin-arch": "^3.0",
"pestphp/pest-plugin-laravel": "^3.0",
"pestphp/pest-plugin-arch": "^4.0",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan-deprecation-rules": "^2.0",
"phpstan/phpstan-phpunit": "^2.0"
"phpstan/phpstan-phpunit": "^2.0",
"laravel/pint": "^1.24",
"nunomaduro/collision": "^8.6",
"pestphp/pest": "^4.1",
"pestphp/pest-plugin-laravel": "^4.0"
},
"autoload": {
"psr-4": {
Expand Down
9 changes: 2 additions & 7 deletions packages/core/config/backstage/cms.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
<?php

use Backstage\Media\MediaPlugin;
use Backstage\Translations\Filament\TranslationsPlugin;

return [
'panel' => [
'default' => true,

'plugins' => [
Backstage\Redirects\Filament\RedirectsPlugin::make(),
MediaPlugin::make(),
TranslationsPlugin::make(),
Backstage\Media\MediaPlugin::make(),
// Backstage\Translations\Filament\TranslationsPlugin::make(),
],

'resources' => [
Expand All @@ -29,8 +26,6 @@
// Backstage\Resources\TemplateResource::class,
Backstage\Resources\TypeResource::class,
Backstage\Resources\UserResource::class,

Backstage\Translations\Filament\Resources\TranslationResource::class,
],

'widgets' => [
Expand Down
12 changes: 0 additions & 12 deletions packages/core/config/backstage/translations.php

This file was deleted.

31 changes: 30 additions & 1 deletion packages/core/src/Models/Language.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,44 @@
namespace Backstage\Models;

use Backstage\Shared\HasPackageFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;

class Language extends \Backstage\Translations\Laravel\Models\Language
class Language extends Model
{
use HasPackageFactory;

protected $table = 'languages';

protected $primaryKey = 'code';

protected $guarded = [];

protected $keyType = 'string';

public $incrementing = false;

protected $casts = [
'code' => 'string',
'name' => 'string',
'native' => 'string',
'active' => 'boolean',
'default' => 'boolean',
];

public function domains(): BelongsToMany
{
return $this->belongsToMany(Domain::class, 'domain_language', 'language_code', 'domain_ulid')
->withPivot('path');
}

public static function default(): ?Language
{
return static::firstWhere('default', true);
}

public function scopeActive($query)
{
return $query->where('active', true);
}
}
Loading