Skip to content

Commit 6262754

Browse files
authored
Merge pull request #10 from backstagephp/version-tree-fixes
Cleanup
2 parents 663e393 + 66d6a8a commit 6262754

File tree

25 files changed

+164
-264
lines changed

25 files changed

+164
-264
lines changed

.github/workflows/phpstan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ on:
88

99
jobs:
1010
carpenter:
11-
name: Finalizing the stage (PHP 8.2 on ubuntu-latest)
11+
name: Finalizing the stage (PHP 8.3 on ubuntu-latest)
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v5
1515

1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: '8.2'
19+
php-version: '8.3'
2020
coverage: none
2121

2222
- name: Install dependencies
2323
run: |
2424
composer config minimum-stability ${{ matrix.stability }}
25-
composer install --no-interaction --dev
25+
composer install --no-interaction
2626
2727
- name: Run PHPStan
2828
run: ./vendor/bin/phpstan --error-format=github

.github/workflows/run-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
stability: [dev] # "dev"| "alpha"| "beta"| "RC" | "stable"
1717
operating-system: [ubuntu-latest] # , windows-latest, macos-latest
18-
php-versions: ['8.2'] #, '8.3'
18+
php-versions: ['8.3']
1919

2020
services:
2121
mysql:
@@ -46,7 +46,7 @@ jobs:
4646
- name: Install dependencies
4747
run: |
4848
composer config minimum-stability ${{ matrix.stability }}
49-
composer install --no-interaction --dev
49+
composer install --no-interaction
5050
5151
- name: Execute tests
5252
env:

.github/workflows/setup-in-laravel.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
operating-system: [ubuntu-latest] #, windows-latest, macos-latest
26-
php-versions: ['8.2'] #, '8.3'
26+
php-versions: ['8.3']
2727
steps:
2828
- name: Checkout
2929
uses: actions/checkout@v5
@@ -59,6 +59,8 @@ jobs:
5959
run: |
6060
cd theater
6161
composer config minimum-stability dev
62-
composer config repositories.cms vcs git@github.com:backstagephp/cms.git
62+
git clone --branch ${{ steps.extract_branch.outputs.branch }} https://github.com/backstagephp/cms.git
63+
composer config repositories.backstage-packages path "cms/packages/*"
6364
composer require backstage/cms:dev-${{ steps.extract_branch.outputs.branch }}
65+
composer update --no-interaction
6466
php artisan backstage:install

composer.json

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@
3737
}
3838
],
3939
"require": {
40-
"php": "^8.2",
41-
"backstage/redirects": "dev-release/1.x",
42-
"backstage/translations": "^0.4.1",
40+
"php": "^8.3",
41+
"backstage/fields": "self.version",
42+
"backstage/media": "self.version",
43+
"backstage/redirects": "self.version",
4344
"baspa/laravel-timezones": "^1.2",
4445
"codewithdennis/filament-select-tree": "^4.0",
4546
"filament/filament": "^4.0",
@@ -50,18 +51,14 @@
5051
"spatie/schema-org": "^3.23",
5152
"staudenmeir/laravel-adjacency-list": "^1.0"
5253
},
53-
"replace": {
54-
"backstage/fields": "self.version",
55-
"backstage/media": "self.version"
56-
},
5754
"require-dev": {
5855
"larastan/larastan": "^3.0",
5956
"laravel/pint": "^1.0",
6057
"nunomaduro/collision": "^8.0",
6158
"orchestra/testbench": "^9.0",
62-
"pestphp/pest": "^3.7",
63-
"pestphp/pest-plugin-arch": "^3.0",
64-
"pestphp/pest-plugin-laravel": "^3.0",
59+
"pestphp/pest": "^4.1",
60+
"pestphp/pest-plugin-arch": "^4.0",
61+
"pestphp/pest-plugin-laravel": "^4.0",
6562
"phpstan/extension-installer": "^1.1",
6663
"phpstan/phpstan-deprecation-rules": "^2.0",
6764
"phpstan/phpstan-phpunit": "^2.0"
@@ -117,6 +114,13 @@
117114
}
118115
}
119116
},
117+
"repositories": [
118+
{
119+
"type": "path",
120+
"url": "packages/*",
121+
"canonical": false
122+
}
123+
],
120124
"minimum-stability": "dev",
121125
"prefer-stable": true
122126
}

config/backstage/cms.php

Lines changed: 0 additions & 53 deletions
This file was deleted.

config/backstage/media.php

Lines changed: 0 additions & 69 deletions
This file was deleted.

config/backstage/translations.php

Lines changed: 0 additions & 12 deletions
This file was deleted.

packages/announcements/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
],
2323
"require": {
24-
"php": "^8.2",
24+
"php": "^8.3",
2525
"filament/filament": "^4.0",
2626
"spatie/laravel-package-tools": "^1.15.0"
2727
},
@@ -30,7 +30,7 @@
3030
"laravel/pint": "^1.0",
3131
"nunomaduro/collision": "^8.0",
3232
"orchestra/testbench": "^9.0|^10.0",
33-
"pestphp/pest": "^3.0",
33+
"pestphp/pest": "^4.1",
3434
"pestphp/pest-plugin-arch": "^3.0",
3535
"pestphp/pest-plugin-laravel": "^3.0",
3636
"pestphp/pest-plugin-livewire": "^3.0",

packages/core/composer.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,10 @@
3232
}
3333
],
3434
"require": {
35-
"php": "^8.2",
36-
"backstage/fields": "^0.8.0",
37-
"backstage/media": "^0",
38-
"backstage/redirects": "dev-release/1.x",
39-
"backstage/translations": "^0.4.1",
35+
"php": "^8.3",
36+
"backstage/fields": "self.version",
37+
"backstage/media": "self.version",
38+
"backstage/redirects": "self.version",
4039
"baspa/laravel-timezones": "^1.2",
4140
"codewithdennis/filament-select-tree": "^4.0",
4241
"filament/filament": "^4.0",
@@ -49,15 +48,15 @@
4948
},
5049
"require-dev": {
5150
"larastan/larastan": "^3.0",
52-
"laravel/pint": "^1.0",
53-
"nunomaduro/collision": "^8.0",
5451
"orchestra/testbench": "^9.0",
55-
"pestphp/pest": "^3.7",
56-
"pestphp/pest-plugin-arch": "^3.0",
57-
"pestphp/pest-plugin-laravel": "^3.0",
52+
"pestphp/pest-plugin-arch": "^4.0",
5853
"phpstan/extension-installer": "^1.1",
5954
"phpstan/phpstan-deprecation-rules": "^2.0",
60-
"phpstan/phpstan-phpunit": "^2.0"
55+
"phpstan/phpstan-phpunit": "^2.0",
56+
"laravel/pint": "^1.24",
57+
"nunomaduro/collision": "^8.6",
58+
"pestphp/pest": "^4.1",
59+
"pestphp/pest-plugin-laravel": "^4.0"
6160
},
6261
"autoload": {
6362
"psr-4": {

packages/core/config/backstage/cms.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
<?php
22

3-
use Backstage\Media\MediaPlugin;
4-
use Backstage\Translations\Filament\TranslationsPlugin;
5-
63
return [
74
'panel' => [
85
'default' => true,
96

107
'plugins' => [
118
Backstage\Redirects\Filament\RedirectsPlugin::make(),
12-
MediaPlugin::make(),
13-
TranslationsPlugin::make(),
9+
Backstage\Media\MediaPlugin::make(),
10+
// Backstage\Translations\Filament\TranslationsPlugin::make(),
1411
],
1512

1613
'resources' => [
@@ -29,8 +26,6 @@
2926
// Backstage\Resources\TemplateResource::class,
3027
Backstage\Resources\TypeResource::class,
3128
Backstage\Resources\UserResource::class,
32-
33-
Backstage\Translations\Filament\Resources\TranslationResource::class,
3429
],
3530

3631
'widgets' => [

0 commit comments

Comments
 (0)