Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 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
2 changes: 1 addition & 1 deletion .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- 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
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
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
1 change: 0 additions & 1 deletion .github/workflows/setup-in-laravel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,5 @@ jobs:
run: |
cd theater
composer config minimum-stability dev
composer config repositories.cms vcs git@github.com:backstagephp/cms.git
composer require backstage/cms:dev-${{ steps.extract_branch.outputs.branch }}
php artisan backstage:install
9 changes: 3 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@
],
"require": {
"php": "^8.2",
"backstage/redirects": "dev-release/1.x",
"backstage/translations": "^0.4.1",
"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,10 +51,6 @@
"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",
Expand Down
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.

19 changes: 9 additions & 10 deletions packages/core/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@
],
"require": {
"php": "^8.2",
"backstage/fields": "^0.8.0",
"backstage/media": "^0",
"backstage/redirects": "dev-release/1.x",
"backstage/translations": "^0.4.1",
"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
7 changes: 2 additions & 5 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 Down
3 changes: 2 additions & 1 deletion packages/core/src/Models/Language.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
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;

Expand Down
2 changes: 0 additions & 2 deletions packages/fields/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@
}
}
},
"repositories": {
},
"minimum-stability": "beta",
"prefer-stable": true
}
28 changes: 8 additions & 20 deletions packages/media/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@
}
],
"require": {
"php": "^8.1",
"php": "^8.2",
"filament/filament": "^4.0",
"spatie/laravel-package-tools": "^1.15.0",
"backstage/fields": "^0.8.0"
"backstage/fields": "self.version"
},
"require-dev": {
"laravel/pint": "^1.0",
"nunomaduro/collision": "^7.9|^8.0",
"nunomaduro/larastan": "^2.0.1|^3.0",
"orchestra/testbench": "^8.0|^9.0",
"pestphp/pest": "^2.1",
"pestphp/pest-plugin-arch": "^2.0",
"pestphp/pest-plugin-laravel": "^2.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 Expand Up @@ -73,18 +73,6 @@
}
},
"repositories": {
"backstage/fields": {
"type": "git",
"url": "git@github.com:backstagephp/fields.git"
},
"backstage/cms": {
"type": "git",
"url": "https://github.com/backstagephp/core.git"
},
"saade/filament-adjacency-list": {
"type": "git",
"url": "git@github.com:backstagephp/filament-adjacency-list.git"
}
},
"minimum-stability": "dev",
"prefer-stable": true
Expand Down
20 changes: 10 additions & 10 deletions packages/redirects/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@
}
],
"require": {
"php": "^8.1",
"filament/filament": "^3.0",
"php": "^8.2",
"filament/filament": "^4.0",
"spatie/laravel-package-tools": "^1.15.0",
"backstage/laravel-redirects": "dev-main"
"backstage/laravel-redirects": "self.version"
},
"require-dev": {
"laravel/pint": "^1.0",
"nunomaduro/collision": "^7.9",
"larastan/larastan": "^2.0.1",
"orchestra/testbench": "^8.0",
"pestphp/pest": "^2.1",
"pestphp/pest-plugin-arch": "^2.0",
"pestphp/pest-plugin-laravel": "^2.0",
"orchestra/testbench": "^9.0|^10.0",
"pestphp/pest-plugin-arch": "^4.0",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan-deprecation-rules": "^1.0",
"phpstan/phpstan-phpunit": "^1.0"
"phpstan/phpstan-phpunit": "^1.0",
"laravel/pint": "^1.24",
"nunomaduro/collision": "^8.6",
"pestphp/pest": "^4.1",
"pestphp/pest-plugin-laravel": "^4.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading