Skip to content

Commit f511add

Browse files
author
antoine
committed
Merge branch 'main' into 9.0
# Conflicts: # demo/app/Providers/AppServiceProvider.php # demo/tests/Feature/PostSharpFormTest.php # src/Dashboard/DashboardQueryParams.php # src/Dashboard/SharpDashboard.php # src/EntityList/Commands/Command.php # src/EntityList/Commands/EntityState.php # src/EntityList/Commands/Wizards/IsWizardCommand.php # src/EntityList/EntityListQueryParams.php # src/EntityList/Fields/EntityListFieldsLayout.php # src/EntityList/SharpEntityList.php # src/Exceptions/Auth/SharpAuthorizationException.php # src/Exceptions/EntityList/SharpInvalidEntityStateException.php # src/Exceptions/Form/SharpApplicativeException.php # src/Exceptions/Form/SharpFormFieldFormattingMustBeDelayedException.php # src/Exceptions/SharpException.php # src/Exceptions/SharpInvalidEntityKeyException.php # src/Form/Eloquent/Uploads/Migration/CreateUploadsMigration.php # src/Form/Eloquent/Uploads/SharpUploadModel.php # src/Form/Eloquent/Uploads/Thumbnails/GreyscaleFilter.php # src/Form/Eloquent/Uploads/Thumbnails/Thumbnail.php # src/Form/Eloquent/Uploads/Thumbnails/ThumbnailFilter.php # src/Form/Eloquent/Uploads/Thumbnails/ThumbnailModifier.php # src/Form/Eloquent/Uploads/Transformers/SharpUploadModelFormAttributeTransformer.php # src/Form/Fields/Embeds/SharpFormEditorEmbed.php # src/Form/Fields/Formatters/AbstractSimpleFormatter.php # src/Form/Fields/Formatters/AutocompleteListFormatter.php # src/Form/Fields/Formatters/AutocompleteLocalFormatter.php # src/Form/Fields/Formatters/CheckFormatter.php # src/Form/Fields/Formatters/GeolocationFormatter.php # src/Form/Fields/Formatters/HtmlFormatter.php # src/Form/Fields/Formatters/ListFormatter.php # src/Form/Fields/Formatters/NumberFormatter.php # src/Form/Fields/Formatters/SelectFormatter.php # src/Form/Fields/Formatters/SharpFieldFormatter.php # src/Form/Fields/Formatters/TagsFormatter.php # src/Form/Fields/Formatters/UploadFormatter.php # src/Form/Fields/SharpFormAutocompleteField.php # src/Form/Fields/SharpFormEditorField.php # src/Form/Fields/SharpFormSelectField.php # src/Form/Fields/SharpFormTextField.php # src/Form/Fields/SharpFormTextareaField.php # src/Form/Fields/SharpFormUploadField.php # src/Form/Fields/Utils/SharpFormFieldWithOptions.php # src/Form/Fields/Utils/SharpFormFieldWithUpload.php # src/Form/Layout/FormLayoutColumn.php # src/Form/Layout/HasFieldRows.php # src/Form/SharpForm.php # src/Http/Api/Commands/EntityListInstanceCommandController.php # src/Http/Api/EntityListController.php # src/Http/Api/FormController.php # src/Http/Api/FormUploadController.php # src/Http/Api/ShowController.php # src/Http/Context/CurrentSharpRequest.php # src/Http/Controllers/Api/Commands/ApiDashboardCommandController.php # src/Http/Controllers/Api/Commands/ApiEntityListEntityCommandController.php # src/Http/Controllers/Api/Commands/ApiShowInstanceCommandController.php # src/Http/LangController.php # src/Http/Middleware/Api/AppendBreadcrumb.php # src/Http/Middleware/Api/AppendInstanceAuthorizations.php # src/Http/Middleware/Api/AppendListAuthorizations.php # src/Http/Middleware/Api/AppendMultiformInEntityList.php # src/Http/Middleware/Api/AppendNotifications.php # src/Http/Middleware/Api/HandleSharpApiErrors.php # src/Http/Middleware/SharpRedirectIfAuthenticated.php # src/Show/Fields/SharpShowEntityListField.php # src/Show/Fields/SharpShowTextField.php # src/Show/Layout/ShowLayout.php # src/Show/SharpShow.php # src/Utils/Filters/CheckFilter.php # src/Utils/Filters/Filter.php # src/Utils/Filters/HasFiltersInQuery.php # src/Utils/Filters/SelectMultipleFilter.php # src/Utils/Layout/LayoutField.php # src/Utils/Traits/HandlePageAlertMessage.php # src/Utils/Transformers/WithCustomTransformers.php # src/View/Components/Menu.php # tests/Feature/Api/AuthenticationTest.php # tests/Feature/Api/BaseApiTestCase.php # tests/Feature/Api/Commands/DashboardCommandControllerTest.php # tests/Feature/Api/Commands/EntityListEntityCommandControllerTest.php # tests/Feature/Api/Commands/EntityListInstanceCommandControllerTest.php # tests/Feature/Api/Commands/ShowInstanceCommandControllerTest.php # tests/Feature/Api/Embeds/EmbedsControllerTest.php # tests/Feature/Api/EntityListControllerTest.php # tests/Feature/Api/FiltersInRequestTest.php # tests/Feature/Api/FormControllerTest.php # tests/Feature/Api/GlobalFiltersTest.php # tests/Feature/Api/MultiFormEntityFormControllerTest.php # tests/Feature/Api/MultiFormEntityShowControllerTest.php # tests/Feature/Api/SearchTest.php # tests/Feature/Auth/LoginNotification2faControllerTest.php # tests/Feature/Auth/LoginTotp2faControllerTest.php # tests/Fixtures/PersonSharpEntityList.php # tests/Fixtures/PersonSharpShow.php # tests/SharpTestCase.php # tests/Unit/Components/MenuComponentTest.php # tests/Unit/Dashboard/DashboardCommandTest.php # tests/Unit/Dashboard/DashboardFilterTest.php # tests/Unit/Dashboard/SharpDashboardTest.php # tests/Unit/EntityList/EntityListFilterTest.php # tests/Unit/EntityList/SharpEntityListCommandTest.php # tests/Unit/EntityList/SharpEntityListDeprecatedLayoutTest.php # tests/Unit/EntityList/SharpEntityListReorderTest.php # tests/Unit/EntityList/SharpEntityListStateTest.php # tests/Unit/EntityList/SharpEntityListTest.php # tests/Unit/EntityList/Utils/SharpEntityDefaultTestList.php # tests/Unit/EntityList/WithCustomTransformersInEntityListTest.php # tests/Unit/Form/Eloquent/Relationships/HasManyRelationUpdaterTest.php # tests/Unit/Form/Eloquent/WithSharpFormEloquentUpdaterTest.php # tests/Unit/Form/Fields/Embeds/SharpFormEditorEmbedTest.php # tests/Unit/Form/Fields/Formatters/AutocompleteFormatterTest.php # tests/Unit/Form/Fields/Formatters/CheckFormatterTest.php # tests/Unit/Form/Fields/Formatters/DateFormatterTest.php # tests/Unit/Form/Fields/Formatters/EditorFormatterTest.php # tests/Unit/Form/Fields/Formatters/FieldWithDataLocalizationFormatterTest.php # tests/Unit/Form/Fields/Formatters/ListFormatterTest.php # tests/Unit/Form/Fields/Formatters/NumberFormatterTest.php # tests/Unit/Form/Fields/Formatters/SelectFormatterTest.php # tests/Unit/Form/Fields/Formatters/TagsFormatterTest.php # tests/Unit/Form/Fields/Formatters/TextFormatterTest.php # tests/Unit/Form/Fields/Formatters/TextareaFormatterTest.php # tests/Unit/Form/Fields/Formatters/UploadFormatterTest.php # tests/Unit/Form/Fields/SharpFormAutocompleteFieldTest.php # tests/Unit/Form/Fields/SharpFormFieldsTest.php # tests/Unit/Form/Fields/SharpFormTest.php # tests/Unit/Form/Layout/FormLayoutTest.php # tests/Unit/Form/SharpFormTest.php # tests/Unit/Form/WithCustomTransformersInFormTest.php # tests/Unit/Show/Layout/ShowLayoutTest.php # tests/Unit/Show/SharpShowCommandTest.php # tests/Unit/Show/SharpShowTestDefault.php # tests/Unit/Show/Utils/BaseSharpSingleShowTestDefault.php # tests/Unit/Utils/CurrentSharpRequestTest.php # tests/Unit/Utils/SharpLinkToTest.php
2 parents f7f23bf + f3564a2 commit f511add

File tree

86 files changed

+158
-223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+158
-223
lines changed

.github/workflows/lint.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Fix Code Style
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
# - 9.0
8+
workflow_dispatch:
9+
jobs:
10+
lint:
11+
runs-on: ubuntu-latest
12+
strategy:
13+
fail-fast: true
14+
matrix:
15+
php: [8.3]
16+
17+
steps:
18+
- name: Checkout code
19+
uses: actions/checkout@v4
20+
21+
- name: Setup PHP
22+
uses: shivammathur/setup-php@v2
23+
with:
24+
php-version: ${{ matrix.php }}
25+
extensions: json, dom, curl, libxml, mbstring
26+
coverage: none
27+
28+
- name: Install Pint
29+
run: composer global require laravel/pint
30+
31+
- name: Run Pint
32+
run: pint
33+
34+
- name: Commit linted files
35+
uses: stefanzweifel/git-auto-commit-action@v5
36+
with:
37+
commit_message: "CS fix"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Sharp intends to provide a clean solution to the following needs:
1515
- display, search, sort or filter data;
1616
- execute custom commands on one instance, a selection or all instances;
1717
- handle authorizations and validation;
18-
- all without write a line of front code, and using a clean API in the PHP app.
18+
- all without writing a line of front code, and using a clean API in the PHP app.
1919

2020
Sharp needs Laravel 8+ and PHP 8.0+.
2121

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"brianium/paratest": "^7.0",
3131
"doctrine/dbal": "^3.5",
3232
"friendsofphp/php-cs-fixer": "^3.8",
33+
"laravel/pint": "^1.18",
3334
"mockery/mockery": "^1.5.0",
3435
"nunomaduro/collision": "^7.8|8.0",
3536
"orchestra/testbench": "^8.0|^9.0",

demo/app/Console/Kernel.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ class Kernel extends ConsoleKernel
1010
/**
1111
* Define the application's command schedule.
1212
*
13-
* @param \Illuminate\Console\Scheduling\Schedule $schedule
1413
* @return void
1514
*/
1615
protected function schedule(Schedule $schedule)

demo/app/Http/Controllers/Controller.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@
99

1010
class Controller extends BaseController
1111
{
12-
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
12+
use AuthorizesRequests;
13+
use DispatchesJobs;
14+
use ValidatesRequests;
1315
}

demo/app/Http/Middleware/RedirectIfAuthenticated.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ class RedirectIfAuthenticated
1212
/**
1313
* Handle an incoming request.
1414
*
15-
* @param \Illuminate\Http\Request $request
1615
* @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
1716
* @param string|null ...$guards
1817
* @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse

demo/app/Models/Post.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515

1616
class Post extends Model
1717
{
18-
use HasFactory, HasTranslations;
18+
use HasFactory;
19+
use HasTranslations;
1920

2021
public array $translatable = [
2122
'title',

demo/app/Models/User.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@
1010

1111
class User extends Authenticatable
1212
{
13-
use HasFactory, Notifiable;
13+
use HasFactory;
14+
use Notifiable;
1415

1516
protected $guarded = [];
16-
1717
protected $hidden = [
1818
'password',
1919
'remember_token',
2020
];
21-
2221
protected $casts = [
2322
'email_verified_at' => 'datetime',
2423
];

demo/app/Sharp/Categories/CategoryList.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected function getEntityCommands(): ?array
4141
protected function getFilters(): ?array
4242
{
4343
return [
44-
new class extends CheckFilter
44+
new class() extends CheckFilter
4545
{
4646
public function buildFilterConfig(): void
4747
{

demo/app/Sharp/Dashboard/DemoDashboard.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ protected function setCustomPanelDataSet(): void
275275

276276
private static function nextColor(): string
277277
{
278-
if (static::$colorsIndex >= sizeof(static::$colors)) {
278+
if (static::$colorsIndex >= count(static::$colors)) {
279279
static::$colorsIndex = 0;
280280
}
281281

0 commit comments

Comments
 (0)